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

Try to open all s2s connections at the same time, to guarantee the right order of the packets.

Browse Source 
SVN Revision: 941
This commit is contained in:
Mickaël Rémond 2007-09-14 14:19:48 +00:00
parent 9dd8e1bf04
commit b3fb9d9100
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ejabberd_s2s.erl
View File

@ -253,7 +253,14 @@ find_connection(From, To) ->
case {is_service(From, To), case {is_service(From, To),
allow_host(MyServer, Server)} of allow_host(MyServer, Server)} of
{false, true} -> {false, true} ->
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)],
case [PID || {atomic, PID} <- Connections_Result] of
[] ->
hd(Connections_Result);
PIDs ->
{atomic, choose_connection(From, PIDs)}
end;
_ -> _ ->
{aborted, error} {aborted, error}
end; end;
@ -266,11 +273,17 @@ find_connection(From, To) ->
end. end.
choose_connection(From, Connections) -> choose_connection(From, Connections) ->
% use sticky connections based on the full JID of the sender
El = lists:nth(erlang:phash(From, length(Connections)), Connections),
%El = lists:nth(random:uniform(length(Connections)), Connections), %El = lists:nth(random:uniform(length(Connections)), Connections),
?ERROR_MSG("XXX using ejabberd_s2s_out ~p~n", [El#s2s.pid]), % use sticky connections based on the full JID of the sender
El#s2s.pid. Pid = case lists:nth(erlang:phash(From, length(Connections)), Connections) of
El when is_record(El, s2s) ->
El#s2s.pid;
P when is_pid(P) ->
P
end,
?ERROR_MSG("XXX using ejabberd_s2s_out ~p~n", [Pid]),
Pid.
new_connection(MyServer, Server, From, FromTo, Max_S2S_Connexions_Number) -> new_connection(MyServer, Server, From, FromTo, Max_S2S_Connexions_Number) ->
Key = randoms:get_string(), Key = randoms:get_string(),