diff options
Diffstat (limited to 'src/mod_sic.erl')
| -rw-r--r-- | src/mod_sic.erl | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/src/mod_sic.erl b/src/mod_sic.erl index 6a417b9b0..ef043c642 100644 --- a/src/mod_sic.erl +++ b/src/mod_sic.erl @@ -32,22 +32,21 @@ -behaviour(gen_mod). -export([start/2, stop/1, reload/3, process_local_iq/1, - process_sm_iq/1, mod_opt_type/1, mod_options/1, depends/2]). + process_sm_iq/1, mod_options/1, depends/2]). -include("ejabberd.hrl"). -include("logger.hrl"). -include("xmpp.hrl"). -start(Host, Opts) -> - IQDisc = gen_mod:get_opt(iqdisc, Opts), +start(Host, _Opts) -> gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_SIC_0, - ?MODULE, process_local_iq, IQDisc), + ?MODULE, process_local_iq), gen_iq_handler:add_iq_handler(ejabberd_sm, Host, ?NS_SIC_0, - ?MODULE, process_sm_iq, IQDisc), + ?MODULE, process_sm_iq), gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_SIC_1, - ?MODULE, process_local_iq, IQDisc), + ?MODULE, process_local_iq), gen_iq_handler:add_iq_handler(ejabberd_sm, Host, ?NS_SIC_1, - ?MODULE, process_sm_iq, IQDisc). + ?MODULE, process_sm_iq). stop(Host) -> gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_SIC_0), @@ -55,20 +54,8 @@ stop(Host) -> gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_SIC_1), gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_SIC_1). -reload(Host, NewOpts, OldOpts) -> - case gen_mod:is_equal_opt(iqdisc, NewOpts, OldOpts) of - {false, IQDisc, _} -> - gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_SIC_0, - ?MODULE, process_local_iq, IQDisc), - gen_iq_handler:add_iq_handler(ejabberd_sm, Host, ?NS_SIC_0, - ?MODULE, process_sm_iq, IQDisc), - gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_SIC_1, - ?MODULE, process_local_iq, IQDisc), - gen_iq_handler:add_iq_handler(ejabberd_sm, Host, ?NS_SIC_1, - ?MODULE, process_sm_iq, IQDisc); - true -> - ok - end. +reload(_Host, _NewOpts, _OldOpts) -> + ok. depends(_Host, _Opts) -> []. @@ -107,7 +94,5 @@ get_ip({User, Server, Resource}, xmpp:make_error(IQ, xmpp:err_item_not_found(Txt, Lang)) end. -mod_opt_type(iqdisc) -> fun gen_iq_handler:check_type/1. - -mod_options(Host) -> - [{iqdisc, gen_iq_handler:iqdisc(Host)}]. +mod_options(_Host) -> + []. |