* src/ejabberd_s2s_out.erl: Increase dialback timeout as dialback can

sometimes take longer than expected.

SVN Revision: 1052

diff --git a/ChangeLog b/ChangeLog
index 1b3bba28a50052a572f0befe4480160493af5428..c15ddf3e5ea606069af1dd2d222c3fb331a60f48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
+2007-12-08  Mickael Remond  <mremond@process-one.net>
 
-2007-12-06  Christophe Romain <christophe.romain@process-one.net>
+       * src/ejabberd_s2s_out.erl: Increase dialback timeout as dialback can
+        sometimes take longer than expected.
+
+2007-12-08  Christophe Romain <christophe.romain@process-one.net>
 
        * src/mod_pubsub/mod_pubsub.erl: disco_sm_items bugfix
 

diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index d72f1f38693c43f00d04d523da68970defd141e2..b7116e1a7fcb1d030df110668a4d93734e719c62 100644 (file)
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -305,8 +305,10 @@ wait_for_validation({xmlstreamelement, El}, StateData) ->
            ?DEBUG("recv verify: ~p", [{From, To, Id, Type}]),
            case StateData#state.verify of
                false ->
+                   NextState = wait_for_validation,
                    %% TODO: Should'nt we close the connection here ?
-                   {next_state, wait_for_validation, StateData, ?FSMTIMEOUT};
+                   {next_state, NextState, StateData,
+                    get_timeout_interval(NextState)};
                {Pid, _Key, _SID} ->
                    case Type of
                        "valid" ->
@@ -324,8 +326,9 @@ wait_for_validation({xmlstreamelement, El}, StateData) ->
                        StateData#state.verify == false ->
                            {stop, normal, StateData};
                        true ->
-                           {next_state, wait_for_validation, StateData,
-                            ?FSMTIMEOUT*3}
+                           NextState = wait_for_validation,
+                           {next_state, NextState, StateData,
+                            get_timeout_interval(NextState)}
                    end
            end;
        _ ->