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

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 466016c..d567cd2 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,8 +1,8 @@
 /*
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
 /*
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen

-                  1998-2004 Ivo Timmermans <ivo@tinc-vpn.org>
-                  2000-2004 Guus Sliepen <guus@tinc-vpn.org>
+                  1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>

                  2000 Cris van Pelt <tribbel@arise.dhs.org>
 
     This program is free software; you can redistribute it and/or modify
                  2000 Cris van Pelt <tribbel@arise.dhs.org>
 
     This program is free software; you can redistribute it and/or modify


@@ -33,7 +33,8 @@
 
 avl_tree_t *config_tree;
 
 
 avl_tree_t *config_tree;
 

-int pingtimeout = 0;                   /* seconds before timeout */
+int pinginterval = 0;                  /* seconds between pings */
+int pingtimeout = 0;                   /* seconds to wait for response */

 char *confbase = NULL;                 /* directory in which all config files are */
 char *netname = NULL;                  /* name of the vpn network */
 
 char *confbase = NULL;                 /* directory in which all config files are */
 char *netname = NULL;                  /* name of the vpn network */
 


@@ -99,7 +100,7 @@ void config_add(avl_tree_t *config_tree, config_t *cfg)
        avl_insert(config_tree, cfg);
 }
 
        avl_insert(config_tree, cfg);
 }
 

-config_t *lookup_config(const avl_tree_t *config_tree, char *variable)
+config_t *lookup_config(avl_tree_t *config_tree, char *variable)

 {
        config_t cfg, *found;
 
 {
        config_t cfg, *found;
 


@@ -120,7 +121,7 @@ config_t *lookup_config(const avl_tree_t *config_tree, char *variable)
        return found;
 }
 
        return found;
 }
 

-config_t *lookup_config_next(const avl_tree_t *config_tree, const config_t *cfg)
+config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg)

 {
        avl_node_t *node;
        config_t *found;
 {
        avl_node_t *node;
        config_t *found;