X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=5d72471b76ee3ad9eeffdf0075686d4f0e5c83e5;hb=a5c6c6ea1ab657d83a4d8b064ac9bfa9c16adf63;hp=dfee573cdff2ea47599f0b0e57a18e868875714a;hpb=373b0c12d9d0e8a3b449fd18be704e28dd6403e1;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index dfee573c..5d72471b 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -176,9 +176,20 @@ static bool bind_to_address(connection_t *c) {
 	return true;
 }
 
+static bool try_bind(int nfd, const sockaddr_t *sa, const char *type) {
+	if(!bind(nfd, &sa->sa, SALEN(sa->sa))) {
+		return true;
+	}
+
+	closesocket(nfd);
+	char *addrstr = sockaddr2hostname(sa);
+	logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to %s/%s: %s", addrstr, type, sockstrerror(sockerrno));
+	free(addrstr);
+	return false;
+}
+
 int setup_listen_socket(const sockaddr_t *sa) {
 	int nfd;
-	char *addrstr;
 	int option;
 	char *iface;
 
@@ -237,11 +248,7 @@ int setup_listen_socket(const sockaddr_t *sa) {
 #endif
 	}
 
-	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
-		closesocket(nfd);
-		addrstr = sockaddr2hostname(sa);
-		logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to %s/tcp: %s", addrstr, sockstrerror(sockerrno));
-		free(addrstr);
+	if(!try_bind(nfd, sa, "tcp")) {
 		return -1;
 	}
 
@@ -282,10 +289,8 @@ static void set_udp_buffer(int nfd, int type, const char *name, int size, bool w
 	}
 }
 
-
 int setup_vpn_in_socket(const sockaddr_t *sa) {
 	int nfd;
-	char *addrstr;
 	int option;
 
 	nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
@@ -386,11 +391,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 		return -1;
 	}
 
-	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
-		closesocket(nfd);
-		addrstr = sockaddr2hostname(sa);
-		logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to %s/udp: %s", addrstr, sockstrerror(sockerrno));
-		free(addrstr);
+	if(!try_bind(nfd, sa, "udp")) {
 		return -1;
 	}
 
@@ -455,9 +456,12 @@ static void do_outgoing_pipe(connection_t *c, const char *command) {
 	sockaddr2str(&c->address, &host, &port);
 	setenv("REMOTEADDRESS", host, true);
 	setenv("REMOTEPORT", port, true);
-	setenv("NODE", c->name, true);
 	setenv("NAME", myself->name, true);
 
+	if(c->name) {
+		setenv("NODE", c->name, true);
+	}
+
 	if(netname) {
 		setenv("NETNAME", netname, true);
 	}
@@ -647,12 +651,7 @@ begin:
 	c->last_ping_time = time(NULL);
 	c->status.connecting = true;
 	c->name = xstrdup(outgoing->node->name);
-#ifndef DISABLE_LEGACY
-	c->outcipher = myself->connection->outcipher;
-	c->outdigest = myself->connection->outdigest;
-#endif
 	c->outmaclength = myself->connection->outmaclength;
-	c->outcompression = myself->connection->outcompression;
 	c->last_ping_time = now.tv_sec;
 
 	connection_add(c);
@@ -760,12 +759,7 @@ void handle_new_meta_connection(void *data, int flags) {
 
 	c = new_connection();
 	c->name = xstrdup("<unknown>");
-#ifndef DISABLE_LEGACY
-	c->outcipher = myself->connection->outcipher;
-	c->outdigest = myself->connection->outdigest;
-#endif
 	c->outmaclength = myself->connection->outmaclength;
-	c->outcompression = myself->connection->outcompression;
 
 	c->address = sa;
 	c->hostname = sockaddr2hostname(&sa);