* src/ejabberd_listener.erl: Define send timeout option to avoid blocking on socket send (EJAB-746).

* src/ejabberd_s2s_out.erl: Likewise.

SVN Revision: 1784

ChangeLog

@@ -1,3 +1,9 @@
+2009-01-08  Mickael Remond  <mremond@process-one.net>
+
+	* src/ejabberd_listener.erl: Define send timeout option to avoid
+	blocking on socket send (EJAB-746).
+	* src/ejabberd_s2s_out.erl: Likewise.
+
 2009-01-08  Christophe Romain <christophe.romain@process-one.net>
 
 	* src/mod_pubsub/mod_pubsub.erl: completely support subscription using

src/ejabberd_listener.erl

@@ -38,6 +38,9 @@
 
 -include("ejabberd.hrl").
 
+%% We do not block on send anymore.
+-define(TCP_SEND_TIMEOUT, 15000).
+
 start_link() ->
     supervisor:start_link({local, ejabberd_listeners}, ?MODULE, []).
 
@@ -100,6 +103,7 @@ init(Port, Module, Opts) ->
 				{active, false},
 				{reuseaddr, true},
 				{nodelay, true},
+				{send_timeout, ?TCP_SEND_TIMEOUT},
 				{keepalive, true} |
 				SockOpts]),
     case Res of

src/ejabberd_s2s_out.erl

@@ -95,6 +95,9 @@
 %% -define(FSMLIMITS, [{max_queue, 2000}]).
 -define(FSMTIMEOUT, 30000).
 
+%% We do not block on send anymore.
+-define(TCP_SEND_TIMEOUT, 15000).
+
 %% Maximum delay to wait before retrying to connect after a failed attempt.
 %% Specified in miliseconds. Default value is 5 minutes.
 -define(MAX_RETRY_DELAY, 300000).
@@ -267,6 +270,7 @@ open_socket2(Type, Addr, Port) ->
     Timeout = outgoing_s2s_timeout(),
     case (catch ejabberd_socket:connect(Addr, Port,
 					[binary, {packet, 0},
+					 {send_timeout, ?TCP_SEND_TIMEOUT},
 					 {active, false}, Type],
 					Timeout)) of
 	{ok, _Socket} = R -> R;