X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=af1cb527eb1426f9a31cce802861af40bb45a6da;hp=5863f9e9c7d471dcd3e9415c89a50488d2dc57f8;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=5bf4b88666ecafe190e8ed71d6c14c9de8d16e1f

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 5863f9e9..af1cb527 100644
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -1,7 +1,7 @@
 /*
     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
@@ -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.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"
@@ -122,7 +122,7 @@ int send_ping(connection_t *c)
 {
 cp
   c->status.pinged = 1;
-  c->last_ping_time = time(NULL);
+  c->last_ping_time = now;
 cp
   return send_request(c, "%d", PING);
 }
@@ -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;
 }