diff options
| author | Badlop <badlop@process-one.net> | 2009-10-19 14:47:05 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2009-10-19 14:47:05 +0000 |
| commit | 257e4c34a86e0dfa3c8eb846b5916df13afb5958 (patch) | |
| tree | 08cf774d38a6821b3f8431c7a8f8e29a9bd84e1a | |
| parent | Support ejabberd_listener option 'backlog' to increase TCP backlog (thanks to... (diff) | |
Provide send_timeout_close option in TCP only in R13B or higher (EJAB-926)
SVN Revision: 2680
| -rw-r--r-- | src/ejabberd_listener.erl | 7 | ||||
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl index 7d5ca2fa..bfed0e33 100644 --- a/src/ejabberd_listener.erl +++ b/src/ejabberd_listener.erl @@ -127,15 +127,18 @@ init_udp(PortIP, Module, Opts, SockOpts, Port, IPS) -> end. init_tcp(PortIP, Module, Opts, SockOpts, Port, IPS) -> + SockOpts2 = case erlang:system_info(otp_release) >= "R13B" of + true -> [{send_timeout_close, true} | SockOpts]; + false -> [] + end, Res = gen_tcp:listen(Port, [binary, {packet, 0}, {active, false}, {reuseaddr, true}, {nodelay, true}, {send_timeout, ?TCP_SEND_TIMEOUT}, - {send_timeout_close, true}, {keepalive, true} | - SockOpts]), + SockOpts2]), case Res of {ok, ListenSocket} -> %% Inform my parent that this port was opened succesfully diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 8fb82c07..726d624e 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -265,11 +265,15 @@ open_socket1(Host, Port) -> open_socket2(Type, Addr, Port) -> ?DEBUG("s2s_out: connecting to ~p:~p~n", [Addr, Port]), Timeout = outgoing_s2s_timeout(), + SockOpts = case erlang:system_info(otp_release) >= "R13B" of + true -> [{send_timeout_close, true}]; + false -> [] + end, case (catch ejabberd_socket:connect(Addr, Port, [binary, {packet, 0}, {send_timeout, ?TCP_SEND_TIMEOUT}, {send_timeout_close, true}, - {active, false}, Type], + {active, false}, Type | SockOpts], Timeout)) of {ok, _Socket} = R -> R; {error, Reason} = R -> |