Apply patch from Scott Lamb adding an output buffer for the TCP sockets.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index e6c13f4..de7f8b8 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2001 Ivo Timmermans <ivo@o2w.nl>,
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2005 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
@@ -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.c,v 1.28.4.148 2003/11/17 15:30:17 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -241,7 +241,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++;