X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=f7781bc4513a77c02cace6df3ae7fa89ab02d8fe;hp=bf5130d6a7dbc8f86662b96126dcba9671ba44b1;hb=a5f899a9794f215e8174455ead04862a2c14a5b1;hpb=480dd127c8a539036ff82a3810a0ad83136944f8

diff --git a/src/net_socket.c b/src/net_socket.c
index bf5130d6..f7781bc4 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-2008 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
@@ -102,6 +102,11 @@ int setup_listen_socket(const sockaddr_t *sa)
 	option = 1;
 	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
 
+#if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
+	if(sa->sa.sa_family == AF_INET6)
+		setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, &option, sizeof option);
+#endif
+
 	if(get_config_string
 	   (lookup_config(config_tree, "BindToInterface"), &iface)) {
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
@@ -181,11 +186,16 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 	option = 1;
 	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
 
+#if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
+	if(sa->sa.sa_family == AF_INET6)
+		setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, &option, sizeof option);
+#endif
+
 #if defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
 	{
 		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));
 		}
@@ -196,7 +206,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));
 		}
@@ -300,7 +310,8 @@ begin:
 	}
 
 	if(!c->outgoing->aip) {
-		freeaddrinfo(c->outgoing->ai);
+		if(c->outgoing->ai)
+			freeaddrinfo(c->outgoing->ai);
 		c->outgoing->ai = NULL;
 		goto begin;
 	}
@@ -325,6 +336,12 @@ begin:
 		goto begin;
 	}
 
+#if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
+	int option = 1;
+	if(c->address.sa.sa_family == AF_INET6)
+		setsockopt(c->socket, SOL_IPV6, IPV6_V6ONLY, &option, sizeof option);
+#endif
+
 	/* Optimize TCP settings */
 
 	configure_tcp(c);