diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-04-22 20:42:56 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-04-22 20:42:56 +0100 |
| commit | 828cb5187b69c46c443c54aa3e5cca1a460bd10a (patch) | |
| tree | 8751da58d78d98e7bf64c08d2d092aa95873d4df /net | |
| parent | e9921f5497d58805cd47b7a01cecb856554542fe (diff) | |
| download | prosody-828cb5187b69c46c443c54aa3e5cca1a460bd10a.tar.gz prosody-828cb5187b69c46c443c54aa3e5cca1a460bd10a.zip | |
xmpp{server,client}_listener: Fix global accesses
Diffstat (limited to 'net')
| -rw-r--r-- | net/xmppclient_listener.lua | 6 | ||||
| -rw-r--r-- | net/xmppserver_listener.lua | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index 44852834..dbb87b91 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -9,6 +9,7 @@ local logger = require "logger"; +local log = logger.init("xmppclient_listener"); local lxp = require "lxp" local init_xmlhandlers = require "core.xmlhandlers" local sm_new_session = require "core.sessionmanager".new_session; @@ -20,10 +21,11 @@ local t_concat = table.concat; local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end local m_random = math.random; local format = string.format; -local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); +local sessionmanager = require "core.sessionmanager"; +local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; local sm_streamopened = sessionmanager.streamopened; local sm_streamclosed = sessionmanager.streamclosed; -local st = stanza; +local st = require "util.stanza"; local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", default_ns = "jabber:client", diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua index 0216e8dc..ddfb185e 100644 --- a/net/xmppserver_listener.lua +++ b/net/xmppserver_listener.lua @@ -9,9 +9,9 @@ local logger = require "logger"; +local log = logger.init("xmppserver_listener"); local lxp = require "lxp" local init_xmlhandlers = require "core.xmlhandlers" -local sm_new_session = require "core.sessionmanager".new_session; local s2s_new_incoming = require "core.s2smanager".new_incoming; local s2s_streamopened = require "core.s2smanager".streamopened; local s2s_streamclosed = require "core.s2smanager".streamclosed; @@ -42,8 +42,9 @@ local t_concat = table.concat; local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end local m_random = math.random; local format = string.format; -local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); -local st = stanza; +local sessionmanager = require "core.sessionmanager"; +local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; +local st = require "util.stanza"; local sessions = {}; local xmppserver = { default_port = 5269, default_mode = "*a" }; |