diff options
| author | Jean-Sébastien Pédron <js.pedron@meetic-corp.com> | 2008-06-30 19:51:23 +0400 |
|---|---|---|
| committer | Jean-Sébastien Pédron <js.pedron@meetic-corp.com> | 2008-06-30 19:51:23 +0400 |
| commit | cc033b3b980ab6ae15ccb5a6cbdbc4d3a53b6bf0 (patch) | |
| tree | 7568e39684cfaabdb4a23d1deee8852fc155ed6c /src/ejabberd_s2s_in.erl | |
| parent | 290040ad9dd88a4d5608374efcafa73510e58e0b (diff) | |
o Use the new functions from jlib.
o Use the new exmpp_xml:node_to_list/3.
SVN Revision: 1391
Diffstat (limited to 'src/ejabberd_s2s_in.erl')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 70f5cecce..5c6e2d503 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -241,7 +241,7 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) -> SockMod == gen_tcp -> ?DEBUG("starttls", []), Socket = StateData#state.socket, - Proceed = exmpp_xml:document_fragment_to_list( + Proceed = exmpp_xml:node_to_list( exmpp_server_tls:proceed(), [?DEFAULT_NS], ?PREFIXED_NS), TLSOpts = StateData#state.tls_options, TLSSocket = (StateData#state.sockmod):starttls( @@ -408,8 +408,8 @@ stream_established({xmlstreamelement, El}, StateData) -> (Name == 'message') or (Name == 'presence')) -> % XXX OLD FORMAT: From, To. - FromOld = exmpp_jid:to_ejabberd_jid(From), - ToOld = exmpp_jid:to_ejabberd_jid(To), + FromOld = jlib:to_old_jid(From), + ToOld = jlib:to_old_jid(To), ejabberd_hooks:run( s2s_receive_packet, LFrom, @@ -431,8 +431,8 @@ stream_established({xmlstreamelement, El}, StateData) -> (Name == 'message') or (Name == 'presence')) -> % XXX OLD FORMAT: From, To. - FromOld = exmpp_jid:to_ejabberd_jid(From), - ToOld = exmpp_jid:to_ejabberd_jid(To), + FromOld = jlib:to_old_jid(From), + ToOld = jlib:to_old_jid(To), ejabberd_hooks:run( s2s_receive_packet, LFrom, @@ -574,7 +574,7 @@ send_element(StateData, El) -> change_shaper(StateData, Host, JID) -> % XXX OLD FORMAT: JIDOld is an old #jid. - JIDOld = exmpp_jid:to_ejabberd_jid(JID), + JIDOld = jlib:to_old_jid(JID), Shaper = acl:match_rule(Host, StateData#state.shaper, JIDOld), (StateData#state.sockmod):change_shaper(StateData#state.socket, Shaper). |