Merge Tobias SCRAM-PLUS work

[prosody.git] / core / portmanager.lua

diff --git a/core/portmanager.lua b/core/portmanager.lua
index 923174c24d3c1d225be76145da61a10aebdceb52..95900c08483156f8f54f8fe2412e450c56e6b63b 100644 (file)
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -87,7 +87,7 @@ function activate(service_name)
        if not service_info then
                return nil, "Unknown service: "..service_name;
        end
-       
+
        local listener = service_info.listener;
 
        local config_prefix = (service_info.config_prefix or service_name).."_";
@@ -103,7 +103,7 @@ function activate(service_name)
                or listener.default_interface -- COMPAT w/pre0.9
                or default_interfaces
        bind_interfaces = set.new(type(bind_interfaces)~="table" and {bind_interfaces} or bind_interfaces);
-       
+
        local bind_ports = config.get("*", config_prefix.."ports")
                or service_info.default_ports
                or {service_info.default_port
@@ -113,7 +113,7 @@ function activate(service_name)
 
        local mode, ssl = listener.default_mode or "*a";
        local hooked_ports = {};
-       
+
        for interface in bind_interfaces do
                for port in bind_ports do
                        local port_number = tonumber(port);
@@ -153,7 +153,7 @@ function activate(service_name)
                                        if not handler then
                                                log("error", "Failed to open server port %d on %s, %s", port_number, interface, error_to_friendly_message(service_name, port_number, err));
                                        else
-                                               table.insert(hooked_ports, port_number);
+                                               table.insert(hooked_ports, "["..interface.."]:"..port_number);
                                                log("debug", "Added listening service %s to [%s]:%d", service_name, interface, port_number);
                                                active_services:add(service_name, interface, port_number, {
                                                        server = handler;
@@ -188,7 +188,7 @@ function register_service(service_name, service_info)
                        log("error", "Failed to activate service '%s': %s", service_name, err or "unknown error");
                end
        end
-       
+
        fire_event("service-added", { name = service_name, service = service_info });
        return true;
 end