aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Cirillo <maranda@lightwitch.org>2012-02-24 18:03:27 +0000
committerMarco Cirillo <maranda@lightwitch.org>2012-02-24 18:03:27 +0000
commitbbc4c94fc2ff017da68b672e6c9ff4cc628d64ce (patch)
treefea6d2b8a429345467165e23cbb1270b3ef27981
parent9de25d7789ed5974d66a396aa1c5908e7d74bf29 (diff)
downloadprosody-bbc4c94fc2ff017da68b672e6c9ff4cc628d64ce.tar.gz
prosody-bbc4c94fc2ff017da68b672e6c9ff4cc628d64ce.zip
s2smanager, mod_s2s: clear up ip_hosts after s2s is marked as established, remove useless space from mod_s2s code
-rw-r--r--core/s2smanager.lua1
-rw-r--r--plugins/s2s/mod_s2s.lua2
2 files changed, 2 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 6877ee18..c05f7229 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -134,6 +134,7 @@ function mark_connected(session)
session.sendq = nil;
end
+ session.ip_hosts = nil;
session.srv_hosts = nil;
end
end
diff --git a/plugins/s2s/mod_s2s.lua b/plugins/s2s/mod_s2s.lua
index 2573251f..9f522595 100644
--- a/plugins/s2s/mod_s2s.lua
+++ b/plugins/s2s/mod_s2s.lua
@@ -255,7 +255,7 @@ function stream_callbacks.streamdisconnected(session, err)
end
end
(session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "closed"));
- sessions[session.conn] = nil;
+ sessions[session.conn] = nil;
s2s_destroy_session(session, err);
end