aboutsummaryrefslogtreecommitdiffstats
path: root/core/stanza_router.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-13 16:58:29 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-13 16:58:29 +0000
commit11ec0f82d756ef0a7d4bcd56151367126b3a20bf (patch)
tree98b20c6ccab370f68dbddeceb22dfd5e62ff67b1 /core/stanza_router.lua
parent22926813345e5f0046b846cd7817e9483ad4c8e6 (diff)
parenta1740642f2a9af6bf42747fe0b4bf2148fc38449 (diff)
downloadprosody-11ec0f82d756ef0a7d4bcd56151367126b3a20bf.tar.gz
prosody-11ec0f82d756ef0a7d4bcd56151367126b3a20bf.zip
Merge from waqas
Diffstat (limited to 'core/stanza_router.lua')
-rw-r--r--core/stanza_router.lua27
1 files changed, 24 insertions, 3 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 9ae98f1c..1793f547 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -13,6 +13,7 @@ local user_exists = require "core.usermanager".user_exists;
local rostermanager = require "core.rostermanager";
local sessionmanager = require "core.sessionmanager";
+local offlinemanager = require "core.offlinemanager";
local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
@@ -149,6 +150,10 @@ function core_handle_stanza(origin, stanza)
core_route_stanza(origin, request);
end
end
+ for _, msg in ipairs(offlinemanager.load(node, host) or {}) do
+ origin.send(msg); -- FIXME do we need to modify to/from in any way?
+ end
+ offlinemanager.deleteAll(node, host);
end
origin.priority = 0;
if stanza.attr.type == "unavailable" then
@@ -168,11 +173,16 @@ function core_handle_stanza(origin, stanza)
end
stanza.attr.to = nil; -- reset it
else
- -- TODO error, bad type
+ log("warn", "Unhandled c2s presence: %s", tostring(stanza));
+ origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
end
+ else
+ log("warn", "Unhandled c2s stanza: %s", tostring(stanza));
+ origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
end -- TODO handle other stanzas
else
- log("warn", "Unhandled origin: %s", origin.type); -- FIXME reply with error
+ log("warn", "Unhandled origin: %s", origin.type);
+ origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
end
end
@@ -328,8 +338,14 @@ function core_route_stanza(origin, stanza)
t_insert(recipients, session);
end
end
+ local count = 0;
for _, session in pairs(recipients) do
session.send(stanza);
+ count = count + 1;
+ end
+ if count == 0 then
+ offlinemanager.store(node, host, stanza);
+ -- TODO deal with storage errors
end
else
-- TODO send IQ error
@@ -349,7 +365,12 @@ function core_route_stanza(origin, stanza)
-- TODO send unavailable presence or unsubscribed
end
elseif stanza.name == "message" then
- -- TODO send message error, or store offline messages
+ if stanza.attr.type == "chat" or stanza.attr.type == "normal" or not stanza.attr.type then
+ offlinemanager.store(node, host, stanza);
+ -- FIXME don't store messages with only chat state notifications
+ end
+ -- TODO allow configuration of offline storage
+ -- TODO send error if not storing offline
elseif stanza.name == "iq" then
-- TODO send IQ error
end