aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-10-23 04:06:51 +0100
committerMatthew Wild <mwild1@gmail.com>2008-10-23 04:06:51 +0100
commit8e40526abca415a228e04196112d1e60f4d1f4b7 (patch)
tree11329e9d0dc2d688551287cf7e2295837d609e9a /core
parent59dd4ed3cdd31081b4766446cb6fac03afa61e00 (diff)
downloadprosody-8e40526abca415a228e04196112d1e60f4d1f4b7.tar.gz
prosody-8e40526abca415a228e04196112d1e60f4d1f4b7.zip
Added a comment, removed all the old code
Diffstat (limited to 'core')
-rw-r--r--core/stanza_router.lua247
1 files changed, 4 insertions, 243 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index b7b57754..1b1db61e 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -9,6 +9,7 @@ local log = require "util.logger".init("stanzarouter")
local st = require "util.stanza";
local send = require "core.sessionmanager".send_to_session;
+local send_s2s = require "core.s2smanager".send_to_host;
local user_exists = require "core.usermanager".user_exists;
local jid_split = require "util.jid".split;
@@ -47,6 +48,8 @@ function core_process_stanza(origin, stanza)
end
end
+-- This function handles stanzas which are not routed any further,
+-- that is, they are handled by this server
function core_handle_stanza(origin, stanza)
-- Handlers
if origin.type == "c2s" or origin.type == "c2s_unauthed" then
@@ -151,6 +154,7 @@ function core_route_stanza(origin, stanza)
-- TODO send IQ error
end
else
+ -- User + resource is online...
stanza.attr.to = res.full_jid;
send(res, stanza); -- Yay \o/
end
@@ -191,249 +195,6 @@ function core_route_stanza(origin, stanza)
stanza.attr.to = to; -- reset
end
-function handle_stanza_nodest(stanza)
- if stanza.name == "iq" then
- handle_stanza_iq_no_to(session, stanza);
- elseif stanza.name == "presence" then
- -- Broadcast to this user's contacts
- handle_stanza_presence_broadcast(session, stanza);
- -- also, if it is initial presence, send out presence probes
- if not session.last_presence then
- handle_stanza_presence_probe_broadcast(session, stanza);
- end
- session.last_presence = stanza;
- elseif stanza.name == "message" then
- -- Treat as if message was sent to bare JID of the sender
- handle_stanza_to_local_user(stanza);
- end
-end
-
-function handle_stanza_tolocal(stanza)
- local node, host, resource = jid.split(stanza.attr.to);
- if host and hosts[host] and hosts[host].type == "local" then
- -- Is a local host, handle internally
- if node then
- -- Is a local user, send to their session
- log("debug", "Routing stanza to %s@%s", node, host);
- if not session.username then return; end --FIXME: Correct response when trying to use unauthed stream is what?
- handle_stanza_to_local_user(stanza);
- else
- -- Is sent to this server, let's handle it...
- log("debug", "Routing stanza to %s", host);
- handle_stanza_to_server(stanza, session);
- end
- end
-end
-
function handle_stanza_toremote(stanza)
log("error", "Stanza bound for remote host, but s2s is not implemented");
end
-
-
---[[
-local function route_c2s_stanza(session, stanza)
- stanza.attr.from = session.full_jid;
- if not stanza.attr.to and session.username then
- -- Has no 'to' attribute, handle internally
- if stanza.name == "iq" then
- handle_stanza_iq_no_to(session, stanza);
- elseif stanza.name == "presence" then
- -- Broadcast to this user's contacts
- handle_stanza_presence_broadcast(session, stanza);
- -- also, if it is initial presence, send out presence probes
- if not session.last_presence then
- handle_stanza_presence_probe_broadcast(session, stanza);
- end
- session.last_presence = stanza;
- elseif stanza.name == "message" then
- -- Treat as if message was sent to bare JID of the sender
- handle_stanza_to_local_user(stanza);
- end
- end
- local node, host, resource = jid.split(stanza.attr.to);
- if host and hosts[host] and hosts[host].type == "local" then
- -- Is a local host, handle internally
- if node then
- -- Is a local user, send to their session
- if not session.username then return; end --FIXME: Correct response when trying to use unauthed stream is what?
- handle_stanza_to_local_user(stanza);
- else
- -- Is sent to this server, let's handle it...
- handle_stanza_to_server(stanza, session);
- end
- else
- -- Is not for us or a local user, route accordingly
- route_s2s_stanza(stanza);
- end
-end
-
-function handle_stanza_no_to(session, stanza)
- if not stanza.attr.id then log("warn", "<iq> without id attribute is invalid"); end
- local xmlns = (stanza.tags[1].attr and stanza.tags[1].attr.xmlns);
- if stanza.attr.type == "get" or stanza.attr.type == "set" then
- if iq_handlers[xmlns] then
- if iq_handlers[xmlns](stanza) then return; end; -- If handler returns true, it handled it
- end
- -- Oh, handler didn't handle it. Need to send service-unavailable now.
- log("warn", "Unhandled namespace: "..xmlns);
- session:send(format("<iq type='error' id='%s'><error type='cancel'><service-unavailable/></error></iq>", stanza.attr.id));
- return; -- All done!
- end
-end
-
-function handle_stanza_to_local_user(stanza)
- if stanza.name == "message" then
- handle_stanza_message_to_local_user(stanza);
- elseif stanza.name == "presence" then
- handle_stanza_presence_to_local_user(stanza);
- elseif stanza.name == "iq" then
- handle_stanza_iq_to_local_user(stanza);
- end
-end
-
-function handle_stanza_message_to_local_user(stanza)
- local node, host, resource = stanza.to.node, stanza.to.host, stanza.to.resource;
- local destuser = hosts[host].sessions[node];
- if destuser then
- if resource and destuser[resource] then
- destuser[resource]:send(stanza);
- else
- -- Bare JID, or resource offline
- local best_session;
- for resource, session in pairs(destuser.sessions) do
- if not best_session then best_session = session;
- elseif session.priority >= best_session.priority and session.priority >= 0 then
- best_session = session;
- end
- end
- if not best_session then
- offlinemessage.new(node, host, stanza);
- else
- print("resource '"..resource.."' was not online, have chosen to send to '"..best_session.username.."@"..best_session.host.."/"..best_session.resource.."'");
- destuser[best_session]:send(stanza);
- end
- end
- else
- -- User is offline
- offlinemessage.new(node, host, stanza);
- end
-end
-
-function handle_stanza_presence_to_local_user(stanza)
- local node, host, resource = stanza.to.node, stanza.to.host, stanza.to.resource;
- local destuser = hosts[host].sessions[node];
- if destuser then
- if resource then
- if destuser[resource] then
- destuser[resource]:send(stanza);
- else
- return;
- end
- else
- -- Broadcast to all user's resources
- for resource, session in pairs(destuser.sessions) do
- session:send(stanza);
- end
- end
- end
-end
-
-function handle_stanza_iq_to_local_user(stanza)
-
-end
-
-function foo()
- local node, host, resource = stanza.to.node, stanza.to.host, stanza.to.resource;
- local destuser = hosts[host].sessions[node];
- if destuser and destuser.sessions then
- -- User online
- if resource and destuser.sessions[resource] then
- stanza.to:send(stanza);
- else
- --User is online, but specified resource isn't (or no resource specified)
- local best_session;
- for resource, session in pairs(destuser.sessions) do
- if not best_session then best_session = session;
- elseif session.priority >= best_session.priority and session.priority >= 0 then
- best_session = session;
- end
- end
- if not best_session then
- offlinemessage.new(node, host, stanza);
- else
- print("resource '"..resource.."' was not online, have chosen to send to '"..best_session.username.."@"..best_session.host.."/"..best_session.resource.."'");
- resource = best_session.resource;
- end
- end
- if destuser.sessions[resource] == session then
- log("warn", "core", "Attempt to send stanza to self, dropping...");
- else
- print("...sending...", tostring(stanza));
- --destuser.sessions[resource].conn.write(tostring(data));
- print(" to conn ", destuser.sessions[resource].conn);
- destuser.sessions[resource].conn.write(tostring(stanza));
- print("...sent")
- end
- elseif stanza.name == "message" then
- print(" ...will be stored offline");
- offlinemessage.new(node, host, stanza);
- elseif stanza.name == "iq" then
- print(" ...is an iq");
- stanza.from:send(st.reply(stanza)
- :tag("error", { type = "cancel" })
- :tag("service-unavailable", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" }));
- end
-end
-
--- Broadcast a presence stanza to all of a user's contacts
-function handle_stanza_presence_broadcast(session, stanza)
- if session.roster then
- local initial_presence = not session.last_presence;
- session.last_presence = stanza;
-
- -- Broadcast presence and probes
- local broadcast = st.presence({ from = session.full_jid, type = stanza.attr.type });
-
- for child in stanza:childtags() do
- broadcast:add_child(child);
- end
- for contact_jid in pairs(session.roster) do
- broadcast.attr.to = contact_jid;
- send_to(contact_jid, broadcast);
- if initial_presence then
- local node, host = jid.split(contact_jid);
- if hosts[host] and hosts[host].type == "local" then
- local contact = hosts[host].sessions[node]
- if contact then
- local pres = st.presence { to = session.full_jid };
- for resource, contact_session in pairs(contact.sessions) do
- if contact_session.last_presence then
- pres.tags = contact_session.last_presence.tags;
- pres.attr.from = contact_session.full_jid;
- send(pres);
- end
- end
- end
- --FIXME: Do we send unavailable if they are offline?
- else
- probe.attr.to = contact;
- send_to(contact, probe);
- end
- end
- end
-
- -- Probe for our contacts' presence
- end
-end
-
--- Broadcast presence probes to all of a user's contacts
-function handle_stanza_presence_probe_broadcast(session, stanza)
-end
-
---
-function handle_stanza_to_server(stanza)
-end
-
-function handle_stanza_iq_no_to(session, stanza)
-end
-]] \ No newline at end of file