# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1243631181 -3600
# Node ID 331a68645f675f27cbdf1a4967785e4fc43cdb93
# Parent  853d3d76ba94760dba5be80172a0f826dc0691c4# Parent  6a587ca991093ca85571614268abb2e7f585e416
Automated merge with http://waqas.ath.cx:8000/

diff -r 6a587ca99109 -r 331a68645f67 core/stanza_router.lua
--- a/core/stanza_router.lua	Fri May 29 22:04:57 2009 +0100
+++ b/core/stanza_router.lua	Fri May 29 22:06:21 2009 +0100
@@ -124,7 +124,38 @@
 	local node, host, resource = jid_split(to);
 	local to_bare = node and (node.."@"..host) or host; -- bare JID
 
+	local to_type;
+	if node then
+		if resource then
+			to_type = '/full';
+		else
+			to_type = '/bare';
+		end
+	else
+		if host then
+			to_type = '/host';
+		else
+			to_type = '/bare';
+		end
+	end
+
 	local event_data = {origin=origin, stanza=stanza};
+	if origin.full_jid then -- c2s connection
+		if hosts[origin.host].events.fire_event('pre-'..stanza.name..to_type, event_data); then return; end -- do preprocessing
+	end
+	local h = hosts[to_bare] or hosts[host or origin.host];
+	if h then
+		if h.type == "component" then
+			component_handle_stanza(origin, stanza);
+			return;
+		else
+			if h.events.fire_event(stanza.name..to_type, event_data); then return; end -- do processing
+		end
+	else -- non-local recipient
+		core_route_stanza(origin, stanza);
+		return;
+	end
+
 	if host and fire_event(host.."/"..stanza.name, event_data) then
 		-- event handled
 	elseif stanza.name == "presence" and origin.host and fire_event(origin.host.."/"..stanza.name, event_data) then