projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a3f3951
)
s2smanager: Update for new net.server API (s2s still doesn't work with libevent for...
author
Matthew Wild
<mwild1@gmail.com>
Sun, 22 Nov 2009 04:42:03 +0000
(
04:42
+0000)
committer
Matthew Wild
<mwild1@gmail.com>
Sun, 22 Nov 2009 04:42:03 +0000
(
04:42
+0000)
core/s2smanager.lua
patch
|
blob
|
history
diff --git
a/core/s2smanager.lua
b/core/s2smanager.lua
index d8edaed0537da71772324e756e1b20eb5f736782..5dae58c9f21b594d23e54fcb3b8c82f28ab5bbc0 100644
(file)
--- a/
core/s2smanager.lua
+++ b/
core/s2smanager.lua
@@
-128,7
+128,7
@@
function new_incoming(conn)
open_sessions = open_sessions + 1;
local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
session.log = log;
open_sessions = open_sessions + 1;
local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
session.log = log;
- session.sends2s = function (t) log("debug", "sending: %s",
(t.top_tag and t:top_tag()) or t:match("^([^>]*>?)")); w(
tostring(t)); end
+ session.sends2s = function (t) log("debug", "sending: %s",
tostring(t)); w(conn,
tostring(t)); end
incoming_s2s[session] = true;
add_task(connect_timeout, function ()
if session.conn ~= conn or
incoming_s2s[session] = true;
add_task(connect_timeout, function ()
if session.conn ~= conn or
@@
-317,9
+317,9
@@
function make_connect(host_session, connect_host, connect_port)
cl.register_outgoing(conn, host_session);
local w, log = conn.write, host_session.log;
cl.register_outgoing(conn, 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("^[^>]*>?")); w(
tostring(t)); end
+ host_session.sends2s = function (t) log("debug", "sending: %s",
tostring(t)); w(conn,
tostring(t)); end
- conn
.
write(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0' xml:lang='en'>]], from_host, to_host));
+ conn
:
write(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0' xml:lang='en'>]], from_host, to_host));
log("debug", "Connection attempt in progress...");
add_task(connect_timeout, function ()
if host_session.conn ~= conn or
log("debug", "Connection attempt in progress...");
add_task(connect_timeout, function ()
if host_session.conn ~= conn or
@@
-391,7
+391,7
@@
function streamopened(session, attr)
if send_buffer and #send_buffer > 0 then
log("debug", "Sending s2s send_buffer now...");
for i, data in ipairs(send_buffer) do
if send_buffer and #send_buffer > 0 then
log("debug", "Sending s2s send_buffer now...");
for i, data in ipairs(send_buffer) do
- session.sends2s(
data
);
+ session.sends2s(
tostring(data)
);
send_buffer[i] = nil;
end
end
send_buffer[i] = nil;
end
end