From d1cf37bbec9648ff015290a16640ac67e6e75905 Mon Sep 17 00:00:00 2001 From: Pablo Polvorin Date: Thu, 22 Jan 2009 22:19:03 +0000 Subject: [PATCH] Small fixes SVN Revision: 1849 --- ChangeLog | 7 +++++++ src/ejabberd_c2s.erl | 2 +- src/ejabberd_sm.erl | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d721dd10..dbeab220d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-01-22 Pablo Polvorin + + * src/ejabberd_sm.erl: Fix typo (node -> lnode). + + * src/ejabberd_c2s.erl: Reuse the domain in binary() format to + make the jid. + 2009-01-22 Jean-Sébastien Pédron * src/web/ejabberd_web_admin.erl, src/ejabberd_listener.erl: Fix some diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index f0bebca5f..bb97dc317 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -241,7 +241,7 @@ wait_for_stream({xmlstreamstart, #xmlel{ns = NS} = Opening}, StateData) -> true -> Lang = exmpp_stream:get_lang(Opening), change_shaper(StateData, - exmpp_jid:make_jid(Server)), + exmpp_jid:make_jid(ServerB)), case exmpp_stream:get_version(Opening) of {1, 0} -> send_element(StateData, Header), diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index 3d3190620..9f22b2ba4 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -384,8 +384,8 @@ code_change(_OldVsn, State, _Extra) -> %%-------------------------------------------------------------------- set_session(SID, JID, Priority, Info) -> - US = {exmpp_jid:node(JID), exmpp_jid:ldomain(JID)}, - USR = {exmpp_jid:node(JID), + US = {exmpp_jid:lnode(JID), exmpp_jid:ldomain(JID)}, + USR = {exmpp_jid:lnode(JID), exmpp_jid:ldomain(JID), exmpp_jid:lresource(JID)}, F = fun() ->