mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->trunk

Browse source
This commit is contained in:
Matthew Wild 2012-03-09 18:46:19 +00:00
commit 4689bd441e
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/s2smanager.lua
View file

@ -549,7 +549,7 @@ function streamopened(session, attr)
session.from_host = attr.from and nameprep(attr.from);
session.streamid = uuid_gen();
(session.log or log)("debug", "Incoming s2s received <stream:stream>");
(session.log or log)("debug", "Incoming s2s received %s", st.stanza("stream:stream", attr):top_tag());
if session.to_host then
if not hosts[session.to_host] then
-- Attempting to connect to a host we don't serve

22
plugins/mod_admin_telnet.lua
View file

@ -487,6 +487,24 @@ function def_env.c2s:close(match_jid)
return true, "Total: "..count.." sessions closed";
end
local function session_flags(session, line)
if session.cert_identity_status == "valid" then
line[#line+1] = "(secure)";
elseif session.secure then
line[#line+1] = "(encrypted)";
end
if session.compressed then
line[#line+1] = "(compressed)";
end
if session.smacks then
line[#line+1] = "(sm)";
end
if session.conn and session.conn:ip():match(":") then
line[#line+1] = "(IPv6)";
end
return table.concat(line, " ");
end
def_env.s2s = {};
function def_env.s2s:show(match_jid)
local _print = self.session.print;
@ -499,7 +517,7 @@ function def_env.s2s:show(match_jid)
for remotehost, session in pairs(host_session.s2sout) do
if (not match_jid) or remotehost:match(match_jid) or host:match(match_jid) then
count_out = count_out + 1;
print(" "..host.." -> "..remotehost..(session.cert_identity_status == "valid" and " (secure)" or "")..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or ""));
print(session_flags(session, {" ", host, "->", remotehost}));
if session.sendq then
print(" There are "..#session.sendq.." queued outgoing stanzas for this connection");
end
@ -536,7 +554,7 @@ function def_env.s2s:show(match_jid)
-- Pft! is what I say to list comprehensions
or (session.hosts and #array.collect(keys(session.hosts)):filter(subhost_filter)>0)) then
count_in = count_in + 1;
print(" "..host.." <- "..(session.from_host or "(unknown)")..(session.cert_identity_status == "valid" and " (secure)" or "")..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or ""));
print(session_flags(session, {" ", host, "<-", session.from_host or "(unknown)"}));
if session.type == "s2sin_unauthed" then
print(" Connection not yet authenticated");
end