X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_socket.c;h=6a859f153610aa4849d33c8cc450928994aab702;hb=6a6d41f91a838fa3fa2584ba936677771d86a5d0;hp=2a47a72f436bcaefe4921f050f8b6b24fc2b1e58;hpb=084ba04f51441098c55d3bd21b11bbe368e7b52e;p=meshlink

diff --git a/src/net_socket.c b/src/net_socket.c
index 2a47a72f..6a859f15 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,9 +1,6 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
-    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
-                  2006      Scott Lamb <slamb@slamb.org>
-                  2009      Florian Forster <octo@verplant.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -27,7 +24,6 @@
 #include "list.h"
 #include "logger.h"
 #include "meta.h"
-#include "names.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
@@ -42,8 +38,6 @@
 int addressfamily = AF_UNSPEC;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
-int udp_rcvbuf = 0;
-int udp_sndbuf = 0;
 int max_connection_burst = 100;
 
 listen_socket_t listen_socket[MAXSOCKETS];
@@ -80,35 +74,6 @@ static void configure_tcp(connection_t *c) {
 #endif
 }
 
-static bool bind_to_interface(int sd) {
-	char *iface;
-
-#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
-	struct ifreq ifr;
-	int status;
-#endif /* defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) */
-
-	if(!get_config_string (lookup_config (config_tree, "BindToInterface"), &iface))
-		return true;
-
-#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
-	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
-	ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0;
-
-	status = setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr));
-	if(status) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to interface %s: %s", iface,
-				strerror(errno));
-		return false;
-	}
-#else /* if !defined(SOL_SOCKET) || !defined(SO_BINDTODEVICE) */
-	logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "BindToInterface");
-#endif
-
-	return true;
-}
-
 static bool bind_to_address(connection_t *c) {
 	int s = -1;
 
@@ -242,12 +207,6 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
 	setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof option);
 
-	if(udp_rcvbuf && setsockopt(nfd, SOL_SOCKET, SO_RCVBUF, (void *)&udp_rcvbuf, sizeof(udp_rcvbuf)))
-		logger(DEBUG_ALWAYS, LOG_WARNING, "Can't set UDP SO_RCVBUF to %i: %s", udp_rcvbuf, strerror(errno));
-
-	if(udp_sndbuf && setsockopt(nfd, SOL_SOCKET, SO_SNDBUF, (void *)&udp_sndbuf, sizeof(udp_sndbuf)))
-		logger(DEBUG_ALWAYS, LOG_WARNING, "Can't set UDP SO_SNDBUF to %i: %s", udp_sndbuf, strerror(errno));
-
 #if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
 	if(sa->sa.sa_family == AF_INET6)
 		setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
@@ -285,11 +244,6 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 #warning No way to disable IPv6 fragmentation
 #endif
 
-	if (!bind_to_interface(nfd)) {
-		closesocket(nfd);
-		return -1;
-	}
-
 	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
 		closesocket(nfd);
 		addrstr = sockaddr2hostname(sa);
@@ -358,8 +312,6 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
 	setenv("REMOTEPORT", port, true);
 	setenv("NODE", c->name, true);
 	setenv("NAME", myself->name, true);
-	if(netname)
-		setenv("NETNAME", netname, true);
 
 	int result = system(command);
 	if(result < 0)
@@ -504,7 +456,6 @@ begin:
 			setsockopt(c->socket, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
 #endif
 
-		bind_to_interface(c->socket);
 		bind_to_address(c);
 	}
 
@@ -530,9 +481,6 @@ begin:
 
 	c->status.connecting = true;
 	c->name = xstrdup(outgoing->name);
-	c->outcipher = myself->connection->outcipher;
-	c->outdigest = myself->connection->outdigest;
-	c->outmaclength = myself->connection->outmaclength;
 	c->outcompression = myself->connection->outcompression;
 	c->last_ping_time = now.tv_sec;
 
@@ -677,9 +625,6 @@ void handle_new_meta_connection(void *data, int flags) {
 
 	c = new_connection();
 	c->name = xstrdup("<unknown>");
-	c->outcipher = myself->connection->outcipher;
-	c->outdigest = myself->connection->outdigest;
-	c->outmaclength = myself->connection->outmaclength;
 	c->outcompression = myself->connection->outcompression;
 
 	c->address = sa;