s/sliepen.warande.net/sliepen.eu.org/g

[tinc] / src / protocol_misc.c

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 5863f9e..af1cb52 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -1,7 +1,7 @@
 /*
     protocol_misc.c -- handle the meta-protocol, miscellaneous functions
 /*
     protocol_misc.c -- handle the meta-protocol, miscellaneous functions

-    Copyright (C) 1999-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1999-2002 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by


@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     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.1 2002/02/11 10:05:58 guus Exp $
+    $Id: protocol_misc.c,v 1.1.4.4 2002/06/21 10:11:19 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -122,7 +122,7 @@ int send_ping(connection_t *c)
 {
 cp
   c->status.pinged = 1;
 {
 cp
   c->status.pinged = 1;

-  c->last_ping_time = time(NULL);
+  c->last_ping_time = now;

 cp
   return send_request(c, "%d", PING);
 }
 cp
   return send_request(c, "%d", PING);
 }


@@ -143,6 +143,11 @@ int pong_h(connection_t *c)
 {
 cp
   c->status.pinged = 0;
 {
 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;
 }
 cp
   return 0;
 }