X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_socket.c;h=a74db196973c910ae54dc31d1740ee8c55c43363;hb=e25370c54e78fda0a7996b008f7ad68aa80f2ccd;hp=55e7d31540a9188a5d4df13f73bcbde19d2cd121;hpb=a9230a241a1df0328fbfbe5d1c2ee3234bf808fd;p=meshlink

diff --git a/src/net_socket.c b/src/net_socket.c
index 55e7d315..a74db196 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -50,25 +50,23 @@ static void configure_tcp(connection_t *c) {
 #ifdef O_NONBLOCK
 	int flags = fcntl(c->socket, F_GETFL);
 
-	if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
-		logger(c->mesh, MESHLINK_ERROR, "fcntl for %s: %s", c->hostname, strerror(errno));
-	}
+	if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0)
+		logger(c->mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "fcntl", strerror(errno));
 #elif defined(WIN32)
 	unsigned long arg = 1;
 
-	if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
-		logger(c->mesh, MESHLINK_ERROR, "ioctlsocket for %s: %s", c->hostname, sockstrerror(sockerrno));
-	}
+	if(ioctlsocket(c->socket, FIONBIO, &arg) != 0)
+		logger(c->mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "ioctlsocket", sockstrerror(sockerrno));
 #endif
 
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
 	int nodelay = 1;
-	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&nodelay, sizeof nodelay);
+	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&nodelay, sizeof(nodelay));
 #endif
 
 #if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
 	int lowdelay = IPTOS_LOWDELAY;
-	setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&lowdelay, sizeof lowdelay);
+	setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&lowdelay, sizeof(lowdelay));
 #endif
 }
 
@@ -119,11 +117,11 @@ int setup_listen_socket(const sockaddr_t *sa) {
 	/* Optimize TCP settings */
 
 	option = 1;
-	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
+	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
 
 #if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
 	if(sa->sa.sa_family == AF_INET6)
-		setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
+		setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
 #endif
 
 	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
@@ -166,7 +164,7 @@ int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) {
 		if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
 			closesocket(nfd);
 			logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "fcntl",
-				   strerror(errno));
+			       strerror(errno));
 			return -1;
 		}
 	}
@@ -182,12 +180,12 @@ int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) {
 #endif
 
 	option = 1;
-	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
-	setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof option);
+	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
+	setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof(option));
 
 #if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
 	if(sa->sa.sa_family == AF_INET6)
-		setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
+		setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
 #endif
 
 #if defined(IP_DONTFRAG) && !defined(IP_DONTFRAGMENT)
@@ -245,13 +243,15 @@ void retry_outgoing(meshlink_handle_t *mesh, outgoing_t *outgoing) {
 	if(outgoing->timeout > mesh->maxtimeout)
 		outgoing->timeout = mesh->maxtimeout;
 
-	timeout_add(&mesh->loop, &outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval){outgoing->timeout, rand() % 100000});
+	timeout_add(&mesh->loop, &outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval) {
+		outgoing->timeout, rand() % 100000
+	});
 
 	logger(mesh, MESHLINK_INFO, "Trying to re-establish outgoing connection in %d seconds", outgoing->timeout);
 }
 
 void finish_connecting(meshlink_handle_t *mesh, connection_t *c) {
-	logger(mesh, MESHLINK_INFO, "Connected to %s (%s)", c->name, c->hostname);
+	logger(mesh, MESHLINK_INFO, "Connected to %s", c->name);
 
 	c->last_ping_time = mesh->loop.now.tv_sec;
 	c->status.connecting = false;
@@ -311,14 +311,13 @@ static void handle_meta_write(meshlink_handle_t *mesh, connection_t *c) {
 
 	ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, MSG_NOSIGNAL);
 	if(outlen <= 0) {
-		if(!errno || errno == EPIPE) {
-			logger(mesh, MESHLINK_INFO, "Connection closed by %s (%s)", c->name, c->hostname);
-		} else if(sockwouldblock(sockerrno)) {
-			logger(mesh, MESHLINK_DEBUG, "Sending %d bytes to %s (%s) would block", c->outbuf.len - c->outbuf.offset, c->name, c->hostname);
+		if(!errno || errno == EPIPE)
+			logger(mesh, MESHLINK_INFO, "Connection closed by %s", c->name);
+		else if(sockwouldblock(sockerrno)) {
+			logger(mesh, MESHLINK_DEBUG, "Sending %d bytes to %s would block", c->outbuf.len - c->outbuf.offset, c->name);
 			return;
-		} else {
-			logger(mesh, MESHLINK_ERROR, "Could not send %d bytes of data to %s (%s): %s", c->outbuf.len - c->outbuf.offset, c->name, c->hostname, strerror(errno));
-		}
+		} else
+			logger(mesh, MESHLINK_ERROR, "Could not send %d bytes of data to %s: %s", c->outbuf.len - c->outbuf.offset, c->name, strerror(errno));
 
 		terminate_connection(mesh, c, c->status.active);
 		return;
@@ -337,13 +336,13 @@ static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
 		c->status.connecting = false;
 
 		int result;
-		socklen_t len = sizeof result;
+		socklen_t len = sizeof(result);
 		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
 
 		if(!result)
 			finish_connecting(mesh, c);
 		else {
-			logger(mesh, MESHLINK_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
+			logger(mesh, MESHLINK_DEBUG, "Error while connecting to %s: %s", c->name, sockstrerror(result));
 			terminate_connection(mesh, c, false);
 			return;
 		}
@@ -355,13 +354,55 @@ static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
 		handle_meta_connection_data(mesh, c);
 }
 
+// Find edges pointing to this node, and use them to build a list of unique, known addresses.
+static struct addrinfo *get_known_addresses(node_t *n) {
+	struct addrinfo *ai = NULL;
+
+	for splay_each(edge_t, e, n->edge_tree) {
+		if(!e->reverse)
+			continue;
+
+		bool found = false;
+		for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+			if(!sockaddrcmp(&e->reverse->address, (sockaddr_t *)aip->ai_addr)) {
+				found = true;
+				break;
+			}
+		}
+		if(found)
+			continue;
+
+		// Create a new struct addrinfo, and put it at the head of the list.
+		struct addrinfo *nai = xzalloc(sizeof(*nai) + SALEN(e->reverse->address.sa));
+		nai->ai_next = ai;
+		ai = nai;
+
+		ai->ai_family = e->reverse->address.sa.sa_family;
+		ai->ai_socktype = SOCK_STREAM;
+		ai->ai_protocol = IPPROTO_TCP;
+		ai->ai_addrlen = SALEN(e->reverse->address.sa);
+		ai->ai_addr = (struct sockaddr *)(nai + 1);
+		memcpy(ai->ai_addr, &e->reverse->address, ai->ai_addrlen);
+	}
+
+	return ai;
+}
+
+// Free struct addrinfo list from get_known_addresses().
+static void free_known_addresses(struct addrinfo *ai) {
+	for(struct addrinfo *aip = ai, *next; aip; aip = next) {
+		next = aip->ai_next;
+		free(aip);
+	}
+}
+
 bool do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
 	char *address, *port, *space;
 	struct addrinfo *proxyai = NULL;
 	int result;
 
 begin:
-	if(!outgoing->ai) {
+	if(!outgoing->ai && !outgoing->nai) {
 		if(!outgoing->cfg) {
 			logger(mesh, MESHLINK_ERROR, "Could not set up a meta connection to %s", outgoing->name);
 			retry_outgoing(mesh, outgoing);
@@ -395,6 +436,11 @@ begin:
 		if(outgoing->ai)
 			freeaddrinfo(outgoing->ai);
 		outgoing->ai = NULL;
+
+		if(outgoing->nai)
+			free_known_addresses(outgoing->nai);
+		outgoing->nai = NULL;
+
 		goto begin;
 	}
 
@@ -404,19 +450,20 @@ begin:
 	memcpy(&c->address, outgoing->aip->ai_addr, outgoing->aip->ai_addrlen);
 	outgoing->aip = outgoing->aip->ai_next;
 
-	c->hostname = sockaddr2hostname(&c->address);
+	char *hostname = sockaddr2hostname(&c->address);
 
-	logger(mesh, MESHLINK_INFO, "Trying to connect to %s (%s)", outgoing->name, c->hostname);
+	logger(mesh, MESHLINK_INFO, "Trying to connect to %s at %s", outgoing->name, hostname);
 
 	if(!mesh->proxytype) {
 		c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 		configure_tcp(c);
-	} else if(mesh->proxytype == PROXY_EXEC) {
+	} else if(mesh->proxytype == PROXY_EXEC)
 		do_outgoing_pipe(mesh, c, mesh->proxyhost);
-	} else {
+	else {
 		proxyai = str2addrinfo(mesh->proxyhost, mesh->proxyport, SOCK_STREAM);
 		if(!proxyai) {
 			free_connection(c);
+			free(hostname);
 			goto begin;
 		}
 		logger(mesh, MESHLINK_INFO, "Using proxy at %s port %s", mesh->proxyhost, mesh->proxyport);
@@ -425,11 +472,14 @@ begin:
 	}
 
 	if(c->socket == -1) {
-		logger(mesh, MESHLINK_ERROR, "Creating socket for %s failed: %s", c->hostname, sockstrerror(sockerrno));
+		logger(mesh, MESHLINK_ERROR, "Creating socket for %s at %s failed: %s", c->name, c->hostname, sockstrerror(sockerrno));
 		free_connection(c);
+		free(hostname);
 		goto begin;
 	}
 
+	free(hostname);
+
 #ifdef FD_CLOEXEC
 	fcntl(c->socket, F_SETFD, FD_CLOEXEC);
 #endif
@@ -438,7 +488,7 @@ 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, (void *)&option, sizeof option);
+			setsockopt(c->socket, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
 #endif
 
 		bind_to_address(mesh, c);
@@ -446,17 +496,17 @@ begin:
 
 	/* Connect */
 
-	if(!mesh->proxytype) {
+	if(!mesh->proxytype)
 		result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
-	} else if(mesh->proxytype == PROXY_EXEC) {
+	else if(mesh->proxytype == PROXY_EXEC)
 		result = 0;
-	} else {
+	else {
 		result = connect(c->socket, proxyai->ai_addr, proxyai->ai_addrlen);
 		freeaddrinfo(proxyai);
 	}
 
 	if(result == -1 && !sockinprogress(sockerrno)) {
-		logger(mesh, MESHLINK_ERROR, "Could not connect to %s (%s): %s", outgoing->name, c->hostname, sockstrerror(sockerrno));
+		logger(mesh, MESHLINK_ERROR, "Could not connect to %s: %s", outgoing->name, sockstrerror(sockerrno));
 		free_connection(c);
 
 		goto begin;
@@ -471,44 +521,11 @@ begin:
 
 	connection_add(mesh, c);
 
-	io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ|IO_WRITE);
+	io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ | IO_WRITE);
 
 	return true;
 }
 
-// Find edges pointing to this node, and use them to build a list of unique, known addresses.
-static struct addrinfo *get_known_addresses(node_t *n) {
-	struct addrinfo *ai = NULL;
-
-	for splay_each(edge_t, e, n->edge_tree) {
-		if(!e->reverse)
-			continue;
-
-		bool found = false;
-		for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
-			if(!sockaddrcmp(&e->reverse->address, (sockaddr_t *)aip->ai_addr)) {
-				found = true;
-				break;
-			}
-		}
-		if(found)
-			continue;
-
-		struct addrinfo *nai = xzalloc(sizeof *nai);
-		if(ai)
-			ai->ai_next = nai;
-		ai = nai;
-		ai->ai_family = e->reverse->address.sa.sa_family;
-		ai->ai_socktype = SOCK_STREAM;
-		ai->ai_protocol = IPPROTO_TCP;
-		ai->ai_addrlen = SALEN(e->reverse->address.sa);
-		ai->ai_addr = xmalloc(ai->ai_addrlen);
-		memcpy(ai->ai_addr, &e->reverse->address, ai->ai_addrlen);
-	}
-
-	return ai;
-}
-
 void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
 	bool blacklisted = false;
 	timeout_del(&mesh->loop, &outgoing->ev);
@@ -522,17 +539,18 @@ void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
 		return;
 	}
 
+	exit_configuration(&outgoing->config_tree); // discard old configuration if present
 	init_configuration(&outgoing->config_tree);
 	read_host_config(mesh, outgoing->config_tree, outgoing->name);
 	outgoing->cfg = lookup_config(outgoing->config_tree, "Address");
 
 	get_config_bool(lookup_config(outgoing->config_tree, "blacklisted"), &blacklisted);
-	if (blacklisted) return;
+	if(blacklisted) return;
 
 	if(!outgoing->cfg) {
 		if(n)
-			outgoing->aip = outgoing->ai = get_known_addresses(n);
-		if(!outgoing->ai) {
+			outgoing->aip = outgoing->nai = get_known_addresses(n);
+		if(!outgoing->nai) {
 			logger(mesh, MESHLINK_ERROR, "No address known for %s", outgoing->name);
 			return;
 		}
@@ -551,7 +569,7 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
 	connection_t *c;
 	sockaddr_t sa;
 	int fd;
-	socklen_t len = sizeof sa;
+	socklen_t len = sizeof(sa);
 
 	fd = accept(l->tcp.fd, &sa.sa, &len);
 
@@ -595,7 +613,7 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
 		}
 	}
 
-	memcpy(&prev_sa, &sa, sizeof sa);
+	memcpy(&prev_sa, &sa, sizeof(sa));
 
 	// Check if we get many connections from different hosts
 
@@ -623,11 +641,12 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
 	c->outcompression = mesh->self->connection->outcompression;
 
 	c->address = sa;
-	c->hostname = sockaddr2hostname(&sa);
 	c->socket = fd;
 	c->last_ping_time = mesh->loop.now.tv_sec;
 
+	char *hostname = sockaddr2hostname(&sa);
 	logger(mesh, MESHLINK_INFO, "Connection from %s", c->hostname);
+	free(hostname);
 
 	io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ);
 
@@ -647,6 +666,9 @@ static void free_outgoing(outgoing_t *outgoing) {
 	if(outgoing->ai)
 		freeaddrinfo(outgoing->ai);
 
+	if(outgoing->nai)
+		free_known_addresses(outgoing->nai);
+
 	if(outgoing->config_tree)
 		exit_configuration(&outgoing->config_tree);
 
@@ -659,9 +681,9 @@ static void free_outgoing(outgoing_t *outgoing) {
 void try_outgoing_connections(meshlink_handle_t *mesh) {
 	/* If there is no outgoing list yet, create one. Otherwise, mark all outgoings as deleted. */
 
-	if(!mesh->outgoings) {
+	if(!mesh->outgoings)
 		mesh->outgoings = list_alloc((list_action_t)free_outgoing);
-	} else {
+	else {
 		for list_each(outgoing_t, outgoing, mesh->outgoings)
 			outgoing->timeout = -1;
 	}
@@ -675,8 +697,8 @@ void try_outgoing_connections(meshlink_handle_t *mesh) {
 
 		if(!check_id(name)) {
 			logger(mesh, MESHLINK_ERROR,
-				   "Invalid name for outgoing connection in %s line %d",
-				   cfg->file, cfg->line);
+			       "Invalid name for outgoing connection in %s line %d",
+			       cfg->file, cfg->line);
 			free(name);
 			continue;
 		}
@@ -692,7 +714,7 @@ void try_outgoing_connections(meshlink_handle_t *mesh) {
 		}
 
 		if(!found) {
-			outgoing_t *outgoing = xzalloc(sizeof *outgoing);
+			outgoing_t *outgoing = xzalloc(sizeof(*outgoing));
 			outgoing->mesh = mesh;
 			outgoing->name = name;
 			list_insert_tail(mesh->outgoings, outgoing);