portmanager: Set default read size back to 4K

[prosody.git] / core / portmanager.lua

diff --git a/core/portmanager.lua b/core/portmanager.lua
index bc2d42648615eed7041b8a230e5844ad0bbddd8c..ad1a0be397edd976f45852e5744f2aa354cce5e1 100644 (file)
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -9,12 +9,12 @@ local set = require "util.set";
 
 local table = table;
 local setmetatable, rawset, rawget = setmetatable, rawset, rawget;
-local type, tonumber, tostring, ipairs, pairs = type, tonumber, tostring, ipairs, pairs;
+local type, tonumber, tostring, ipairs = type, tonumber, tostring, ipairs;
 
 local prosody = prosody;
 local fire_event = prosody.events.fire_event;
 
-module "portmanager";
+local _ENV = nil;
 
 --- Config
 
@@ -41,7 +41,7 @@ local active_services = multitable.new();
 
 --- Private helpers
 
-local function error_to_friendly_message(service_name, port, err)
+local function error_to_friendly_message(service_name, port, err) --luacheck: ignore 212/service_name
        local friendly_message = err;
        if err:match(" in use") then
                -- FIXME: Use service_name here
@@ -63,18 +63,9 @@ local function error_to_friendly_message(service_name, port, err)
        return friendly_message;
 end
 
-prosody.events.add_handler("item-added/net-provider", function (event)
-       local item = event.item;
-       register_service(item.name, item);
-end);
-prosody.events.add_handler("item-removed/net-provider", function (event)
-       local item = event.item;
-       unregister_service(item.name, item);
-end);
-
 --- Public API
 
-function activate(service_name)
+local function activate(service_name)
        local service_info = services[service_name][1];
        if not service_info then
                return nil, "Unknown service: "..service_name;
@@ -120,10 +111,10 @@ function activate(service_name)
                                        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,
+                                               service_info.ssl_config or {},
                                                global_ssl_config[interface],
                                                global_ssl_config[port]);
                                        if not ssl then
@@ -151,8 +142,10 @@ function activate(service_name)
        return true;
 end
 
-function deactivate(service_name, service_info)
-       for name, interface, port, n, active_service
+local close; -- forward declaration
+
+local function deactivate(service_name, service_info)
+       for name, interface, port, n, active_service --luacheck: ignore 213/name 213/n
                in active_services:iter(service_name or service_info and service_info.name, nil, nil, nil) do
                if service_info == nil or active_service.service == service_info then
                        close(interface, port);
@@ -161,7 +154,7 @@ function deactivate(service_name, service_info)
        log("info", "Deactivated service '%s'", service_name or service_info.name);
 end
 
-function register_service(service_name, service_info)
+local function register_service(service_name, service_info)
        table.insert(services[service_name], service_info);
 
        if not active_services:get(service_name) then
@@ -176,7 +169,7 @@ function register_service(service_name, service_info)
        return true;
 end
 
-function unregister_service(service_name, service_info)
+local function unregister_service(service_name, service_info)
        log("debug", "Unregistering service: %s", service_name);
        local service_info_list = services[service_name];
        for i, service in ipairs(service_info_list) do
@@ -191,12 +184,14 @@ function unregister_service(service_name, service_info)
        fire_event("service-removed", { name = service_name, service = service_info });
 end
 
+local get_service_at -- forward declaration
+
 function close(interface, port)
-       local service, server = get_service_at(interface, port);
+       local service, service_server = get_service_at(interface, port);
        if not service then
                return false, "port-not-open";
        end
-       server:close();
+       service_server:close();
        active_services:remove(service.name, interface, port);
        log("debug", "Removed listening service %s from [%s]:%d", service.name, interface, port);
        return true;
@@ -207,16 +202,37 @@ function get_service_at(interface, port)
        return data.service, data.server;
 end
 
-function get_service(service_name)
+local function get_service(service_name)
        return (services[service_name] or {})[1];
 end
 
-function get_active_services(...)
+local function get_active_services()
        return active_services;
 end
 
-function get_registered_services()
+local function get_registered_services()
        return services;
 end
 
-return _M;
+-- Event handlers
+
+prosody.events.add_handler("item-added/net-provider", function (event)
+       local item = event.item;
+       register_service(item.name, item);
+end);
+prosody.events.add_handler("item-removed/net-provider", function (event)
+       local item = event.item;
+       unregister_service(item.name, item);
+end);
+
+return {
+       activate = activate;
+       deactivate = deactivate;
+       register_service = register_service;
+       unregister_service = unregister_service;
+       close = close;
+       get_service_at = get_service_at;
+       get_service = get_service;
+       get_active_services = get_active_services;
+       get_registered_services = get_registered_services;
+};