Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-02 21:17:12 +02:00
Code Releases Activity

max_s2s_connexions_number local parameter added.

Browse Source 
SVN Revision: 937
This commit is contained in:
Mickaël Rémond 2007-09-14 14:18:51 +00:00
parent f6bf5973ef
commit 78e6eb58d4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ejabberd_s2s.erl
View File

@ -32,6 +32,8 @@
-include("jlib.hrl"). -include("jlib.hrl").
-include("ejabberd_ctl.hrl"). -include("ejabberd_ctl.hrl").
-define(DEFAULT_MAX_S2S_CONNEXIONS_NUMBER, 3).
-record(s2s, {fromto, pid, key}). -record(s2s, {fromto, pid, key}).
-record(state, {}). -record(state, {}).
@ -89,7 +91,7 @@ has_key(FromTo, Key) ->
try_register(FromTo) -> try_register(FromTo) ->
Key = randoms:get_string(), Key = randoms:get_string(),
Max_S2S_Connexions_Number = 3, Max_S2S_Connexions_Number = max_s2s_connexions_number(element(1, FromTo)),
F = fun() -> F = fun() ->
case mnesia:read({s2s, FromTo}) of case mnesia:read({s2s, FromTo}) of
L when length(L) < Max_S2S_Connexions_Number -> L when length(L) < Max_S2S_Connexions_Number ->
@ -239,7 +241,7 @@ find_connection(From, To) ->
#jid{lserver = MyServer} = From, #jid{lserver = MyServer} = From,
#jid{lserver = Server} = To, #jid{lserver = Server} = To,
FromTo = {MyServer, Server}, FromTo = {MyServer, Server},
Max_S2S_Connexions_Number = 3, Max_S2S_Connexions_Number = max_s2s_connexions_number(MyServer),
?ERROR_MSG("XXX Finding connection for ~p~n", [FromTo]), ?ERROR_MSG("XXX Finding connection for ~p~n", [FromTo]),
case catch mnesia:dirty_read(s2s, FromTo) of case catch mnesia:dirty_read(s2s, FromTo) of
{'EXIT', Reason} -> {'EXIT', Reason} ->
@ -294,6 +296,14 @@ new_connection(MyServer, Server, From, FromTo, Max_S2S_Connexions_Number) ->
end, end,
TRes. TRes.
max_s2s_connexions_number(Host) ->
case ejabberd_config:get_local_option({max_s2s_connexions_number, Host}) of
N when is_integer(N) ->
N;
_ ->
?DEFAULT_MAX_S2S_CONNEXIONS_NUMBER
end.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Function: is_service(From, To) -> true | false %% Function: is_service(From, To) -> true | false