From 8c33e12616109fd94d764e8b78158a16f2b29e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Tue, 1 Jul 2008 08:01:06 +0000 Subject: [PATCH] Use the new clause of exmpp_stanza:reply_with_error/2, exmpp_iq:error/2, exmpp_iq:error_without_original/2 and the new exmpp_jid:make_bare_jid/1. SVN Revision: 1394 --- ChangeLog | 6 ++++++ src/ejabberd_c2s.erl | 29 ++++++++++++----------------- src/ejabberd_s2s.erl | 2 +- src/ejabberd_s2s_in.erl | 2 +- src/ejabberd_s2s_out.erl | 3 +-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cb3c2887..e6197bc00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,12 @@ * src/ejabberd_sm.erl: Convert to exmpp. + * src/ejabberd_c2s.erl, src/ejabberd_s2s.erl, src/ejabberd_s2s_in.erl, + src/ejabberd_s2s_out.erl: Use the new clause of + exmpp_stanza:reply_with_error/2, exmpp_iq:error/2, + exmpp_iq:error_without_original/2 and the new + exmpp_jid:make_bare_jid/1. + 2008-06-30 Jean-Sébastien Pédron * src/Makefile.in: Remove the -I flag for exmpp includes; the diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 91a866d47..86892b195 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -124,6 +124,7 @@ [?NS_JABBER_CLIENT], [{?NS_XMPP, "stream"}])). -define(ERR_FEATURE_NOT_IMPLEMENTED, ?STANZA_ERROR('feature-not-implemented')). +% XXX OLD FORMAT: Re-include jlib.hrl (after clean-up). -record(iq, {id = "", type, xmlns = "", @@ -236,7 +237,7 @@ wait_for_stream({xmlstreamstart, #xmlel{ns = NS} = Opening}, StateData) -> true -> Lang = exmpp_stream:get_lang(Opening), change_shaper(StateData, - exmpp_jid:make_bare_jid(undefined, Server)), + exmpp_jid:make_bare_jid(Server)), case exmpp_stream:get_version(Opening) of {1, 0} -> send_element(StateData, Header), @@ -442,8 +443,8 @@ wait_for_auth({xmlstreamelement, El}, StateData) -> "(~w) Failed legacy authentication for ~s", [StateData#state.socket, exmpp_jid:jid_to_string(JID)]), - Err = exmpp_stanza:error('not-authorized'), - Res = exmpp_iq:error_without_original(El, Err), + Res = exmpp_iq:error_without_original(El, + 'not-authorized'), send_element(StateData, Res), fsm_next_state(wait_for_auth, StateData) end; @@ -452,8 +453,8 @@ wait_for_auth({xmlstreamelement, El}, StateData) -> "(~w) Forbidden legacy authentication for ~s", [StateData#state.socket, exmpp_jid:jid_to_string(JID)]), - Err = exmpp_stanza:error('not-allowed'), - Res = exmpp_iq:error_without_original(El, Err), + Res = exmpp_iq:error_without_original(El, + 'not-allowed'), send_element(StateData, Res), fsm_next_state(wait_for_auth, StateData) end @@ -463,8 +464,7 @@ wait_for_auth({xmlstreamelement, El}, StateData) -> "(~w) Forbidden legacy authentication for " "username '~s' with resource '~s'", [StateData#state.socket, U, R]), - Err1 = exmpp_stanza:error('jid-malformed'), - Res1 = exmpp_iq:error_without_original(El, Err1), + Res1 = exmpp_iq:error_without_original(El, 'jid-malformed'), send_element(StateData, Res1), fsm_next_state(wait_for_auth, StateData) end; @@ -1134,8 +1134,7 @@ handle_info({route, FromOld, ToOld, PacketOld}, StateName, StateData) -> {false, Attrs, StateData} end end; - % XXX OLD FORMAT: broadcast? - #xmlel{ns = _NS, name = 'broadcast', attrs = Attrs} -> + #xmlel{name = 'broadcast', attrs = Attrs} -> % XXX OLD FORMAT: Els are #xmlelement. Els = PacketOld#xmlelement.children, ?DEBUG("broadcast~n~p~n", [Els]), @@ -1182,8 +1181,7 @@ handle_info({route, FromOld, ToOld, PacketOld}, StateName, StateData) -> gen_iq_handler:handle(Host, Module, Function, Opts, FromOld, ToOld, IQ); [] -> - Err = exmpp_stanza:error('feature-not-implemented'), - Res = exmpp_iq:error(Packet, Err), + Res = exmpp_iq:error(Packet, 'feature-not-implemented'), ejabberd_router:route(To, From, Res) end, {false, Attrs, StateData}; @@ -1200,9 +1198,7 @@ handle_info({route, FromOld, ToOld, PacketOld}, StateName, StateData) -> allow -> {true, Attrs, StateData}; deny -> - Err = exmpp_stanza:error( - 'feature-not-implemented'), - Res = exmpp_iq:error(Packet, Err), + Res = exmpp_iq:error(Packet, 'feature-not-implemented'), ejabberd_router:route(To, From, Res), {false, Attrs, StateData} end @@ -1975,10 +1971,9 @@ process_unauthenticated_stanza(StateData, El) -> % The only reasonable IQ's here are auth and register IQ's % They contain secrets, so don't include subelements to response ResIQ = exmpp_iq:error_without_original(El, - exmpp_stanza:error(El#xmlel.ns, 'service-unavailable')), + 'service-unavailable'), Res1 = exmpp_stanza:set_sender(ResIQ, - exmpp_jid:make_bare_jid(undefined, - StateData#state.server)), + exmpp_jid:make_bare_jid(StateData#state.server)), Res2 = exmpp_stanza:remove_recipient(Res1), send_element(StateData, Res2); _ -> diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl index a5f67fa9f..e023cd4a2 100644 --- a/src/ejabberd_s2s.erl +++ b/src/ejabberd_s2s.erl @@ -291,7 +291,7 @@ do_route(From, To, Packet) -> "result" -> ok; _ -> Err = exmpp_stanza:reply_with_error(Packet, - exmpp_stanza:error('service-unavailable')), + 'service-unavailable'), ejabberd_router:route(To, From, Err) end, false diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 6504ec9f8..b3229a69e 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -346,7 +346,7 @@ stream_established({xmlstreamelement, El}, StateData) -> Conns = ?DICT:store({LFrom, LTo}, wait_for_verification, StateData#state.connections), change_shaper(StateData, LTo, - exmpp_jid:make_bare_jid(undefined, LFrom)), + exmpp_jid:make_bare_jid(LFrom)), {next_state, stream_established, StateData#state{connections = Conns, diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index bcf5b811b..93171ced3 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -812,8 +812,7 @@ bounce_element(El, Condition) -> "error" -> ok; "result" -> ok; _ -> - Error = exmpp_stanza:error(El#xmlel.ns, Condition), - Err = exmpp_stanza:reply_with_error(El, Error), + Err = exmpp_stanza:reply_with_error(El, Condition), From = exmpp_jid:string_to_jid(exmpp_stanza:get_sender(El)), To = exmpp_jid:string_to_jid(exmpp_stanza:get_recipient(El)), % No namespace conversion (:server <-> :client) is done.