Software /
code /
prosody
Diff
core/portmanager.lua @ 6690:b2e89583d6e6
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 13 May 2015 22:33:40 +0200 |
parent | 6688:1d4fb397e561 |
child | 6779:6236668da30a |
line wrap: on
line diff
--- a/core/portmanager.lua Wed May 13 17:00:27 2015 +0100 +++ b/core/portmanager.lua Wed May 13 22:33:40 2015 +0200 @@ -152,7 +152,7 @@ end function deactivate(service_name, service_info) - for name, interface, port, n, active_service + 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); @@ -192,11 +192,11 @@ end 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; @@ -211,7 +211,7 @@ return (services[service_name] or {})[1]; end -function get_active_services(...) +function get_active_services() return active_services; end