X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fnet_setup.c;h=7d20803d28f755843d5ed2dbb6b7acce4c784f6d;hp=2b177c1398bdd175c3d1966f9c70f66a4eebec3e;hb=b45511118421920771f5dcd5e4bafc04376e4450;hpb=4c85542894f7fca823b119b05e07179deb24229a

diff --git a/src/net_setup.c b/src/net_setup.c
index 2b177c1..7d20803 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -2,6 +2,7 @@
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
                   2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2006      Scott Lamb <slamb@slamb.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
@@ -217,8 +218,8 @@ bool setup_myself(void) {
 	myself->connection = new_connection();
 	init_configuration(&myself->connection->config_tree);
 
-	xasprintf(&myself->hostname, "MYSELF");
-	xasprintf(&myself->connection->hostname, "MYSELF");
+	myself->hostname = xstrdup("MYSELF");
+	myself->connection->hostname = xstrdup("MYSELF");
 
 	myself->connection->options = 0;
 	myself->connection->protocol_version = PROT_CURRENT;
@@ -245,8 +246,9 @@ bool setup_myself(void) {
 	if(!read_rsa_private_key())
 		return false;
 
-	if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
-		xasprintf(&myport, "655");
+	if(!get_config_string(lookup_config(config_tree, "Port"), &myport)
+			&& !get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
+		myport = xstrdup("655");
 
 	/* Read in all the subnets specified in the host configuration file */
 
@@ -295,13 +297,18 @@ bool setup_myself(void) {
 	} else
 		routing_mode = RMODE_ROUTER;
 
-	// Enable PMTUDiscovery by default if we are in router mode.
-
-	choice = routing_mode == RMODE_ROUTER;
+	choice = true;
 	get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice);
-	if(choice)	
+	get_config_bool(lookup_config(config_tree, "PMTUDiscovery"), &choice);
+	if(choice)
 		myself->options |= OPTION_PMTU_DISCOVERY;
 
+	choice = true;
+	get_config_bool(lookup_config(config_tree, "ClampMSS"), &choice);
+	get_config_bool(lookup_config(myself->connection->config_tree, "ClampMSS"), &choice);
+	if(choice)
+		myself->options |= OPTION_CLAMP_MSS;
+
 	get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
 
 #if !defined(SOL_IP) || !defined(IP_TOS)
@@ -351,14 +358,14 @@ bool setup_myself(void) {
 			}
 		}
 	} else
-		myself->incipher = EVP_aes_256_cbc();
+		myself->incipher = EVP_bf_cbc();
 
 	if(myself->incipher)
 		myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
 	else
 		myself->inkeylength = 1;
 
-	myself->connection->outcipher = EVP_aes_256_ofb();
+	myself->connection->outcipher = EVP_bf_ofb();
 
 	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
 		keylifetime = 3600;
@@ -379,9 +386,9 @@ bool setup_myself(void) {
 			}
 		}
 	} else
-		myself->indigest = EVP_sha256();
+		myself->indigest = EVP_sha1();
 
-	myself->connection->outdigest = EVP_sha256();
+	myself->connection->outdigest = EVP_sha1();
 
 	if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->inmaclength)) {
 		if(myself->indigest) {
@@ -540,10 +547,17 @@ void close_network_connections(void) {
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
 		c = node->data;
-		c->outgoing = false;
+		c->outgoing = NULL;
 		terminate_connection(c, false);
 	}
 
+	for(list_node_t *node = outgoing_list->head; node; node = node->next) {
+		outgoing_t *outgoing = node->data;
+
+		if(outgoing->event)
+			event_del(outgoing->event);
+	}
+
 	list_delete_list(outgoing_list);
 
 	if(myself && myself->connection) {