diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
| commit | fd8e07af4789be362a61755ea47f216baeb64989 (patch) | |
| tree | 0ac0a7a779fd27e79e940519441161dc0c4dfd5f /src/ejabberd_c2s.erl | |
| parent | Log modules startup (diff) | |
Get rid of ejabberd.hrl header
The header consisted of too many unrelated stuff and macros misuse.
Some stuff is moved into scram.hrl and type_compat.hrl.
All macros have been replaced with the corresponding function calls.
TODO: probably type_compat.hrl is not even needed anymore since
we support only Erlang >= OTP 17.5
Diffstat (limited to '')
| -rw-r--r-- | src/ejabberd_c2s.erl | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index df1b9e2f9..a994d1713 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -51,7 +51,6 @@ reply/2, copy_state/2, set_timeout/2, route/2, host_up/1, host_down/1]). --include("ejabberd.hrl"). -include("xmpp.hrl"). -include("logger.hrl"). -include("mod_roster.hrl"). @@ -415,7 +414,7 @@ bind(R, #{user := U, server := S, access := Access, lang := Lang, handle_stream_start(StreamStart, #{lserver := LServer} = State) -> case ejabberd_router:is_my_host(LServer) of false -> - send(State#{lserver => ?MYNAME}, xmpp:serr_host_unknown()); + send(State#{lserver => ejabberd_config:get_myname()}, xmpp:serr_host_unknown()); true -> State1 = change_shaper(State), Opts = ejabberd_config:codec_options(LServer), @@ -526,9 +525,9 @@ init([State, Opts]) -> tls_verify => TLSVerify, pres_a => ?SETS:new(), zlib => Zlib, - lang => ?MYLANG, - server => ?MYNAME, - lserver => ?MYNAME, + lang => ejabberd_config:get_mylang(), + server => ejabberd_config:get_myname(), + lserver => ejabberd_config:get_myname(), access => Access, shaper => Shaper}, State2 = xmpp_stream_in:set_timeout(State1, Timeout), @@ -1041,7 +1040,7 @@ listen_opt_type(backlog) -> listen_opt_type(accept_interval) -> fun(I) when is_integer(I), I>=0 -> I end; listen_opt_type(O) -> - StreamOpts = mod_stream_mgmt:mod_options(?MYNAME), + StreamOpts = mod_stream_mgmt:mod_options(ejabberd_config:get_myname()), case lists:keyfind(O, 1, StreamOpts) of false -> [access, shaper, certfile, ciphers, dhfile, cafile, |