X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=808e1c660d0c8ef36a0c06475e5d6b045e7c5638;hb=551cd19406a560d0d206bff5b4e9da064ec222b6;hp=a6fe54bcea57bafb45f9d87e6743357be2ed363f;hpb=8e8fe805c81d3edc974c12c468f793ea0c1e5ee7;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index a6fe54bc..808e1c66 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -70,12 +70,12 @@ static void configure_tcp(connection_t *c) {
 
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
 	option = 1;
-	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof option);
 #endif
 
 #if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
 	option = IPTOS_LOWDELAY;
-	setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
+	setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof option);
 #endif
 }
 
@@ -97,17 +97,22 @@ int setup_listen_socket(const sockaddr_t *sa) {
 	/* Optimize TCP settings */
 
 	option = 1;
-	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
+	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)
 		struct ifreq ifr;
 
-		memset(&ifr, 0, sizeof(ifr));
+		memset(&ifr, 0, sizeof ifr);
 		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 
-		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
+		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof ifr)) {
 			closesocket(nfd);
 			logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
 				   strerror(errno));
@@ -175,7 +180,12 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 #endif
 
 	option = 1;
-	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
+	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)
 	{
@@ -183,7 +193,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 
 		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));
+			setsockopt(nfd, SOL_IP, IP_MTU_DISCOVER, &option, sizeof option);
 		}
 	}
 #endif
@@ -194,7 +204,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 
 		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));
+			setsockopt(nfd, SOL_IPV6, IPV6_MTU_DISCOVER, &option, sizeof option);
 		}
 	}
 #endif
@@ -205,10 +215,10 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 		struct ifreq ifr;
 
 		if(get_config_string(lookup_config(config_tree, "BindToInterface"), &iface)) {
-			memset(&ifr, 0, sizeof(ifr));
+			memset(&ifr, 0, sizeof ifr);
 			strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 
-			if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
+			if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof ifr)) {
 				closesocket(nfd);
 				logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
 					   strerror(errno));
@@ -294,7 +304,8 @@ begin:
 	}
 
 	if(!c->outgoing->aip) {
-		freeaddrinfo(c->outgoing->ai);
+		if(c->outgoing->ai)
+			freeaddrinfo(c->outgoing->ai);
 		c->outgoing->ai = NULL;
 		goto begin;
 	}
@@ -319,6 +330,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);
@@ -425,7 +442,7 @@ void handle_new_meta_connection(int sock, short events, void *data) {
 	connection_t *c;
 	sockaddr_t sa;
 	int fd;
-	socklen_t len = sizeof(sa);
+	socklen_t len = sizeof sa;
 
 	cp();
 
@@ -487,7 +504,7 @@ void try_outgoing_connections(void) {
 			continue;
 		}
 
-		outgoing = xmalloc_and_zero(sizeof(*outgoing));
+		outgoing = xmalloc_and_zero(sizeof *outgoing);
 		outgoing->name = name;
 		setup_outgoing_connection(outgoing);
 	}