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_s2s_in.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 'src/ejabberd_s2s_in.erl')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index bf4afb5b..7a6bc46e 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -44,7 +44,6 @@ -export([stop/1, close/1, close/2, send/2, update_state/2, establish/1, host_up/1, host_down/1]). --include("ejabberd.hrl"). -include("xmpp.hrl"). -include("logger.hrl"). @@ -263,10 +262,10 @@ init([State, Opts]) -> State1 = State#{tls_options => TLSOpts2, auth_domains => sets:new(), xmlns => ?NS_SERVER, - lang => ?MYLANG, - server => ?MYNAME, - lserver => ?MYNAME, - server_host => ?MYNAME, + lang => ejabberd_config:get_mylang(), + server => ejabberd_config:get_myname(), + lserver => ejabberd_config:get_myname(), + server_host => ejabberd_config:get_myname(), established => false, shaper => Shaper}, State2 = xmpp_stream_in:set_timeout(State1, Timeout), |