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

Convert JID to the expected form outside of the C2S (empty fields must

Browse Source 
be set to the empty string). This fixes the broken routing.

SVN Revision: 1375
This commit is contained in:
Jean-Sébastien Pédron 2008-06-23 11:47:10 +00:00
parent 2a43998444
commit e95df7999f
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-06-23 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/ejabberd_c2s.erl (session_established): Convert JID to the
expected form outside of the C2S (empty fields must be set to the
empty string). This fixes the broken routing.
2008-06-20 Jean-Sébastien Pédron <js.pedron@meetic-corp.com> 2008-06-20 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/configure, src/aclocal.m4, src/Makefile.in: Add exmpp detection. * src/configure, src/aclocal.m4, src/Makefile.in: Add exmpp detection.

31
src/ejabberd_c2s.erl
View File

@ -871,32 +871,37 @@ session_established({xmlstreamelement, El}, StateData) ->
[User, Server]), [User, Server]),
PresenceEl = exmpp_xml:xmlelement_to_xmlel(PresenceElOld, PresenceEl = exmpp_xml:xmlelement_to_xmlel(PresenceElOld,
?DEFAULT_NS, ?PREFIXED_NS), ?DEFAULT_NS, ?PREFIXED_NS),
% XXX OLD FORMAT: PresenceElOld. % XXX OLD FORMAT: PresenceElOld, *JID.
FromJIDOld = exmpp_jid:to_ejabberd_jid(FromJID),
ToJIDOld = exmpp_jid:to_ejabberd_jid(ToJID),
ejabberd_hooks:run( ejabberd_hooks:run(
user_send_packet, user_send_packet,
Server, Server,
[FromJID, ToJID, PresenceElOld]), [FromJIDOld, ToJIDOld, PresenceElOld]),
case ToJID of case ToJID of
#jid{node = User, #jid{node = User,
domain = Server, domain = Server,
resource = ""} -> resource = undefined} ->
?DEBUG("presence_update(~p,~n\t~p,~n\t~p)", ?DEBUG("presence_update(~p,~n\t~p,~n\t~p)",
[FromJID, PresenceEl, StateData]), [FromJID, PresenceEl, StateData]),
% XXX OLD FORMAT: PresenceElOld. % XXX OLD FORMAT: PresenceElOld.
presence_update(FromJID, PresenceElOld, presence_update(FromJIDOld, PresenceElOld,
StateData); StateData);
_ -> _ ->
% XXX OLD FORMAT: PresenceElOld. % XXX OLD FORMAT: PresenceElOld.
presence_track(FromJID, ToJID, PresenceElOld, presence_track(FromJIDOld, ToJIDOld, PresenceElOld,
StateData) StateData)
end; end;
#xmlel{ns = ?NS_JABBER_CLIENT, name = 'iq'} -> #xmlel{ns = ?NS_JABBER_CLIENT, name = 'iq'} ->
% XXX OLD FORMAT: JIDs.
FromJIDOld = exmpp_jid:to_ejabberd_jid(FromJID),
ToJIDOld = exmpp_jid:to_ejabberd_jid(ToJID),
case exmpp_iq:get_payload(El) of case exmpp_iq:get_payload(El) of
#xmlel{ns = ?NS_PRIVACY} -> #xmlel{ns = ?NS_PRIVACY} ->
% XXX OLD FORMAT: IQ was #iq. % XXX OLD FORMAT: IQ was #iq.
IQ_Record = exmpp_iq:make_iq_record(El), IQ_Record = exmpp_iq:to_ejabberd_iq(El),
process_privacy_iq( process_privacy_iq(
FromJID, ToJID, IQ_Record, StateData); FromJIDOld, ToJIDOld, IQ_Record, StateData);
_ -> _ ->
% XXX OLD FORMAT: NewElOld. % XXX OLD FORMAT: NewElOld.
NewElOld = exmpp_xml:xmlel_to_xmlelement(NewEl, NewElOld = exmpp_xml:xmlel_to_xmlelement(NewEl,
@ -904,21 +909,23 @@ session_established({xmlstreamelement, El}, StateData) ->
ejabberd_hooks:run( ejabberd_hooks:run(
user_send_packet, user_send_packet,
Server, Server,
[FromJID, ToJID, NewElOld]), [FromJIDOld, ToJIDOld, NewElOld]),
% XXX OLD FORMAT: NewElOld. % XXX OLD FORMAT: NewElOld.
ejabberd_router:route( ejabberd_router:route(
FromJID, ToJID, NewElOld), FromJIDOld, ToJIDOld, NewElOld),
StateData StateData
end; end;
#xmlel{ns = ?NS_JABBER_CLIENT, name = 'message'} -> #xmlel{ns = ?NS_JABBER_CLIENT, name = 'message'} ->
% XXX OLD FORMAT: NewElOld. % XXX OLD FORMAT: NewElOld, JIDs.
NewElOld = exmpp_xml:xmlel_to_xmlelement(NewEl, NewElOld = exmpp_xml:xmlel_to_xmlelement(NewEl,
?DEFAULT_NS, ?PREFIXED_NS), ?DEFAULT_NS, ?PREFIXED_NS),
FromJIDOld = exmpp_jid:to_ejabberd_jid(FromJID),
ToJIDOld = exmpp_jid:to_ejabberd_jid(ToJID),
ejabberd_hooks:run(user_send_packet, ejabberd_hooks:run(user_send_packet,
Server, Server,
[FromJID, ToJID, NewElOld]), [FromJIDOld, ToJIDOld, NewElOld]),
% XXX OLD FORMAT: NewElOld. % XXX OLD FORMAT: NewElOld.
ejabberd_router:route(FromJID, ToJID, NewElOld), ejabberd_router:route(FromJIDOld, ToJIDOld, NewElOld),
StateData; StateData;
_ -> _ ->
StateData StateData