15 local s2s_new_incoming = require "core.s2smanager".new_incoming; |
15 local s2s_new_incoming = require "core.s2smanager".new_incoming; |
16 local s2s_streamopened = require "core.s2smanager".streamopened; |
16 local s2s_streamopened = require "core.s2smanager".streamopened; |
17 local s2s_streamclosed = require "core.s2smanager".streamclosed; |
17 local s2s_streamclosed = require "core.s2smanager".streamclosed; |
18 local s2s_destroy_session = require "core.s2smanager".destroy_session; |
18 local s2s_destroy_session = require "core.s2smanager".destroy_session; |
19 local s2s_attempt_connect = require "core.s2smanager".attempt_connection; |
19 local s2s_attempt_connect = require "core.s2smanager".attempt_connection; |
20 local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams\1stream", |
20 local stream_callbacks = { default_ns = "jabber:server", |
21 default_ns = "jabber:server", |
|
22 streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza = core_process_stanza }; |
21 streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza = core_process_stanza }; |
23 |
22 |
24 function stream_callbacks.error(session, error, data) |
23 function stream_callbacks.error(session, error, data) |
25 if error == "no-stream" then |
24 if error == "no-stream" then |
26 session:close("invalid-namespace"); |
25 session:close("invalid-namespace"); |
68 |
67 |
69 return true; |
68 return true; |
70 end |
69 end |
71 |
70 |
72 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; |
71 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; |
73 local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:match("[^\1]*"), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" }; |
72 local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" }; |
74 local function session_close(session, reason) |
73 local function session_close(session, reason) |
75 local log = session.log or log; |
74 local log = session.log or log; |
76 if session.conn then |
75 if session.conn then |
77 if session.notopen then |
76 if session.notopen then |
78 session.sends2s("<?xml version='1.0'?>"); |
77 session.sends2s("<?xml version='1.0'?>"); |