diff options
| author | Kim Alvefur <zash@zash.se> | 2014-05-22 22:48:06 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-05-22 22:48:06 +0200 |
| commit | 5ae109b0dabe4aed8c8c041ac8bc9bdd7ed2fb51 (patch) | |
| tree | 08ef082e5bcc5d9f52132ebc4800e0c97a739a91 | |
| parent | c9cd737d873287c12c833bd24dc8a20f640f56a1 (diff) | |
| download | prosody-5ae109b0dabe4aed8c8c041ac8bc9bdd7ed2fb51.tar.gz prosody-5ae109b0dabe4aed8c8c041ac8bc9bdd7ed2fb51.zip | |
mod_s2s: Move filter initialization to common place
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 34 | ||||
| -rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 15 |
2 files changed, 17 insertions, 32 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index d35fc489..b256374a 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -541,7 +541,23 @@ local function initialize_session(session) session.stream_attrs = session_stream_attrs; - local filter = session.filter; + local filter = initialize_filters(session); + local conn = session.conn; + local w = conn.write; + + function session.sends2s(t) + log("debug", "sending: %s", t.top_tag and t:top_tag() or t:match("^[^>]*>?")); + if t.name then + t = filter("stanzas/out", t); + end + if t then + t = filter("bytes/out", tostring(t)); + if t then + return w(conn, t); + end + end + end + function session.data(data) data = filter("bytes/in", data); if data then @@ -580,22 +596,6 @@ function listener.onconnect(conn) session = s2s_new_incoming(conn); sessions[conn] = session; session.log("debug", "Incoming s2s connection"); - - local filter = initialize_filters(session); - local w = conn.write; - session.sends2s = function (t) - log("debug", "sending: %s", t.top_tag and t:top_tag() or t:match("^([^>]*>?)")); - if t.name then - t = filter("stanzas/out", t); - end - if t then - t = filter("bytes/out", tostring(t)); - if t then - return w(conn, t); - end - end - end - initialize_session(session); else -- Outgoing session connected session:open_stream(session.from_host, session.to_host); diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index 42b4281c..942a618d 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -297,21 +297,6 @@ function s2sout.make_connect(host_session, connect_host, connect_port) conn = wrapclient(conn, connect_host.addr, connect_port, s2s_listener, "*a"); host_session.conn = conn; - local filter = initialize_filters(host_session); - local w, log = conn.write, host_session.log; - host_session.sends2s = function (t) - log("debug", "sending: %s", (t.top_tag and t:top_tag()) or t:match("^[^>]*>?")); - if t.name then - t = filter("stanzas/out", t); - end - if t then - t = filter("bytes/out", tostring(t)); - if t then - return w(conn, tostring(t)); - end - end - end - -- Register this outgoing connection so that xmppserver_listener knows about it -- otherwise it will assume it is a new incoming connection s2s_listener.register_outgoing(conn, host_session); |