Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Use a function to convert to old structures instead of duplicating code

Browse Source 
inside the module.

SVN Revision: 1400
This commit is contained in:
Jean-Sébastien Pédron 2008-07-01 10:20:01 +00:00
parent b08ae07347
commit 6f7cf2e58b
2 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23,6 +23,9 @@
* src/ejabberd_c2s.erl, src/ejabberd_s2s_in.erl: acl doesn't require
conversion anymore.
* src/ejabberd_router.erl: Use a function to convert to old
structures instead of duplicating code inside the module.
2008-06-30 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/Makefile.in: Remove the -I flag for exmpp includes; the

62
src/ejabberd_router.erl
View File

@ -66,25 +66,7 @@ start_link() ->
route(From, To, Packet) ->
% XXX OLD FORMAT: This code helps to detect old format routing.
{FromOld, ToOld, PacketOld} = case Packet of
#xmlelement{} ->
catch throw(for_stacktrace), % To have a stacktrace.
io:format("~nROUTE: old #xmlelement:~n~p~n~p~n~n",
[Packet, erlang:get_stacktrace()]),
{From, To, Packet};
_ ->
F = jlib:to_old_jid(From),
T = jlib:to_old_jid(To),
Default_NS = case lists:member({Packet#xmlel.ns, none},
Packet#xmlel.declared_ns) of
true -> [];
false -> [Packet#xmlel.ns]
end,
P = exmpp_xml:xmlel_to_xmlelement(Packet,
Default_NS,
[{?NS_XMPP, ?NS_XMPP_pfx}, {?NS_DIALBACK, ?NS_DIALBACK_pfx}]),
{F, T, P}
end,
{FromOld, ToOld, PacketOld} = convert_to_old_structs(From, To, Packet),
case catch do_route(FromOld, ToOld, PacketOld) of
{'EXIT', Reason} ->
?ERROR_MSG("~p~nwhen processing: ~p",
@ -258,26 +240,7 @@ handle_cast(_Msg, State) ->
%% Description: Handling all non call/cast messages
%%--------------------------------------------------------------------
handle_info({route, From, To, Packet}, State) ->
% XXX OLD FORMAT: This code helps to detect old format routing.
{FromOld, ToOld, PacketOld} = case Packet of
#xmlelement{} ->
catch throw(for_stacktrace), % To have a stacktrace.
io:format("~nROUTE: old #xmlelement:~n~p~n~p~n~n",
[Packet, erlang:get_stacktrace()]),
{From, To, Packet};
_ ->
F = jlib:to_old_jid(From),
T = jlib:to_old_jid(To),
Default_NS = case lists:member({Packet#xmlel.ns, none},
Packet#xmlel.declared_ns) of
true -> [];
false -> [Packet#xmlel.ns]
end,
P = exmpp_xml:xmlel_to_xmlelement(Packet,
Default_NS,
[{?NS_XMPP, ?NS_XMPP_pfx}, {?NS_DIALBACK, ?NS_DIALBACK_pfx}]),
{F, T, P}
end,
{FromOld, ToOld, PacketOld} = convert_to_old_structs(From, To, Packet),
case catch do_route(FromOld, ToOld, PacketOld) of
{'EXIT', Reason} ->
?ERROR_MSG("~p~nwhen processing: ~p",
@ -443,3 +406,24 @@ update_tables() ->
ok
end.
convert_to_old_structs(From, To, Packet) ->
% XXX OLD FORMAT: This code helps to detect old format routing.
if
is_record(Packet, xmlelement) ->
catch throw(for_stacktrace), % To have a stacktrace.
io:format("~nROUTE: old #xmlelement:~n~p~n~p~n~n",
[Packet, erlang:get_stacktrace()]),
{From, To, Packet};
true ->
F = jlib:to_old_jid(From),
T = jlib:to_old_jid(To),
Default_NS = case lists:member({Packet#xmlel.ns, none},
Packet#xmlel.declared_ns) of
true -> [];
false -> [Packet#xmlel.ns]
end,
P = exmpp_xml:xmlel_to_xmlelement(Packet,
Default_NS,
[{?NS_XMPP, ?NS_XMPP_pfx}, {?NS_DIALBACK, ?NS_DIALBACK_pfx}]),
{F, T, P}
end.