Merge 0.9->0.10

[prosody.git] / core / portmanager.lua

diff --git a/core/portmanager.lua b/core/portmanager.lua
index b02ba53b9617b332cdd7bf410996e84ac4f9c1c5..bc2d42648615eed7041b8a230e5844ad0bbddd8c 100644 (file)
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -1,6 +1,7 @@
 local config = require "core.configmanager";
 local certmanager = require "core.certmanager";
 local server = require "net.server";
+local socket = require "socket";
 
 local log = require "util.logger".init("portmanager");
 local multitable = require "util.multitable";
@@ -8,7 +9,7 @@ local set = require "util.set";
 
 local table = table;
 local setmetatable, rawset, rawget = setmetatable, rawset, rawget;
-local type, tonumber, ipairs = type, tonumber, ipairs;
+local type, tonumber, tostring, ipairs, pairs = type, tonumber, tostring, ipairs, pairs;
 
 local prosody = prosody;
 local fire_event = prosody.events.fire_event;
@@ -17,13 +18,19 @@ module "portmanager";
 
 --- Config
 
-local default_interfaces = { "*" };
-local default_local_interfaces = { "127.0.0.1" };
-if config.get("*", "use_ipv6") then
+local default_interfaces = { };
+local default_local_interfaces = { };
+if config.get("*", "use_ipv4") ~= false then
+       table.insert(default_interfaces, "*");
+       table.insert(default_local_interfaces, "127.0.0.1");
+end
+if socket.tcp6 and config.get("*", "use_ipv6") ~= false then
        table.insert(default_interfaces, "::");
        table.insert(default_local_interfaces, "::1");
 end
 
+local default_mode = config.get("*", "network_default_read_size") or 4096;
+
 --- Private state
 
 -- service_name -> { service_info, ... }
@@ -72,7 +79,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).."_";
@@ -88,7 +95,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
@@ -96,32 +103,42 @@ function activate(service_name)
                   }
        bind_ports = set.new(type(bind_ports) ~= "table" and { bind_ports } or bind_ports );
 
-       local mode, ssl = listener.default_mode or "*a";
-       
+       local mode, ssl = listener.default_mode or default_mode;
+       local hooked_ports = {};
+
        for interface in bind_interfaces do
                for port in bind_ports do
-                       port = tonumber(port);
-                       if #active_services:search(nil, interface, port) > 0 then
+                       local port_number = tonumber(port);
+                       if not port_number then
+                               log("error", "Invalid port number specified for service '%s': %s", service_info.name, tostring(port));
+                       elseif #active_services:search(nil, interface, port_number) > 0 then
                                log("error", "Multiple services configured to listen on the same port ([%s]:%d): %s, %s", interface, port, active_services:search(nil, interface, port)[1][1].service.name or "<unnamed>", service_name or "<unnamed>");
                        else
                                local err;
                                -- Create SSL context for this service/port
                                if service_info.encryption == "ssl" then
-                                       local ssl_config = config.get("*", config_prefix.."ssl");
-                                       ssl, err = certmanager.create_context(service_info.name.." port "..port, "server", ssl_config and (ssl_config[port]
-                                               or (ssl_config.certificate and ssl_config)));
+                                       local global_ssl_config = config.get("*", "ssl") or {};
+                                       local prefix_ssl_config = config.get("*", config_prefix.."ssl") or global_ssl_config;
+                                       ssl, err = certmanager.create_context(service_info.name.." port "..port, "server",
+                                               service_info.ssl_config or {},
+                                               prefix_ssl_config[interface],
+                                               prefix_ssl_config[port],
+                                               prefix_ssl_config,
+                                               global_ssl_config[interface],
+                                               global_ssl_config[port]);
                                        if not ssl then
-                                               log("error", "Error binding encrypted port for %s: %s", service_info.name, error_to_friendly_message(service_name, port, err) or "unknown error");
+                                               log("error", "Error binding encrypted port for %s: %s", service_info.name, error_to_friendly_message(service_name, port_number, err) or "unknown error");
                                        end
                                end
                                if not err then
                                        -- Start listening on interface+port
-                                       local handler, err = server.addserver(interface, port, listener, mode, ssl);
+                                       local handler, err = server.addserver(interface, port_number, listener, mode, ssl);
                                        if not handler then
-                                               log("error", "Failed to open server port %d on %s, %s", port, interface, error_to_friendly_message(service_name, port, err));
+                                               log("error", "Failed to open server port %d on %s, %s", port_number, interface, error_to_friendly_message(service_name, port_number, err));
                                        else
-                                               log("debug", "Added listening service %s to [%s]:%d", service_name, interface, port);
-                                               active_services:add(service_name, interface, port, {
+                                               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;
                                                        service = service_info;
                                                });
@@ -130,7 +147,7 @@ function activate(service_name)
                        end
                end
        end
-       log("info", "Activated service '%s'", service_name);
+       log("info", "Activated service '%s' on %s", service_name, #hooked_ports == 0 and "no ports" or table.concat(hooked_ports, ", "));
        return true;
 end
 
@@ -154,7 +171,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