aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-01-19 03:56:44 +0000
committerMatthew Wild <mwild1@gmail.com>2010-01-19 03:56:44 +0000
commit70e57250c8f3f6b43100becaace0821a6595b2c8 (patch)
tree5b721f1871f1cc305228ce1ad0a4b2cc79fcceb7
parente5a65ba7a39895a2784f5eb095cf7ab0ae6fb4a8 (diff)
downloadprosody-70e57250c8f3f6b43100becaace0821a6595b2c8.tar.gz
prosody-70e57250c8f3f6b43100becaace0821a6595b2c8.zip
net.xmpp{client,server,component}: Update for new xmlhandlers syntax
-rw-r--r--net/xmppclient_listener.lua6
-rw-r--r--net/xmppcomponent_listener.lua4
-rw-r--r--net/xmppserver_listener.lua5
3 files changed, 6 insertions, 9 deletions
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index 61622c6a..3a0c65be 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -30,8 +30,7 @@ local st = require "util.stanza";
local config = require "core.configmanager";
local opt_keepalives = config.get("*", "core", "tcp_keepalives");
-local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams\1stream",
- default_ns = "jabber:client",
+local stream_callbacks = { default_ns = "jabber:client",
streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
function stream_callbacks.error(session, error, data)
@@ -71,9 +70,8 @@ local function session_reset_stream(session)
return true;
end
-
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
-local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:match("[^\1]*"), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
+local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
local function session_close(session, reason)
local log = session.log or log;
if session.conn then
diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua
index 4920548d..030bbbd1 100644
--- a/net/xmppcomponent_listener.lua
+++ b/net/xmppcomponent_listener.lua
@@ -32,7 +32,7 @@ local xmlns_component = 'jabber:component:accept';
--- Callbacks/data for xmlhandlers to handle streams for us ---
-local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams\1stream", default_ns = xmlns_component };
+local stream_callbacks = { default_ns = xmlns_component };
function stream_callbacks.error(session, error, data, data2)
log("warn", "Error processing component stream: "..tostring(error));
@@ -87,7 +87,7 @@ end
--- Closing a component connection
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
-local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:match("[^\1]*"), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
+local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
local function session_close(session, reason)
local log = session.log or log;
if session.conn then
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index af3009de..5198a764 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -17,8 +17,7 @@ local s2s_streamopened = require "core.s2smanager".streamopened;
local s2s_streamclosed = require "core.s2smanager".streamclosed;
local s2s_destroy_session = require "core.s2smanager".destroy_session;
local s2s_attempt_connect = require "core.s2smanager".attempt_connection;
-local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams\1stream",
- default_ns = "jabber:server",
+local stream_callbacks = { default_ns = "jabber:server",
streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza = core_process_stanza };
function stream_callbacks.error(session, error, data)
@@ -70,7 +69,7 @@ local function session_reset_stream(session)
end
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
-local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:match("[^\1]*"), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
+local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
local function session_close(session, reason)
local log = session.log or log;
if session.conn then