X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=8a7a617c784280e8d3ab6ab48a402ca045a222d1;hp=2ed685da2470711d428ada5521e71f7286b58d91;hb=78fc59e994c764d072bf0045177f690a378d1308;hpb=26b490e86bc305b150200c0b08cd8e9c3bd605fb

diff --git a/src/net_socket.c b/src/net_socket.c
index 2ed685da..8a7a617c 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,7 +1,7 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2007 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
@@ -49,6 +49,7 @@ int seconds_till_retry = 5;
 
 listen_socket_t listen_socket[MAXSOCKETS];
 int listen_sockets;
+list_t *outgoing_list = NULL;
 
 /* Setup sockets */
 
@@ -195,7 +196,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 	{
 		bool choice;
 
-		if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice) {
+		if(!get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) || choice) {
 			option = IP_PMTUDISC_DO;
 			setsockopt(nfd, SOL_IP, IP_MTU_DISCOVER, &option, sizeof(option));
 		}
@@ -206,7 +207,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 	{
 		bool choice;
 
-		if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice) {
+		if(!get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) || choice) {
 			option = IPV6_PMTUDISC_DO;
 			setsockopt(nfd, SOL_IPV6, IPV6_MTU_DISCOVER, &option, sizeof(option));
 		}
@@ -404,8 +405,6 @@ void setup_outgoing_connection(outgoing_t *outgoing)
 	if(!outgoing->cfg) {
 		logger(LOG_ERR, _("No address specified for %s"), c->name);
 		free_connection(c);
-		free(outgoing->name);
-		free(outgoing);
 		return;
 	}
 
@@ -464,14 +463,37 @@ bool handle_new_meta_connection(int sock)
 	return true;
 }
 
+void free_outgoing(outgoing_t *outgoing) {
+	if(outgoing->ai)
+		freeaddrinfo(outgoing->ai);
+
+	if(outgoing->name)
+		free(outgoing->name);
+
+	free(outgoing);
+}
+
 void try_outgoing_connections(void)
 {
 	static config_t *cfg = NULL;
 	char *name;
 	outgoing_t *outgoing;
-
+	connection_t *c;
+	avl_node_t *node;
+	
 	cp();
 
+	if(outgoing_list) {
+		for(node = connection_tree->head; node; node = node->next) {
+			c = node->data;
+			c->outgoing = NULL;
+		}
+
+		list_delete_list(outgoing_list);
+	}
+
+	outgoing_list = list_alloc((list_action_t)free_outgoing);
+			
 	for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
 		get_config_string(cfg, &name);
 
@@ -485,6 +507,7 @@ void try_outgoing_connections(void)
 
 		outgoing = xmalloc_and_zero(sizeof(*outgoing));
 		outgoing->name = name;
+		list_insert_tail(outgoing_list, outgoing);
 		setup_outgoing_connection(outgoing);
 	}
 }