X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fstanza_router.lua;h=4f6918d2baed1feeac427274ef9c7716210ad2ab;hb=a57cc3fca639527336e04702dd67dcc7925ae8c0;hp=8a265a48e5595593471eea0b18803023f4b35e38;hpb=bc71b9824e11c2cd6a8196199a73700b795b8b83;p=prosody.git

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 8a265a48..4f6918d2 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -8,325 +8,351 @@ require "core.servermanager"
 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;
 
-require "util.jid"
-local jid_split = jid.split;
+local rostermanager = require "core.rostermanager";
+local sessionmanager = require "core.sessionmanager";
+
+local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
+local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
+
+local modules_handle_stanza = require "core.modulemanager".handle_stanza;
+
+local format = string.format;
+local tostring = tostring;
+local t_concat = table.concat;
+local t_insert = table.insert;
+local tonumber = tonumber;
+local s_find = string.find;
+
+local jid_split = require "util.jid".split;
+local print = print;
 
 function core_process_stanza(origin, stanza)
-	log("debug", "Received: "..tostring(stanza))
-	-- TODO verify validity of stanza
-	
+	log("debug", "Received["..origin.type.."]: "..tostring(stanza))
+	-- TODO verify validity of stanza (as well as JID validity)
+	if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then
+		if stanza.attr.type == "set" or stanza.attr.type == "get" then
+			error("Invalid IQ");
+		elseif #stanza.tags > 1 and not(stanza.attr.type == "error" or stanza.attr.type == "result") then
+			error("Invalid IQ");
+		end
+	end
+
+	if origin.type == "c2s" and not origin.full_jid
+		and not(stanza.name == "iq" and stanza.tags[1].name == "bind"
+				and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then
+		error("Client MUST bind resource after auth");
+	end
+
 	local to = stanza.attr.to;
-	stanza.attr.from = origin.full_jid -- quick fix to prevent impersonation
-	
-	if not to or (hosts[to] and hosts[to].type == "local") then
+	-- TODO also, stazas should be returned to their original state before the function ends
+	if origin.type == "c2s" then
+		stanza.attr.from = origin.full_jid; -- quick fix to prevent impersonation (FIXME this would be incorrect when the origin is not c2s)
+	end
+
+	if not to then
 		core_handle_stanza(origin, stanza);
-	elseif origin.type == "c2s" then
+	elseif origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
+		local node, host = jid_split(stanza.attr.to);
+		local to_bare = node and (node.."@"..host) or host; -- bare JID
+		local from_node, from_host = jid_split(stanza.attr.from);
+		local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
+		handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
+	elseif hosts[to] and hosts[to].type == "local" then
+		core_handle_stanza(origin, stanza);
+	elseif stanza.name == "iq" and not select(3, jid_split(to)) then
+		core_handle_stanza(origin, stanza);
+	elseif stanza.attr.xmlns and stanza.attr.xmlns ~= "jabber:client" and stanza.attr.xmlns ~= "jabber:server" then
+		modules_handle_stanza(origin, stanza);
+	elseif origin.type == "c2s" or origin.type == "s2sin" then
 		core_route_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 modules_handle_stanza(origin, stanza) then return; end
 	if origin.type == "c2s" or origin.type == "c2s_unauthed" then
 		local session = origin;
-		stanza.attr.from = session.full_jid;
-		
-		log("debug", "Routing stanza");
-		-- Stanza has no to attribute
-		--local to_node, to_host, to_resource = jid_split(stanza.attr.to);
-		--if not to_host then error("Invalid destination JID: "..string.format("{ %q, %q, %q } == %q", to_node or "", to_host or "", to_resource or "", stanza.attr.to or "nil")); end
-		
-		-- Stanza is to this server, or a user on this server
-		log("debug", "Routing stanza to local");
-		handle_stanza(session, stanza);
-	end
-end
 
-function core_route_stanza(origin, stanza)
-	-- Hooks
-	--- ...later
-	
-	-- Deliver
-	local node, host, resource = jid_split(stanza.attr.to);
-	local host_session = hosts[host]
-	if host_session and host_session.type == "local" then
-		-- Local host
-		local user = host_session.sessions[node];
-		if user then
-			local res = nil;
-			if resource then
-				res = user.sessions[resource];
-			end
-			-- TODO do something about presence broadcast
-			if not res then
-				-- if we get here, resource was not specified or was unavailable
-				for k in pairs(user.sessions) do
-					res = user.sessions[k];
-					break;
+		if stanza.name == "presence" and origin.roster then
+			if stanza.attr.type == nil or stanza.attr.type == "unavailable" then
+				for jid in pairs(origin.roster) do -- broadcast to all interested contacts
+					local subscription = origin.roster[jid].subscription;
+					if subscription == "both" or subscription == "from" then
+						stanza.attr.to = jid;
+						core_route_stanza(origin, stanza);
+					end
 				end
-				-- TODO find resource with greatest priority
+				local node, host = jid_split(stanza.attr.from);
+				for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources
+					if res ~= origin and res.full_jid then -- to resource. FIXME is res.full_jid the correct check? Maybe it should be res.presence
+						stanza.attr.to = res.full_jid;
+						core_route_stanza(origin, stanza);
+					end
+				end
+				if stanza.attr.type == nil and not origin.presence then -- initial presence
+					local probe = st.presence({from = origin.full_jid, type = "probe"});
+					for jid in pairs(origin.roster) do -- probe all contacts we are subscribed to
+						local subscription = origin.roster[jid].subscription;
+						if subscription == "both" or subscription == "to" then
+							probe.attr.to = jid;
+							core_route_stanza(origin, probe);
+						end
+					end
+					for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast from all available resources
+						if res ~= origin and res.presence then
+							res.presence.attr.to = origin.full_jid;
+							core_route_stanza(res, res.presence);
+							res.presence.attr.to = nil;
+						end
+					end
+					if origin.roster.pending then -- resend incoming subscription requests
+						for jid in pairs(origin.roster.pending) do
+							origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original?
+						end
+					end
+					local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host});
+					for jid, item in pairs(origin.roster) do -- resend outgoing subscription requests
+						if item.ask then
+							request.attr.to = jid;
+							core_route_stanza(origin, request);
+						end
+					end
+				end
+				origin.priority = 0;
+				if stanza.attr.type == "unavailable" then
+					origin.presence = nil;
+				else
+					origin.presence = stanza;
+					local priority = stanza:child_with_name("priority");
+					if priority and #priority > 0 then
+						priority = t_concat(priority);
+						if s_find(priority, "^[+-]?[0-9]+$") then
+							priority = tonumber(priority);
+							if priority < -128 then priority = -128 end
+							if priority > 127 then priority = 127 end
+							origin.priority = priority;
+						end
+					end
+				end
+				stanza.attr.to = nil; -- reset it
+			else
+				-- TODO error, bad type
 			end
-			stanza.attr.to = res.full_jid;
-			send(res, stanza); -- Yay \o/
-		else
-			-- user not found
-			send(origin, st.error_reply(stanza, "cancel", "service-unavailable"));
 		end
 	else
-		-- Remote host
-		if host_session then
-			-- Send to session
-		else
-			-- Need to establish the connection
-		end
+		log("warn", "Unhandled origin: %s", origin.type);
 	end
 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);
+function send_presence_of_available_resources(user, host, jid, recipient_session)
+	local h = hosts[host];
+	local count = 0;
+	if h and h.type == "local" then
+		local u = h.sessions[user];
+		if u then
+			for k, session in pairs(u.sessions) do
+				local pres = session.presence;
+				if pres then
+					pres.attr.to = jid;
+					pres.attr.from = session.full_jid;
+					recipient_session.send(pres);
+					pres.attr.to = nil;
+					pres.attr.from = nil;
+					count = count + 1;
+				end
 			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
+	return count;
 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
+function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare)
+	local node, host = jid_split(from_bare);
+	local st_from, st_to = stanza.attr.from, stanza.attr.to;
+	stanza.attr.from, stanza.attr.to = from_bare, to_bare;
+	if stanza.attr.type == "subscribe" then
+		log("debug", "outbound subscribe from "..from_bare.." for "..to_bare);
+		-- 1. route stanza
+		-- 2. roster push (subscription = none, ask = subscribe)
+		if rostermanager.set_contact_pending_out(node, host, to_bare) then
+			rostermanager.roster_push(node, host, to_bare);
+		end -- else file error
+		core_route_stanza(origin, stanza);
+	elseif stanza.attr.type == "unsubscribe" then
+		log("debug", "outbound unsubscribe from "..from_bare.." for "..to_bare);
+		-- 1. route stanza
+		-- 2. roster push (subscription = none or from)
+		if rostermanager.unsubscribe(node, host, to_bare) then
+			rostermanager.roster_push(node, host, to_bare); -- FIXME do roster push when roster has in fact not changed?
+		end -- else file error
+		core_route_stanza(origin, stanza);
+	elseif stanza.attr.type == "subscribed" then
+		log("debug", "outbound subscribed from "..from_bare.." for "..to_bare);
+		-- 1. route stanza
+		-- 2. roster_push ()
+		-- 3. send_presence_of_available_resources
+		if rostermanager.subscribed(node, host, to_bare) then
+			rostermanager.roster_push(node, host, to_bare);
+			core_route_stanza(origin, stanza);
+			send_presence_of_available_resources(node, host, to_bare, origin);
 		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
+	elseif stanza.attr.type == "unsubscribed" then
+		log("debug", "outbound unsubscribed from "..from_bare.." for "..to_bare);
+		-- 1. route stanza
+		-- 2. roster push (subscription = none or to)
+		if rostermanager.unsubscribed(node, host, to_bare) then
+			rostermanager.roster_push(node, host, to_bare);
+			core_route_stanza(origin, stanza);
 		end
-	else
-		-- User is offline
-		offlinemessage.new(node, host, stanza);
 	end
+	stanza.attr.from, stanza.attr.to = st_from, st_to;
 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;
+function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare)
+	local node, host = jid_split(to_bare);
+	local st_from, st_to = stanza.attr.from, stanza.attr.to;
+	stanza.attr.from, stanza.attr.to = from_bare, to_bare;
+	if stanza.attr.type == "probe" then
+		log("debug", "inbound probe from "..from_bare.." for "..to_bare);
+		if rostermanager.is_contact_subscribed(node, host, from_bare) then
+			if 0 == send_presence_of_available_resources(node, host, from_bare, origin) then
+				-- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too)
 			end
 		else
-			-- Broadcast to all user's resources
-			for resource, session in pairs(destuser.sessions) do
-				session:send(stanza);
+			core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"}));
+		end
+	elseif stanza.attr.type == "subscribe" then
+		log("debug", "inbound subscribe from "..from_bare.." for "..to_bare);
+		if rostermanager.is_contact_subscribed(node, host, from_bare) then
+			core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed
+		else
+			if not rostermanager.is_contact_pending_in(node, host, from_bare) then
+				if rostermanager.set_contact_pending_in(node, host, from_bare) then
+					sessionmanager.send_to_available_resources(node, host, stanza);
+				end -- TODO else return error, unable to save
 			end
 		end
-	end
+	elseif stanza.attr.type == "unsubscribe" then
+		log("debug", "inbound unsubscribe from "..from_bare.." for "..to_bare);
+		if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then
+			rostermanager.roster_push(node, host, from_bare);
+		end
+	elseif stanza.attr.type == "subscribed" then
+		log("debug", "inbound subscribed from "..from_bare.." for "..to_bare);
+		if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
+			rostermanager.roster_push(node, host, from_bare);
+		end
+	elseif stanza.attr.type == "unsubscribed" then
+		log("debug", "inbound unsubscribed from "..from_bare.." for "..to_bare);
+		if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
+			rostermanager.roster_push(node, host, from_bare);
+		end
+	end -- discard any other type
+	stanza.attr.from, stanza.attr.to = st_from, st_to;
 end
 
-function handle_stanza_iq_to_local_user(stanza)
+function core_route_stanza(origin, stanza)
+	-- Hooks
+	--- ...later
+
+	-- Deliver
+	local to = stanza.attr.to;
+	local node, host, resource = jid_split(to);
+	local to_bare = node and (node.."@"..host) or host; -- bare JID
+	local from = stanza.attr.from;
+	local from_node, from_host, from_resource = jid_split(from);
+	local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
 
-end
+	if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; 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;
+	local host_session = hosts[host]
+	if host_session and host_session.type == "local" then
+		-- Local host
+		local user = host_session.sessions[node];
+		if user then
+			local res = user.sessions[resource];
+			if not res then
+				-- if we get here, resource was not specified or was unavailable
+				if stanza.name == "presence" then
+					if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
+						handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
+					else -- sender is available or unavailable
+						for _, session in pairs(user.sessions) do -- presence broadcast to all user resources.
+							if session.full_jid then -- FIXME should this be just for available resources? Do we need to check subscription?
+								stanza.attr.to = session.full_jid; -- reset at the end of function
+								session.send(stanza);
+							end
+						end
+					end
+				elseif stanza.name == "message" then -- select a resource to recieve message
+					local priority = 0;
+					local recipients = {};
+					for _, session in pairs(user.sessions) do -- find resource with greatest priority
+						local p = session.priority;
+						if p > priority then
+							priority = p;
+							recipients = {session};
+						elseif p == priority then
+							t_insert(recipients, session);
+						end
+					end
+					for _, session in pairs(recipient) do
+						session.send(stanza);
 					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;
+					-- TODO send IQ error
 				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")
+				-- User + resource is online...
+				stanza.attr.to = res.full_jid; -- reset at the end of function
+				res.send(stanza); -- Yay \o/
 			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
+		else
+			-- user not online
+			if user_exists(node, host) then
+				if stanza.name == "presence" then
+					if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
+						handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
+					else
+						-- TODO send unavailable presence or unsubscribed
+					end
+				elseif stanza.name == "message" then
+					-- TODO send message error, or store offline messages
+				elseif stanza.name == "iq" then
+					-- TODO send IQ error
+				end
+			else -- user does not exist
+				-- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses?
+				if stanza.name == "presence" then
+					if stanza.attr.type == "probe" then
+						origin.send(st.presence({from = to_bare, to = from_bare, type = "unsubscribed"}));
 					end
-					--FIXME: Do we send unavailable if they are offline?
+					-- else ignore
 				else
-					probe.attr.to = contact;
-					send_to(contact, probe);
+					origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 				end
 			end
 		end
-		
-		-- Probe for our contacts' presence
+	elseif origin.type == "c2s" then
+		-- Remote host
+		local xmlns = stanza.attr.xmlns;
+		--stanza.attr.xmlns = "jabber:server";
+		stanza.attr.xmlns = nil;
+		log("debug", "sending s2s stanza: %s", tostring(stanza));
+		send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
+		stanza.attr.xmlns = xmlns; -- reset
+	else
+		log("warn", "received stanza from unhandled connection type: %s", origin.type);
 	end
+	stanza.attr.to = to; -- reset
 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)
+function handle_stanza_toremote(stanza)
+	log("error", "Stanza bound for remote host, but s2s is not implemented");
 end
-]]
\ No newline at end of file