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

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index aa2fbfb..3847b34 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
-    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-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: net_setup.c,v 1.1.2.50 2003/12/20 21:25:17 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -460,6 +460,10 @@ bool setup_myself(void)
        for(i = 0; i < 5; i++)
                free(envp[i]);
 
+       /* Run subnet-up scripts for our own subnets */
+
+       subnet_update(myself, NULL, true);
+
        /* Open sockets */
 
        get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
@@ -530,12 +534,20 @@ bool setup_network_connections(void)
        init_events();
        init_requests();
 
-       if(get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout)) {
-               if(pingtimeout < 1) {
-                       pingtimeout = 86400;
+       if(get_config_int(lookup_config(config_tree, "PingInterval"), &pinginterval)) {
+               if(pinginterval < 1) {
+                       pinginterval = 86400;
                }
        } else
-               pingtimeout = 60;
+               pinginterval = 60;
+
+       if(!get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
+               pingtimeout = 5;
+       if(pingtimeout < 1 || pingtimeout > pinginterval)
+               pingtimeout = pinginterval;
+
+       if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
+               maxoutbufsize = 4 * MTU;
 
        if(!setup_myself())
                return false;
@@ -566,8 +578,10 @@ void close_network_connections(void)
                terminate_connection(c, false);
        }
 
-       if(myself && myself->connection)
+       if(myself && myself->connection) {
+               subnet_update(myself, NULL, false);
                terminate_connection(myself->connection, false);
+       }
 
        for(i = 0; i < listen_sockets; i++) {
                close(listen_socket[i].tcp);