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

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 5863f9e9..3e48970a 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.5 2002/09/09 19:40:08 guus Exp $
 */
 
 #include "config.h"
@@ -44,10 +44,10 @@
 
 int send_status(connection_t *c, int statusno, char *statusstring)
 {
-cp
+  cp();
   if(!statusstring)
     statusstring = status_text[statusno];
-cp
+  cp();
   return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
 }
 
@@ -55,7 +55,7 @@ int status_h(connection_t *c)
 {
   int statusno;
   char statusstring[MAX_STRING_SIZE];
-cp
+  cp();
   if(sscanf(c->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
     {
        syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
@@ -69,13 +69,13 @@ cp
              c->name, c->hostname, status_text[statusno], statusstring);
     }
 
-cp
+  cp();
   return 0;
 }
 
 int send_error(connection_t *c, int err, char *errstring)
 {
-cp
+  cp();
   if(!errstring)
     errstring = strerror(err);
   return send_request(c, "%d %d %s", ERROR, err, errstring);
@@ -85,7 +85,7 @@ int error_h(connection_t *c)
 {
   int err;
   char errorstring[MAX_STRING_SIZE];
-cp
+  cp();
   if(sscanf(c->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
     {
        syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
@@ -100,50 +100,55 @@ cp
     }
 
   terminate_connection(c, c->status.active);
-cp
+  cp();
   return 0;
 }
 
 int send_termreq(connection_t *c)
 {
-cp
+  cp();
   return send_request(c, "%d", TERMREQ);
 }
 
 int termreq_h(connection_t *c)
 {
-cp
+  cp();
   terminate_connection(c, c->status.active);
-cp
+  cp();
   return 0;
 }
 
 int send_ping(connection_t *c)
 {
-cp
+  cp();
   c->status.pinged = 1;
-  c->last_ping_time = time(NULL);
-cp
+  c->last_ping_time = now;
+  cp();
   return send_request(c, "%d", PING);
 }
 
 int ping_h(connection_t *c)
 {
-cp
+  cp();
   return send_pong(c);
 }
 
 int send_pong(connection_t *c)
 {
-cp
+  cp();
   return send_request(c, "%d", PONG);
 }
 
 int pong_h(connection_t *c)
 {
-cp
+  cp();
   c->status.pinged = 0;
-cp
+
+  /* Succesful connection, reset timeout if this is an outgoing connection. */
+  
+  if(c->outgoing)
+    c->outgoing->timeout = 0;
+  cp();
   return 0;
 }
 
@@ -152,21 +157,21 @@ cp
 int send_tcppacket(connection_t *c, vpn_packet_t *packet)
 {
   int x;
-cp  
+  cp();
   /* Evil hack. */
 
   x = send_request(c, "%d %hd", PACKET, packet->len);
 
   if(x)
     return x;
-cp
+  cp();
   return send_meta(c, packet->data, packet->len);
 }
 
 int tcppacket_h(connection_t *c)
 {
   short int len;
-cp  
+  cp();
   if(sscanf(c->buffer, "%*d %hd", &len) != 1)
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name, c->hostname);
@@ -176,7 +181,7 @@ cp
   /* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */
 
   c->tcplen = len;
-cp
+  cp();
   return 0;
 }