Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

* src/ejabberd_s2s.erl: don't check blacklist for services.

Browse Source 
SVN Revision: 943
This commit is contained in:
Mickaël Rémond 2007-09-14 14:20:15 +00:00
parent de63c622c2
commit 5a0b8288d4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ejabberd_s2s.erl
View File

@ -250,9 +250,8 @@ find_connection(From, To) ->
%% We try to establish connection if the host is not a %% We try to establish connection if the host is not a
%% service and if the s2s host is not blacklisted or %% service and if the s2s host is not blacklisted or
%% is in whitelist: %% is in whitelist:
case {is_service(From, To), case not is_service(From, To) andalso allow_host(MyServer, Server) of
allow_host(MyServer, Server)} of true ->
{false, true} ->
Connections_Result = [new_connection(MyServer, Server, From, FromTo, Max_S2S_Connexions_Number) Connections_Result = [new_connection(MyServer, Server, From, FromTo, Max_S2S_Connexions_Number)
|| _N <- lists:seq(1, Max_S2S_Connexions_Number)], || _N <- lists:seq(1, Max_S2S_Connexions_Number)],
case [PID || {atomic, PID} <- Connections_Result] of case [PID || {atomic, PID} <- Connections_Result] of
@ -261,7 +260,7 @@ find_connection(From, To) ->
PIDs -> PIDs ->
{atomic, choose_connection(From, PIDs)} {atomic, choose_connection(From, PIDs)}
end; end;
_ -> false ->
{aborted, error} {aborted, error}
end; end;
L when is_list(L) , length(L) < Max_S2S_Connexions_Number -> L when is_list(L) , length(L) < Max_S2S_Connexions_Number ->