X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=45567d203f5e0e818e2e439a375c63f649931b72;hb=0e6856b1379e278aa5ed116d0911851339a6064c;hp=b4e14b0da6813143d106cf7a131d511dfd3b25e0;hpb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index b4e14b0d..45567d20 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.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
@@ -16,8 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
 */
 
 #include "system.h"
@@ -75,7 +73,7 @@ bool send_request(connection_t *c, const char *format, ...)
 
 	cp();
 
-	/* Use vsnprintf instead of vasprintf: faster, no memory
+	/* Use vsnprintf instead of vxasprintf: faster, no memory
 	   fragmentation, cleanup is automatic, and there is a limit on the
 	   input buffer anyway */
 
@@ -241,7 +239,7 @@ void age_past_requests(void)
 		next = node->next;
 		p = node->data;
 
-		if(p->firstseen + pingtimeout < now)
+		if(p->firstseen + pinginterval < now)
 			avl_delete_node(past_request_tree, node), deleted++;
 		else
 			left++;