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

Don't mess with s2s out when aborting s2s in

Browse Source 
Don't try to look up and close outgoing connections to a given server
when aborting incoming connections from that server due to certificate
verification errors.  The ejabberd_s2s:find_connection/2 call actually
created one or more *new* connections if less than 'max_s2s_connections'
connections were found.  Then, no more than one of those possibly new
connections were stopped by the ejabberd_s2s_out:stop_connection/1 call.

It's not really necessary to bother with outgoing connections at all,
here.
This commit is contained in:
Holger Weiss 2014-04-28 00:17:05 +02:00
parent eabca82765
commit 1aa4ed3f35
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ejabberd_s2s_in.erl
View File

@ -297,13 +297,6 @@ wait_for_stream({xmlstreamstart, _Name, Attrs},
<<(xml:element_to_binary(?SERRT_POLICY_VIOLATION(<<"en">>, <<(xml:element_to_binary(?SERRT_POLICY_VIOLATION(<<"en">>,
CertError)))/binary, CertError)))/binary,
(?STREAM_TRAILER)/binary>>), (?STREAM_TRAILER)/binary>>),
{atomic, Pid} =
ejabberd_s2s:find_connection(jlib:make_jid(<<"">>,
Server, <<"">>),
jlib:make_jid(<<"">>,
RemoteServer,
<<"">>)),
ejabberd_s2s_out:stop_connection(Pid),
{stop, normal, StateData}; {stop, normal, StateData};
{VerifyResult, RemoteServer, Msg} -> {VerifyResult, RemoteServer, Msg} ->
{SASL, NewStateData} = case VerifyResult of {SASL, NewStateData} = case VerifyResult of