# HG changeset patch # User Matthew Wild # Date 1335279620 -3600 # Node ID 05d8b4099cf55abad2a4db84eefba885d44f5ce0 # Parent 1ce2ff9ec313d5ef5cf82e35cec1efd40bd3f87a portmanager: Add get_service_at(interface, port) and close(interface, port) diff -r 1ce2ff9ec313 -r 05d8b4099cf5 core/portmanager.lua --- a/core/portmanager.lua Tue Apr 24 15:52:30 2012 +0100 +++ b/core/portmanager.lua Tue Apr 24 16:00:20 2012 +0100 @@ -126,9 +126,7 @@ 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); @@ -165,6 +163,22 @@ 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