aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/modulemanager.lua18
-rw-r--r--core/sessionmanager.lua2
-rw-r--r--core/xmlhandlers.lua18
3 files changed, 26 insertions, 12 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index da5945ac..2617c7a6 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -53,6 +53,24 @@ local modulehelpers = setmetatable({}, { __index = _G });
-- Load modules when a host is activated
function load_modules_for_host(host)
+ -- Load modules from global section
+ local modules_enabled = config.get("*", "core", "modules_enabled");
+ local modules_disabled = config.get(host, "core", "modules_disabled");
+ local disabled_set = {};
+ if modules_enabled then
+ if modules_disabled then
+ for _, module in pairs(modules_disabled) do
+ disabled_set[module] = true;
+ end
+ end
+ for _, module in pairs(modules_enabled) do
+ if not disabled_set[module] then
+ load(host, module);
+ end
+ end
+ end
+
+ -- Load modules from just this host
local modules_enabled = config.get(host, "core", "modules_enabled");
if modules_enabled then
for _, module in pairs(modules_enabled) do
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 169a6db2..963de7ce 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -113,8 +113,6 @@ function bind_resource(session, resource)
if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end
-- We don't support binding multiple resources
- session.conntimetotal = gettime()-session.conntime;
-
resource = resource or uuid_generate();
--FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing
diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua
index 38a0dd05..d4d9e141 100644
--- a/core/xmlhandlers.lua
+++ b/core/xmlhandlers.lua
@@ -47,29 +47,27 @@ local ns_prefixes = {
function init_xmlhandlers(session, stream_callbacks)
local ns_stack = { "" };
- local curr_ns = "";
+ local curr_ns, name = "";
local curr_tag;
local chardata = {};
local xml_handlers = {};
local log = session.log or default_log;
-
- local send = session.send;
local cb_streamopened = stream_callbacks.streamopened;
local cb_streamclosed = stream_callbacks.streamclosed;
local cb_error = stream_callbacks.error or function (session, e) error("XML stream error: "..tostring(e)); end;
local cb_handlestanza = stream_callbacks.handlestanza;
- local stream_ns = stream_callbacks.ns;
+ local stream_tag = stream_callbacks.stream_tag;
local stanza
- function xml_handlers:StartElement(name, attr)
+ function xml_handlers:StartElement(tagname, attr)
if stanza and #chardata > 0 then
-- We have some character data in the buffer
stanza:text(t_concat(chardata));
chardata = {};
end
- curr_ns,name = name:match("^(.+)|([%w%-]+)$");
+ local curr_ns,name = tagname:match("^(.+)|([%w%-]+)$");
if curr_ns ~= "jabber:server" then
attr.xmlns = curr_ns;
end
@@ -91,7 +89,7 @@ function init_xmlhandlers(session, stream_callbacks)
if not stanza then --if we are not currently inside a stanza
if session.notopen then
- if name == "stream" and curr_ns == stream_ns then
+ if tagname == stream_tag then
if cb_streamopened then
cb_streamopened(session, attr);
end
@@ -120,10 +118,10 @@ function init_xmlhandlers(session, stream_callbacks)
t_insert(chardata, data);
end
end
- function xml_handlers:EndElement(name)
- curr_ns,name = name:match("^(.+)|([%w%-]+)$");
+ function xml_handlers:EndElement(tagname)
+ curr_ns,name = tagname:match("^(.+)|([%w%-]+)$");
if (not stanza) or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then
- if name == "stream" then
+ if tagname == stream_tag then
if cb_streamclosed then
cb_streamclosed(session);
end