diff options
| author | Kim Alvefur <zash@zash.se> | 2015-04-26 00:07:36 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-04-26 00:07:36 +0200 |
| commit | 43702241ec9a8bf74a23c63b5ee2fd6edd49cbe3 (patch) | |
| tree | b003c23950a3bb53f56cc0eedaca77b2aaf4bbe0 /plugins/mod_s2s | |
| parent | 1be7952fe226feefa784e1975d23e950323877e3 (diff) | |
| parent | 3e6b35b5d49b5f6ec06cb301ba7b4cbce0a75000 (diff) | |
| download | prosody-43702241ec9a8bf74a23c63b5ee2fd6edd49cbe3.tar.gz prosody-43702241ec9a8bf74a23c63b5ee2fd6edd49cbe3.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 4 | ||||
| -rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index e7c10e7e..5a47559e 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -37,6 +37,8 @@ local secure_domains, insecure_domains = module:get_option_set("s2s_secure_domains", {})._items, module:get_option_set("s2s_insecure_domains", {})._items; local require_encryption = module:get_option_boolean("s2s_require_encryption", false); +local measure_connections = module:measure("connections", "counter"); + local sessions = module:shared("sessions"); local log = module._log; @@ -577,6 +579,7 @@ local function initialize_session(session) end function listener.onconnect(conn) + measure_connections(1); conn:setoption("keepalive", opt_keepalives); local session = sessions[conn]; if not session then -- New incoming connection @@ -608,6 +611,7 @@ function listener.onstatus(conn, status) end function listener.ondisconnect(conn, err) + measure_connections(-1); local session = sessions[conn]; if session then sessions[conn] = nil; diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index 942a618d..5214f4cf 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -169,18 +169,6 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err) handle4 = adns.lookup(function (reply, err) handle4 = nil; - -- COMPAT: This is a compromise for all you CNAME-(ab)users :) - if not (reply and reply[#reply] and reply[#reply].a) then - local count = max_dns_depth; - reply = dns.peek(connect_host, "CNAME", "IN"); - while count > 0 and reply and reply[#reply] and not reply[#reply].a and reply[#reply].cname do - log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[#reply].cname), count); - reply = dns.peek(reply[#reply].cname, "A", "IN") or dns.peek(reply[#reply].cname, "CNAME", "IN"); - count = count - 1; - end - end - -- end of CNAME resolving - if reply and reply[#reply] and reply[#reply].a then for _, ip in ipairs(reply) do log("debug", "DNS reply for %s gives us %s", connect_host, ip.a); |