projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Tobias SCRAM-PLUS work
[prosody.git]
/
core
/
portmanager.lua
diff --git
a/core/portmanager.lua
b/core/portmanager.lua
index 7a2474520ebbcbf4f58f3a43ca53fe04158cf0c6..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
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).."_";
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);
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
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 = {};
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);
for interface in bind_interfaces do
for port in bind_ports do
local port_number = tonumber(port);
@@
-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
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
fire_event("service-added", { name = service_name, service = service_info });
return true;
end