Merge 0.7->trunk

[prosody.git] / plugins / mod_console.lua

diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index 5a09229873da5254d7836c55ec93f00ea2dd3b3c..05ff3274e54c0d2264278c47eeae70c451493f9d 100644 (file)
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -33,11 +33,11 @@ end
 console = {};
 
 function console:new_session(conn)
-       local w = function(s) conn.write(s:gsub("\n", "\r\n")); end;
+       local w = function(s) conn:write(s:gsub("\n", "\r\n")); end;
        local session = { conn = conn;
                        send = function (t) w(tostring(t)); end;
                        print = function (t) w("| "..tostring(t).."\n"); end;
-                       disconnect = function () conn.close(); end;
+                       disconnect = function () conn:close(); end;
                        };
        session.env = setmetatable({}, default_env_mt);
        
@@ -53,7 +53,7 @@ end
 
 local sessions = {};
 
-function console_listener.listener(conn, data)
+function console_listener.onincoming(conn, data)
        local session = sessions[conn];
        
        if not session then
@@ -126,7 +126,7 @@ function console_listener.listener(conn, data)
        session.send(string.char(0));
 end
 
-function console_listener.disconnect(conn, err)
+function console_listener.ondisconnect(conn, err)
        local session = sessions[conn];
        if session then
                session.disconnect();
@@ -148,7 +148,7 @@ commands.quit, commands.exit = commands.bye, commands.bye;
 commands["!"] = function (session, data)
        if data:match("^!!") then
                session.print("!> "..session.env._);
-               return console_listener.listener(session.conn, session.env._);
+               return console_listener.onincoming(session.conn, session.env._);
        end
        local old, new = data:match("^!(.-[^\\])!(.-)!$");
        if old and new then
@@ -158,7 +158,7 @@ commands["!"] = function (session, data)
                        return;
                end
                session.print("!> "..res);
-               return console_listener.listener(session.conn, res);
+               return console_listener.onincoming(session.conn, res);
        end
        session.print("Sorry, not sure what you want");
 end
@@ -192,7 +192,7 @@ function commands.help(session, data)
        elseif section == "server" then
                print [[server:version() - Show the server's version number]]
                print [[server:uptime() - Show how long the server has been running]]
-               --print [[server:shutdown(reason) - Shut down the server, with an optional reason to be broadcast to all connections]]
+               print [[server:shutdown(reason) - Shut down the server, with an optional reason to be broadcast to all connections]]
        elseif section == "config" then
                print [[config:reload() - Reload the server configuration. Modules may need to be reloaded for changes to take effect.]]
        elseif section == "console" then
@@ -478,7 +478,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.secure and " (encrypted)" or ""));
+                               print("    "..host.." -> "..remotehost..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or ""));
                                if session.sendq then
                                        print("        There are "..#session.sendq.." queued outgoing stanzas for this connection");
                                end
@@ -515,7 +515,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.secure and " (encrypted)" or ""));
+                               print("    "..host.." <- "..(session.from_host or "(unknown)")..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or ""));
                                if session.type == "s2sin_unauthed" then
                                                print("        Connection not yet authenticated");
                                end
@@ -650,3 +650,5 @@ if option and option ~= "short" and option ~= "full" and option ~= "graphic" the
        end
 end
 end
+
+prosody.net_activate_ports("console", "console", {5582}, "tcp");