mod_component: Remove unused variable

[prosody.git] / core / portmanager.lua

diff --git a/core/portmanager.lua b/core/portmanager.lua
index 605e1e301d2ba05ee27025ad5b31633b8c95553a..3bd143efce1cef83d14e7e065d16216f3da57cab 100644 (file)
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -1,7 +1,19 @@
+local config = require "core.configmanager";
+local server = require "net.server";
 
+local log = require "util.logger".init("portmanager");
 local multitable = require "util.multitable";
+local set = require "util.set";
+
+local table, package = table, package;
+local setmetatable, rawset, rawget = setmetatable, rawset, rawget;
+local type = type;
+
+local prosody = prosody;
 local fire_event = prosody.events.fire_event;
 
+module "portmanager";
+
 --- Config
 
 local default_interfaces = { "*" };
@@ -50,8 +62,6 @@ local function error_to_friendly_message(service_name, port, err)
        return friendly_message;
 end
 
-module("portmanager", package.seeall);
-
 prosody.events.add_handler("item-added/net-provider", function (event)
        local item = event.item;
        register_service(item.name, item);
@@ -63,26 +73,34 @@ end);
 
 --- Public API
 
-function activate_service(service_name)
+function activate(service_name)
        local service_info = services[service_name][1];
        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).."_";
+       if config_prefix == "_" then
+               config_prefix = "";
+       end
 
-       local bind_interfaces = set.new(config.get("*", service_name.."_interfaces")
-               or config.get("*", service_name.."_interface") -- COMPAT w/pre-0.9
+       local bind_interfaces = config.get("*", config_prefix.."interfaces")
+               or config.get("*", config_prefix.."interface") -- COMPAT w/pre-0.9
                or (service_info.private and default_local_interfaces)
                or config.get("*", "interfaces")
                or config.get("*", "interface") -- COMPAT w/pre-0.9
-               or service_info.default_interface -- COMPAT w/pre0.9
-               or default_interfaces);
+               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 = set.new(config.get("*", service_name.."_ports")
-               or (service_info.multiplex and config.get("*", "ports"))
+       local bind_ports = set.new(config.get("*", config_prefix.."ports")
                or service_info.default_ports
-               or {service_info.default_port});
+               or {service_info.default_port
+                   or listener.default_port -- COMPAT w/pre-0.9
+                  });
 
-       local listener = service_info.listener;
        local mode = listener.default_mode or "*a";
        local ssl;
        if service_info.encryption == "ssl" then
@@ -94,7 +112,7 @@ function activate_service(service_name)
        
        for interface in bind_interfaces do
                for port in bind_ports do
-                       if not service_info.multiplex and #active_services:search(nil, interface, port) > 0 then
+                       if #active_services:search(nil, interface, port) > 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 handler, err = server.addserver(interface, port, listener, mode, ssl);
@@ -119,9 +137,7 @@ function deactivate(service_name)
        if not active then return; end
        for interface, ports in pairs(active) do
                for port, active_service in pairs(ports) do
-                       active_service:close();
-                       active_services:remove(service_name, interface, port, active_service);
-                       log("debug", "Removed listening service %s from [%s]:%d", service_name, interface, port);
+                       close(interface, port);
                end
        end
        log("info", "Deactivated service '%s'", service_name);
@@ -132,7 +148,7 @@ function register_service(service_name, service_info)
 
        if not active_services:get(service_name) then
                log("debug", "No active service for %s, activating...", service_name);
-               local ok, err = activate_service(service_name);
+               local ok, err = activate(service_name);
                if not ok then
                        log("error", "Failed to activate service '%s': %s", service_name, err or "unknown error");
                end
@@ -158,6 +174,22 @@ function unregister_service(service_name, service_info)
        fire_event("service-removed", { name = service_name, service = service_info });
 end
 
+function close(interface, port)
+       local service, server = get_service_at(interface, port);
+       if not service then
+               return false, "port-not-open";
+       end
+       server:close();
+       active_services:remove(service.name, interface, port);
+       log("debug", "Removed listening service %s from [%s]:%d", service.name, interface, port);
+       return true;
+end
+
+function get_service_at(interface, port)
+       local data = active_services:search(nil, interface, port)[1][1];
+       return data.service, data.server;
+end
+
 function get_service(service_name)
        return services[service_name];
 end
@@ -166,4 +198,8 @@ function get_active_services(...)
        return active_services;
 end
 
+function get_registered_services()
+       return services;
+end
+
 return _M;