core/stanza_router.lua
author Matthew Wild <mwild1@gmail.com>
Sat, 13 Dec 2008 17:43:52 +0000
changeset 621 cd2cab5400fc
parent 615 4ae3e81513f3
child 631 6957fe7b0313
permissions -rw-r--r--
Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
615
4ae3e81513f3 0.1 -> 0.2
Matthew Wild <mwild1@gmail.com>
parents: 570
diff changeset
     1
-- Prosody IM v0.2
519
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
     2
-- Copyright (C) 2008 Matthew Wild
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
     3
-- Copyright (C) 2008 Waqas Hussain
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
     4
-- 
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
     5
-- This program is free software; you can redistribute it and/or
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
     6
-- modify it under the terms of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
     7
-- as published by the Free Software Foundation; either version 2
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
     8
-- of the License, or (at your option) any later version.
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
     9
-- 
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    10
-- This program is distributed in the hope that it will be useful,
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    11
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    12
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    13
-- GNU General Public License for more details.
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    14
-- 
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    15
-- You should have received a copy of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    16
-- along with this program; if not, write to the Free Software
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    17
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    18
--
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    19
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 468
diff changeset
    20
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    21
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    22
local log = require "util.logger".init("stanzarouter")
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    23
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
    24
local st = require "util.stanza";
187
2e16e5077d8f Was a bit hasty to remove send_s2s() from stanza_router. We still use it, and there is no problem with it.
Matthew Wild <mwild1@gmail.com>
parents: 186
diff changeset
    25
local send_s2s = require "core.s2smanager".send_to_host;
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
    26
local user_exists = require "core.usermanager".user_exists;
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
    27
171
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 170
diff changeset
    28
local rostermanager = require "core.rostermanager";
175
5f71d290bb44 Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
    29
local sessionmanager = require "core.sessionmanager";
249
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
    30
local offlinemanager = require "core.offlinemanager";
171
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 170
diff changeset
    31
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
    32
local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
146
3826ca244eb6 working outgoing s2s \o/
Matthew Wild <mwild1@gmail.com>
parents: 145
diff changeset
    33
local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
191
e64c8a44060f Fix s2s once and for all
Matthew Wild <mwild1@gmail.com>
parents: 190
diff changeset
    34
e64c8a44060f Fix s2s once and for all
Matthew Wild <mwild1@gmail.com>
parents: 190
diff changeset
    35
local modules_handle_stanza = require "core.modulemanager".handle_stanza;
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    36
local component_handle_stanza = require "core.componentmanager".handle_stanza;
191
e64c8a44060f Fix s2s once and for all
Matthew Wild <mwild1@gmail.com>
parents: 190
diff changeset
    37
321
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
    38
local handle_outbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes;
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
    39
local handle_inbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_inbound_presence_subscriptions_and_probes;
468
ab49cb6d0e92 Moved incoming c2s presence handling from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 438
diff changeset
    40
local handle_normal_presence = require "core.presencemanager".handle_normal_presence;
321
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
    41
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
    42
local format = string.format;
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
    43
local tostring = tostring;
199
eccf66b42bd7 Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents: 192
diff changeset
    44
local t_concat = table.concat;
200
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
    45
local t_insert = table.insert;
199
eccf66b42bd7 Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents: 192
diff changeset
    46
local tonumber = tonumber;
eccf66b42bd7 Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents: 192
diff changeset
    47
local s_find = string.find;
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
    48
105
b099f0f80775 Removed an unnecessary line
Waqas Hussain <waqas20@gmail.com>
parents: 83
diff changeset
    49
local jid_split = require "util.jid".split;
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
    50
local print = print;
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    51
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    52
function core_process_stanza(origin, stanza)
340
a31715bf08eb Extra checks before sending error replies to incoming stanzas
Matthew Wild <mwild1@gmail.com>
parents: 321
diff changeset
    53
	(origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:pretty_print()) --top_tag())
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    54
234
7c8313e055fb Hack to allow s2s stanzas to work until we do proper namespace handling
Waqas Hussain <waqas20@gmail.com>
parents: 223
diff changeset
    55
	if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end -- FIXME Hack. This should be removed when we fix namespace handling.
73
937448005121 Added to a comment
Waqas Hussain <waqas20@gmail.com>
parents: 72
diff changeset
    56
	-- TODO verify validity of stanza (as well as JID validity)
83
79608fc8f98d Fixed routing for IQs to bare JIDs, and added a simple IQ validity check
Waqas Hussain <waqas20@gmail.com>
parents: 78
diff changeset
    57
	if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
    58
		if stanza.attr.type == "set" or stanza.attr.type == "get" then
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
    59
			error("Invalid IQ");
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
    60
		elseif #stanza.tags > 1 and not(stanza.attr.type == "error" or stanza.attr.type == "result") then
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
    61
			error("Invalid IQ");
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
    62
		end
83
79608fc8f98d Fixed routing for IQs to bare JIDs, and added a simple IQ validity check
Waqas Hussain <waqas20@gmail.com>
parents: 78
diff changeset
    63
	end
78
972e31cc91e8 Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents: 73
diff changeset
    64
972e31cc91e8 Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents: 73
diff changeset
    65
	if origin.type == "c2s" and not origin.full_jid
83
79608fc8f98d Fixed routing for IQs to bare JIDs, and added a simple IQ validity check
Waqas Hussain <waqas20@gmail.com>
parents: 78
diff changeset
    66
		and not(stanza.name == "iq" and stanza.tags[1].name == "bind"
78
972e31cc91e8 Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents: 73
diff changeset
    67
				and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then
972e31cc91e8 Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents: 73
diff changeset
    68
		error("Client MUST bind resource after auth");
972e31cc91e8 Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents: 73
diff changeset
    69
	end
972e31cc91e8 Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents: 73
diff changeset
    70
274
9e68a697435d Fix routing of outbound iq stanzas
Matthew Wild <mwild1@gmail.com>
parents: 264
diff changeset
    71
	-- TODO also, stanzas should be returned to their original state before the function ends
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
    72
	if origin.type == "c2s" then
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    73
		stanza.attr.from = origin.full_jid;
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    74
	end
621
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
    75
	local to, xmlns = stanza.attr.to, stanza.attr.xmlns;
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    76
	local node, host, resource = jid_split(to);
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    77
	local to_bare = node and (node.."@"..host) or host; -- bare JID
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    78
	local from = stanza.attr.from;
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    79
	local from_node, from_host, from_resource = jid_split(from);
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    80
	local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    81
213
181f5cc6215b Commented a buggy check
Waqas Hussain <waqas20@gmail.com>
parents: 212
diff changeset
    82
	--[[if to and not(hosts[to]) and not(hosts[to_bare]) and (hosts[host] and hosts[host].type ~= "local") then -- not for us?
181f5cc6215b Commented a buggy check
Waqas Hussain <waqas20@gmail.com>
parents: 212
diff changeset
    83
		log("warn", "stanza recieved for a non-local server");
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    84
		return; -- FIXME what should we do here?
213
181f5cc6215b Commented a buggy check
Waqas Hussain <waqas20@gmail.com>
parents: 212
diff changeset
    85
	end]] -- FIXME
207
90c387884234 A little whitespace fix
Waqas Hussain <waqas20@gmail.com>
parents: 200
diff changeset
    86
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
    87
	-- FIXME do stanzas not of jabber:client get handled by components?
621
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
    88
	if (origin.type == "s2sin" or origin.type == "c2s") and (not xmlns or xmlns == "jabber:server" or xmlns == "jabber:client") then			
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
    89
		if origin.type == "s2sin" then
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
    90
			local host_status = origin.hosts[from_host];
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
    91
			if not host_status or not host_status.authed then -- remote server trying to impersonate some other server?
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
    92
				log("warn", "Received a stanza claiming to be from %s, over a conn authed for %s!", from_host, origin.from_host);
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
    93
				return; -- FIXME what should we do here? does this work with subdomains?
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
    94
			end
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
    95
		end
222
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
    96
		if not to then
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
    97
			core_handle_stanza(origin, stanza);
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
    98
		elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
    99
			core_handle_stanza(origin, stanza);
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   100
		elseif stanza.attr.xmlns and stanza.attr.xmlns ~= "jabber:client" and stanza.attr.xmlns ~= "jabber:server" then
438
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 372
diff changeset
   101
			modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza);
222
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   102
		elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   103
			component_handle_stanza(origin, stanza);
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   104
		elseif hosts[to] and hosts[to].type == "component" then -- hack to allow components to handle node@server/resource and server/resource
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   105
			component_handle_stanza(origin, stanza);
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   106
		elseif hosts[host] and hosts[host].type == "component" then -- directed at a component
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   107
			component_handle_stanza(origin, stanza);
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   108
		elseif origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
321
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
   109
			handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
274
9e68a697435d Fix routing of outbound iq stanzas
Matthew Wild <mwild1@gmail.com>
parents: 264
diff changeset
   110
		elseif origin.type ~= "c2s" and stanza.name == "iq" and not resource then -- directed at bare JID
222
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   111
			core_handle_stanza(origin, stanza);
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   112
		else
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   113
			core_route_stanza(origin, stanza);
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   114
		end
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
   115
	else
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
   116
		core_handle_stanza(origin, stanza);
119
b48a573608e8 Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents: 113
diff changeset
   117
	end
b48a573608e8 Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents: 113
diff changeset
   118
end
b48a573608e8 Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents: 113
diff changeset
   119
121
74e5919e4737 Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents: 119
diff changeset
   120
-- This function handles stanzas which are not routed any further,
74e5919e4737 Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents: 119
diff changeset
   121
-- that is, they are handled by this server
119
b48a573608e8 Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents: 113
diff changeset
   122
function core_handle_stanza(origin, stanza)
b48a573608e8 Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents: 113
diff changeset
   123
	-- Handlers
438
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 372
diff changeset
   124
	if modules_handle_stanza(stanza.attr.to or origin.host, origin, stanza) then return; end
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   125
	if origin.type == "c2s" or origin.type == "s2sin" then
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   126
		if origin.type == "c2s" then
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   127
			if stanza.name == "presence" and origin.roster then
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   128
				if stanza.attr.type == nil or stanza.attr.type == "unavailable" then
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   129
					handle_normal_presence(origin, stanza, core_route_stanza);
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   130
				else
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   131
					log("warn", "Unhandled c2s presence: %s", tostring(stanza));
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   132
					if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" then
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   133
						origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   134
					end
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   135
				end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   136
			else
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   137
				log("warn", "Unhandled c2s stanza: %s", tostring(stanza));
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   138
				if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
264
a296b61baad8 Only reply with errors if the stanza is not an error or a result (don't know how much bandwidth this just cost me :) )
Matthew Wild <mwild1@gmail.com>
parents: 262
diff changeset
   139
					origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
a296b61baad8 Only reply with errors if the stanza is not an error or a result (don't know how much bandwidth this just cost me :) )
Matthew Wild <mwild1@gmail.com>
parents: 262
diff changeset
   140
				end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   141
			end
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   142
		else -- s2s stanzas
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   143
			log("warn", "Unhandled s2s stanza: %s", tostring(stanza));
340
a31715bf08eb Extra checks before sending error replies to incoming stanzas
Matthew Wild <mwild1@gmail.com>
parents: 321
diff changeset
   144
			if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
264
a296b61baad8 Only reply with errors if the stanza is not an error or a result (don't know how much bandwidth this just cost me :) )
Matthew Wild <mwild1@gmail.com>
parents: 262
diff changeset
   145
				origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
a296b61baad8 Only reply with errors if the stanza is not an error or a result (don't know how much bandwidth this just cost me :) )
Matthew Wild <mwild1@gmail.com>
parents: 262
diff changeset
   146
			end
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   147
		end
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
   148
	else
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
   149
		log("warn", "Unhandled %s stanza: %s", origin.type, tostring(stanza));
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
   150
	end
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   151
end
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   152
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   153
function core_route_stanza(origin, stanza)
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   154
	-- Hooks
68
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
   155
	--- ...later
207
90c387884234 A little whitespace fix
Waqas Hussain <waqas20@gmail.com>
parents: 200
diff changeset
   156
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   157
	-- Deliver
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   158
	local to = stanza.attr.to;
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   159
	local node, host, resource = jid_split(to);
170
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
   160
	local to_bare = node and (node.."@"..host) or host; -- bare JID
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
   161
	local from = stanza.attr.from;
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
   162
	local from_node, from_host, from_resource = jid_split(from);
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
   163
	local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   164
372
e7c1e30d06d5 Now possible to specify nil origin to core_route_stanza. Origin will be chosen as the host of the 'from' attribute on the stanza. Returns false on no such host.
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   165
	-- Auto-detect origin if not specified
e7c1e30d06d5 Now possible to specify nil origin to core_route_stanza. Origin will be chosen as the host of the 'from' attribute on the stanza. Returns false on no such host.
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   166
	origin = origin or hosts[from_host];
e7c1e30d06d5 Now possible to specify nil origin to core_route_stanza. Origin will be chosen as the host of the 'from' attribute on the stanza. Returns false on no such host.
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   167
	if not origin then return false; end
e7c1e30d06d5 Now possible to specify nil origin to core_route_stanza. Origin will be chosen as the host of the 'from' attribute on the stanza. Returns false on no such host.
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   168
	
151
096c7b9374fc Presence fixes (again)
Waqas Hussain <waqas20@gmail.com>
parents: 143
diff changeset
   169
	if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   170
68
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
   171
	local host_session = hosts[host]
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
   172
	if host_session and host_session.type == "local" then
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
   173
		-- Local host
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
   174
		local user = host_session.sessions[node];
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
   175
		if user then
72
e78db62beebc Code cleanup
Waqas Hussain <waqas20@gmail.com>
parents: 71
diff changeset
   176
			local res = user.sessions[resource];
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
   177
			if not res then
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
   178
				-- if we get here, resource was not specified or was unavailable
106
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
   179
				if stanza.name == "presence" then
151
096c7b9374fc Presence fixes (again)
Waqas Hussain <waqas20@gmail.com>
parents: 143
diff changeset
   180
					if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
321
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
   181
						handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
151
096c7b9374fc Presence fixes (again)
Waqas Hussain <waqas20@gmail.com>
parents: 143
diff changeset
   182
					else -- sender is available or unavailable
200
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   183
						for _, session in pairs(user.sessions) do -- presence broadcast to all user resources.
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   184
							if session.full_jid then -- FIXME should this be just for available resources? Do we need to check subscription?
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   185
								stanza.attr.to = session.full_jid; -- reset at the end of function
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   186
								session.send(stanza);
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   187
							end
106
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
   188
						end
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
   189
					end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   190
				elseif stanza.name == "message" then -- select a resource to recieve message
200
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   191
					local priority = 0;
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   192
					local recipients = {};
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   193
					for _, session in pairs(user.sessions) do -- find resource with greatest priority
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   194
						local p = session.priority;
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   195
						if p > priority then
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   196
							priority = p;
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   197
							recipients = {session};
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   198
						elseif p == priority then
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   199
							t_insert(recipients, session);
106
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
   200
						end
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
   201
					end
249
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   202
					local count = 0;
237
c1e9b3f3f3a7 Fixed typo
Waqas Hussain <waqas20@gmail.com>
parents: 234
diff changeset
   203
					for _, session in pairs(recipients) do
200
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   204
						session.send(stanza);
249
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   205
						count = count + 1;
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   206
					end
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   207
					if count == 0 then
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   208
						offlinemanager.store(node, host, stanza);
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   209
						-- TODO deal with storage errors
200
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
   210
					end
106
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
   211
				else
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   212
					-- TODO send IQ error
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
   213
				end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   214
			else
121
74e5919e4737 Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents: 119
diff changeset
   215
				-- User + resource is online...
170
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
   216
				stanza.attr.to = res.full_jid; -- reset at the end of function
186
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents: 178
diff changeset
   217
				res.send(stanza); -- Yay \o/
106
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
   218
			end
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
   219
		else
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   220
			-- user not online
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   221
			if user_exists(node, host) then
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   222
				if stanza.name == "presence" then
175
5f71d290bb44 Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
   223
					if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
321
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
   224
						handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   225
					else
175
5f71d290bb44 Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
   226
						-- TODO send unavailable presence or unsubscribed
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   227
					end
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   228
				elseif stanza.name == "message" then
249
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   229
					if stanza.attr.type == "chat" or stanza.attr.type == "normal" or not stanza.attr.type then
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   230
						offlinemanager.store(node, host, stanza);
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   231
						-- FIXME don't store messages with only chat state notifications
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   232
					end
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   233
					-- TODO allow configuration of offline storage
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
   234
					-- TODO send error if not storing offline
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   235
				elseif stanza.name == "iq" then
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   236
					-- TODO send IQ error
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   237
				end
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   238
			else -- user does not exist
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   239
				-- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses?
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   240
				if stanza.name == "presence" then
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   241
					if stanza.attr.type == "probe" then
186
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents: 178
diff changeset
   242
						origin.send(st.presence({from = to_bare, to = from_bare, type = "unsubscribed"}));
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   243
					end
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   244
					-- else ignore
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   245
				else
186
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents: 178
diff changeset
   246
					origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   247
				end
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   248
			end
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
   249
		end
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
   250
	elseif origin.type == "c2s" then
68
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
   251
		-- Remote host
170
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
   252
		local xmlns = stanza.attr.xmlns;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
   253
		--stanza.attr.xmlns = "jabber:server";
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
   254
		stanza.attr.xmlns = nil;
146
3826ca244eb6 working outgoing s2s \o/
Matthew Wild <mwild1@gmail.com>
parents: 145
diff changeset
   255
		log("debug", "sending s2s stanza: %s", tostring(stanza));
170
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
   256
		send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
   257
		stanza.attr.xmlns = xmlns; -- reset
210
e679487e2fa4 Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
   258
	elseif origin.type == "component" or origin.type == "local" then
e679487e2fa4 Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
   259
		-- Route via s2s for components and modules
e679487e2fa4 Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
   260
		log("debug", "Routing outgoing stanza for %s to %s", origin.host, host);
e679487e2fa4 Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
   261
		send_s2s(origin.host, host, stanza);
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
   262
	else
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
   263
		log("warn", "received stanza from unhandled connection type: %s", origin.type);
68
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
   264
	end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
   265
	stanza.attr.to = to; -- reset
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   266
end