Reset retry timeout when receiving the first PONG, not right after receiving the...

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 661381ba395fc88ec07efe8d1894417ccd9a90a8..6b5b87405f92610b74a87f3872e2e0c22a38b328 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_auth.c,v 1.1.4.6 2002/03/23 20:01:05 guus Exp $
+    $Id: protocol_auth.c,v 1.1.4.7 2002/03/23 20:21:10 guus Exp $
 */
 
 #include "config.h"
@@ -602,11 +602,6 @@ cp
   /* Run MST and SSSP algorithms */
  
   graph();
-
-  /* Succesful connection, reset timeout if this is an outgoing connection. */
-  
-  if(c->outgoing)
-    c->outgoing->timeout = 0;
 cp
   return 0;
 }

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 0e4a86d7b6a996dd99e537597c4cf257f73944b8..9f1a5fb76349f4a58b6632770800b035c73a6696 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_misc.c,v 1.1.4.2 2002/03/01 14:09:31 guus Exp $
+    $Id: protocol_misc.c,v 1.1.4.3 2002/03/23 20:21:10 guus Exp $
 */
 
 #include "config.h"
@@ -143,6 +143,11 @@ int pong_h(connection_t *c)
 {
 cp
   c->status.pinged = 0;
+
+  /* Succesful connection, reset timeout if this is an outgoing connection. */
+  
+  if(c->outgoing)
+    c->outgoing->timeout = 0;
 cp
   return 0;
 }