X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=3eb564411e5affc45d1d8c52d0c2c84067c91d12;hp=d03869e624ea5e9e327e3d921ac8679493c34000;hb=43fa7283ac01f2ecc95381b519ef6b3342546f35;hpb=f88c9942e1e3d4d463ec71ba5a60d045381bda8f

diff --git a/src/net_setup.c b/src/net_setup.c
index d03869e6..3eb56441 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  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
@@ -286,9 +286,6 @@ bool setup_myself(void)
 	if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice) && choice)
 		myself->options |= OPTION_TCPONLY;
 
-	if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice)
-		myself->options |= OPTION_PMTU_DISCOVERY;
-
 	if(myself->options & OPTION_TCPONLY)
 		myself->options |= OPTION_INDIRECT;
 
@@ -309,6 +306,10 @@ bool setup_myself(void)
 	} else
 		routing_mode = RMODE_ROUTER;
 
+	if(routing_mode == RMODE_ROUTER)
+		if(!get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) || choice)
+			myself->options |= OPTION_PMTU_DISCOVERY;
+
 	get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
 
 #if !defined(SOL_IP) || !defined(IP_TOS)
@@ -437,7 +438,6 @@ bool setup_myself(void)
 
 	myself->nexthop = myself;
 	myself->via = myself;
-	myself->status.active = true;
 	myself->status.reachable = true;
 	node_add(myself);
 
@@ -527,11 +527,11 @@ bool setup_network_connections(void)
 
 	now = time(NULL);
 
+	init_events();
 	init_connections();
 	init_subnets();
 	init_nodes();
 	init_edges();
-	init_events();
 	init_requests();
 
 	if(get_config_int(lookup_config(config_tree, "PingInterval"), &pinginterval)) {
@@ -547,7 +547,7 @@ bool setup_network_connections(void)
 		pingtimeout = pinginterval;
 
 	if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
-		maxoutbufsize = 4 * MTU;
+		maxoutbufsize = 10 * MTU;
 
 	if(!setup_myself())
 		return false;
@@ -572,15 +572,16 @@ void close_network_connections(void)
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
 		c = node->data;
-
-		if(c->outgoing)
-			free(c->outgoing->name), free(c->outgoing), c->outgoing = NULL;
+		c->outgoing = false;
 		terminate_connection(c, false);
 	}
 
+	list_delete_list(outgoing_list);
+
 	if(myself && myself->connection) {
 		subnet_update(myself, NULL, false);
 		terminate_connection(myself->connection, false);
+		free_connection(myself->connection);
 	}
 
 	for(i = 0; i < listen_sockets; i++) {
@@ -595,14 +596,18 @@ void close_network_connections(void)
 	envp[4] = NULL;
 
 	exit_requests();
-	exit_events();
 	exit_edges();
 	exit_subnets();
 	exit_nodes();
 	exit_connections();
+	exit_events();
 
 	execute_script("tinc-down", envp);
 
+	if(myport) free(myport);
+
+	EVP_CIPHER_CTX_cleanup(&packet_ctx);
+
 	for(i = 0; i < 4; i++)
 		free(envp[i]);