diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/portmanager.lua | 5 | ||||
| -rw-r--r-- | core/s2smanager.lua | 2 | ||||
| -rw-r--r-- | core/sessionmanager.lua | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua index 7427a8eb..b02ba53b 100644 --- a/core/portmanager.lua +++ b/core/portmanager.lua @@ -89,11 +89,12 @@ function activate(service_name) or default_interfaces bind_interfaces = set.new(type(bind_interfaces)~="table" and {bind_interfaces} or bind_interfaces); - local bind_ports = set.new(config.get("*", config_prefix.."ports") + local bind_ports = config.get("*", config_prefix.."ports") or service_info.default_ports or {service_info.default_port or listener.default_port -- COMPAT w/pre-0.9 - }); + } + bind_ports = set.new(type(bind_ports) ~= "table" and { bind_ports } or bind_ports ); local mode, ssl = listener.default_mode or "*a"; diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 4c018713..6049e12e 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -35,7 +35,7 @@ function new_incoming(conn) getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end; end open_sessions = open_sessions + 1; - session.log = logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$")); + session.log = logger_init("s2sin"..tostring(session):match("[a-f0-9]+$")); incoming_s2s[session] = true; return session; end diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index d505492e..05b2d64b 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -54,7 +54,7 @@ function new_session(conn) end end session.ip = conn:ip(); - local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$"); + local conn_name = "c2s"..tostring(session):match("[a-f0-9]+$"); session.log = logger.init(conn_name); return session; |