prosody
6f2789939d35
core/portmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/portmanager.lua @ 4583:6f2789939d35

core.portmanager: Make sure the private flag takes precedence over global interfaces
author Kim Alvefur <zash@zash.se>
date Sat, 03 Mar 2012 00:54:19 +0100
parent 4546:c686860ef410
child 4597:25d89c7d6aee
comparison
equal deleted inserted replaced
4582:542afb9c2ab1 4583:6f2789939d35
60 return nil, "Unknown service: "..service_name; 60 return nil, "Unknown service: "..service_name;
61 end 61 end
62 62
63 local bind_interfaces = set.new(config.get("*", service_name.."_interfaces") 63 local bind_interfaces = set.new(config.get("*", service_name.."_interfaces")
64 or config.get("*", service_name.."_interface") -- COMPAT w/pre-0.9 64 or config.get("*", service_name.."_interface") -- COMPAT w/pre-0.9
65 or (service_info.private and default_local_interfaces)
65 or config.get("*", "interfaces") 66 or config.get("*", "interfaces")
66 or config.get("*", "interface") -- COMPAT w/pre-0.9 67 or config.get("*", "interface") -- COMPAT w/pre-0.9
67 or (service_info.private and default_local_interfaces)
68 or service_info.default_interface -- COMPAT w/pre0.9 68 or service_info.default_interface -- COMPAT w/pre0.9
69 or default_interfaces); 69 or default_interfaces);
70 70
71 local bind_ports = set.new(config.get("*", service_name.."_ports") 71 local bind_ports = set.new(config.get("*", service_name.."_ports")
72 or (service_info.multiplex and config.get("*", "ports")) 72 or (service_info.multiplex and config.get("*", "ports"))