xmppserver_listener: When a connection fails, pass the reason to destroy_session

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 968a5f542d7c3caf89cf9bcfcd5cb9ecf41522b7..0577179f291c37caab5d75bcda7f76b14dc6985f 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -185,7 +185,7 @@ function init_global_state()
        -- Load SSL settings from config, and create a ctx table
        local global_ssl_ctx = rawget(_G, "ssl") and config.get("*", "core", "ssl");
        if global_ssl_ctx then
-               local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2"; };
+               local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2" };
                setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
                prosody.global_ssl_ctx = global_ssl_ctx;
        end
@@ -193,22 +193,23 @@ function init_global_state()
        local cl = require "net.connlisteners";
        function prosody.net_activate_ports(option, listener, default, conntype)
                conntype = conntype or (global_ssl_ctx and "tls") or "tcp";
+               local ports_option = option and option.."_ports" or "ports";
                if not cl.get(listener) then return; end
-               local ports = config.get("*", "core", option.."_ports") or default;
+               local ports = config.get("*", "core", ports_option) or default;
                if type(ports) == "number" then ports = {ports} end;
                
                if type(ports) ~= "table" then
-                       log("error", "core."..option.." is not a table");
+                       log("error", "core."..ports_option.." is not a table");
                else
                        for _, port in ipairs(ports) do
                                if type(port) ~= "number" then
-                                       log("error", "Non-numeric "..option.."_ports: "..tostring(port));
+                                       log("error", "Non-numeric "..ports_option..": "..tostring(port));
                                else
                                        cl.start(listener, { 
                                                ssl = conntype ~= "tcp" and global_ssl_ctx,
                                                port = port,
-                                               interface = config.get("*", "core", option.."_interface") 
-                                                       or cl.get(listener).default_interface 
+                                               interface = (option and config.get("*", "core", option.."_interface"))
+                                                       or cl.get(listener).default_interface
                                                        or config.get("*", "core", "interface"),
                                                type = conntype
                                        });
@@ -279,22 +280,33 @@ function init_data_store()
 end
 
 function prepare_to_start()
+       log("debug", "Prosody is using the %s backend for connection handling", server.get_backend());
        -- Signal to modules that we are ready to start
        eventmanager.fire_event("server-starting");
        prosody.events.fire_event("server-starting");
 
        -- start listening on sockets
-       prosody.net_activate_ports("c2s", "xmppclient", {5222});
-       prosody.net_activate_ports("s2s", "xmppserver", {5269});
-       prosody.net_activate_ports("component", "xmppcomponent", {}, "tcp");
-       prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
+       if config.get("*", "core", "ports") then
+               prosody.net_activate_ports(nil, "multiplex", {5222, 5269});
+               if config.get("*", "core", "ssl_ports") then
+                       prosody.net_activate_ports("ssl", "multiplex", {5223}, "ssl");
+               end
+       else
+               prosody.net_activate_ports("c2s", "xmppclient", {5222});
+               prosody.net_activate_ports("s2s", "xmppserver", {5269});
+               prosody.net_activate_ports("component", "xmppcomponent", {}, "tcp");
+               prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
+       end
 
        prosody.start_time = os.time();
 end    
 
 function init_global_protection()
-       -- Catch global accesses --
-       local locked_globals_mt = { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end }
+       -- Catch global accesses
+       local locked_globals_mt = {
+               __index = function (t, k) log("warn", "%s", debug.traceback("Attempt to read a non-existent global '"..tostring(k).."'", 2)); end;
+               __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end;
+       };
                
        function prosody.unlock_globals()
                setmetatable(_G, nil);