X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnet_socket.c;h=ea5fdaa03853131d9b19c7b9b17b8fb06525873a;hp=93bd62ddbc8747d1c0f8d2b755cb04a600e07140;hb=92283d7342fabd882126a892b2636d57ff0458de;hpb=4bfb68d289305a884d0f11bd4fa216a8cc0b36ac

diff --git a/src/net_socket.c b/src/net_socket.c
index 93bd62dd..ea5fdaa0 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -68,9 +68,9 @@ static void configure_tcp(connection_t *c) {
 	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&nodelay, sizeof(nodelay));
 #endif
 
-#if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
+#if defined(IP_TOS) && defined(IPTOS_LOWDELAY)
 	int lowdelay = IPTOS_LOWDELAY;
-	setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&lowdelay, sizeof(lowdelay));
+	setsockopt(c->socket, IPPROTO_IP, IP_TOS, (void *)&lowdelay, sizeof(lowdelay));
 #endif
 }
 
@@ -130,12 +130,14 @@ int setup_listen_socket(const sockaddr_t *sa) {
 	option = 1;
 	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
 
-#if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
+#if defined(IPV6_V6ONLY)
 
 	if(sa->sa.sa_family == AF_INET6) {
-		setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
+		setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
 	}
 
+#else
+#warning IPV6_V6ONLY not defined
 #endif
 
 	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
@@ -198,7 +200,7 @@ int setup_vpn_in_socket(meshlink_handle_t *mesh, 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 defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
+#if defined(IPV6_V6ONLY)
 
 	if(sa->sa.sa_family == AF_INET6) {
 		setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
@@ -210,14 +212,14 @@ int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) {
 #define IP_DONTFRAGMENT IP_DONTFRAG
 #endif
 
-#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
 
 	if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
 		option = IP_PMTUDISC_DO;
-		setsockopt(nfd, SOL_IP, IP_MTU_DISCOVER, (void *)&option, sizeof(option));
+		setsockopt(nfd, IPPROTO_IP, IP_MTU_DISCOVER, (void *)&option, sizeof(option));
 	}
 
-#elif defined(IPPROTO_IP) && defined(IP_DONTFRAGMENT)
+#elif defined(IP_DONTFRAGMENT)
 
 	if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
 		option = 1;
@@ -228,14 +230,14 @@ int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) {
 #warning No way to disable IPv4 fragmentation
 #endif
 
-#if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+#if defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
 
 	if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
 		option = IPV6_PMTUDISC_DO;
-		setsockopt(nfd, SOL_IPV6, IPV6_MTU_DISCOVER, (void *)&option, sizeof(option));
+		setsockopt(nfd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, (void *)&option, sizeof(option));
 	}
 
-#elif defined(IPPROTO_IPV6) && defined(IPV6_DONTFRAG)
+#elif defined(IPV6_DONTFRAG)
 
 	if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
 		option = 1;
@@ -387,65 +389,139 @@ static void free_known_addresses(struct addrinfo *ai) {
 	}
 }
 
-bool do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
-	char *address, *port, *space;
-	struct addrinfo *proxyai = NULL;
-	int result;
+static bool get_recent(meshlink_handle_t *mesh, outgoing_t *outgoing) {
+	node_t *n = lookup_node(mesh, outgoing->name);
 
-begin:
+	if(!n) {
+		return false;
+	}
 
-	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);
-			return false;
+	outgoing->ai = get_known_addresses(n);
+	outgoing->aip = outgoing->ai;
+	return outgoing->aip;
+}
+
+static bool get_next_ai(meshlink_handle_t *mesh, outgoing_t *outgoing) {
+	if(!outgoing->ai) {
+		char *address = NULL;
+
+		if(get_config_string(outgoing->cfg, &address)) {
+			char *port;
+			char *space = strchr(address, ' ');
+
+			if(space) {
+				port = xstrdup(space + 1);
+				*space = 0;
+			} else {
+				if(!get_config_string(lookup_config(outgoing->config_tree, "Port"), &port)) {
+					logger(mesh, MESHLINK_ERROR, "No Port known for %s", outgoing->name);
+					return false;
+				}
+			}
+
+			outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
+			free(port);
+			free(address);
 		}
 
-		get_config_string(outgoing->cfg, &address);
+		outgoing->aip = outgoing->ai;
+	} else {
+		outgoing->aip = outgoing->aip->ai_next;
+	}
+
+	return outgoing->aip;
+}
 
-		space = strchr(address, ' ');
+static bool get_next_cfg(meshlink_handle_t *mesh, outgoing_t *outgoing, char *variable) {
+	(void)mesh;
 
-		if(space) {
-			port = xstrdup(space + 1);
-			*space = 0;
-		} else {
-			// TODO: Only allow Address statements?
-			if(!get_config_string(lookup_config(outgoing->config_tree, "Port"), &port)) {
-				logger(mesh, MESHLINK_ERROR, "No Port known for %s", outgoing->name);
-				retry_outgoing(mesh, outgoing);
-				return false;
+	if(!outgoing->cfg) {
+		outgoing->cfg = lookup_config(outgoing->config_tree, variable);
+	} else {
+		outgoing->cfg = lookup_config_next(outgoing->config_tree, outgoing->cfg);
+	}
+
+	return outgoing->cfg;
+}
+
+static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgoing) {
+	bool start = false;
+
+	if(outgoing->state == OUTGOING_START) {
+		start = true;
+		outgoing->state = OUTGOING_CANONICAL;
+	}
+
+	if(outgoing->state == OUTGOING_CANONICAL) {
+		if(outgoing->aip || get_next_cfg(mesh, outgoing, "CanonicalAddress")) {
+			if(get_next_ai(mesh, outgoing)) {
+				return true;
+			} else {
+				freeaddrinfo(outgoing->ai);
+				outgoing->ai = NULL;
+				outgoing->aip = NULL;
 			}
 		}
 
-		outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
-		free(address);
-		free(port);
-
-		outgoing->aip = outgoing->ai;
-		outgoing->cfg = lookup_config_next(outgoing->config_tree, outgoing->cfg);
+		outgoing->state = OUTGOING_RECENT;
 	}
 
-	if(!outgoing->aip) {
-		if(outgoing->ai) {
-			freeaddrinfo(outgoing->ai);
+	if(outgoing->state == OUTGOING_RECENT) {
+		if(outgoing->aip || get_next_cfg(mesh, outgoing, "Address")) {
+			if(get_next_ai(mesh, outgoing)) {
+				return true;
+			} else {
+				freeaddrinfo(outgoing->ai);
+				outgoing->ai = NULL;
+				outgoing->aip = NULL;
+			}
 		}
 
-		outgoing->ai = NULL;
+		outgoing->state = OUTGOING_KNOWN;
+	}
 
-		if(outgoing->nai) {
-			free_known_addresses(outgoing->nai);
+	if(outgoing->state == OUTGOING_KNOWN) {
+		if(outgoing->aip || get_recent(mesh, outgoing)) {
+			if(get_next_ai(mesh, outgoing)) {
+				return true;
+			} else {
+				free_known_addresses(outgoing->ai);
+				outgoing->ai = NULL;
+				outgoing->aip = NULL;
+			}
 		}
 
-		outgoing->nai = NULL;
+		outgoing->state = OUTGOING_END;
+	}
 
-		goto begin;
+	if(start) {
+		outgoing->state = OUTGOING_NO_KNOWN_ADDRESSES;
+	}
+
+	return false;
+}
+
+bool do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
+	struct addrinfo *proxyai = NULL;
+	int result;
+
+begin:
+
+	if(!get_next_outgoing_address(mesh, outgoing)) {
+		if(outgoing->state == OUTGOING_NO_KNOWN_ADDRESSES) {
+			logger(mesh, MESHLINK_ERROR, "No known addresses for %s", outgoing->name);
+		} else {
+			logger(mesh, MESHLINK_ERROR, "Could not set up a meta connection to %s", outgoing->name);
+			retry_outgoing(mesh, outgoing);
+		}
+
+		return false;
 	}
 
 	connection_t *c = new_connection();
 	c->outgoing = outgoing;
 
 	memcpy(&c->address, outgoing->aip->ai_addr, outgoing->aip->ai_addrlen);
-	outgoing->aip = outgoing->aip->ai_next;
 
 	char *hostname = sockaddr2hostname(&c->address);
 
@@ -469,7 +545,7 @@ begin:
 	}
 
 	if(c->socket == -1) {
-		logger(mesh, MESHLINK_ERROR, "Creating socket for %s at %s failed: %s", c->name, c->hostname, sockstrerror(sockerrno));
+		logger(mesh, MESHLINK_ERROR, "Creating socket for %s at %s failed: %s", c->name, hostname, sockstrerror(sockerrno));
 		free_connection(c);
 		free(hostname);
 		goto begin;
@@ -481,11 +557,11 @@ begin:
 	fcntl(c->socket, F_SETFD, FD_CLOEXEC);
 #endif
 
-#if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
+#if defined(IPV6_V6ONLY)
 
 	if(c->address.sa.sa_family == AF_INET6) {
 		static const int option = 1;
-		setsockopt(c->socket, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
+		setsockopt(c->socket, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
 	}
 
 #endif
@@ -535,28 +611,28 @@ void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
 		return;
 	}
 
+
+	if(outgoing->ai) {
+		if(outgoing->state == OUTGOING_KNOWN) {
+			free_known_addresses(outgoing->ai);
+		} else {
+			freeaddrinfo(outgoing->ai);
+		}
+	}
+
+	outgoing->cfg = NULL;
+
 	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);
 
+	outgoing->state = OUTGOING_START;
+
 	if(blacklisted) {
 		return;
 	}
 
-	if(!outgoing->cfg) {
-		if(n) {
-			outgoing->aip = outgoing->nai = get_known_addresses(n);
-		}
-
-		if(!outgoing->nai) {
-			logger(mesh, MESHLINK_ERROR, "No address known for %s", outgoing->name);
-			return;
-		}
-	}
-
 	do_outgoing_connection(mesh, outgoing);
 }
 
@@ -569,7 +645,7 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
 	meshlink_handle_t *mesh = loop->data;
 	listen_socket_t *l = data;
 	connection_t *c;
-	sockaddr_t sa;
+	sockaddr_t sa = {0};
 	int fd;
 	socklen_t len = sizeof(sa);
 
@@ -649,7 +725,7 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
 	c->last_ping_time = mesh->loop.now.tv_sec;
 
 	char *hostname = sockaddr2hostname(&sa);
-	logger(mesh, MESHLINK_INFO, "Connection from %s", c->hostname);
+	logger(mesh, MESHLINK_INFO, "Connection from %s", hostname);
 	free(hostname);
 
 	io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ);
@@ -668,11 +744,11 @@ static void free_outgoing(outgoing_t *outgoing) {
 	timeout_del(&mesh->loop, &outgoing->ev);
 
 	if(outgoing->ai) {
-		freeaddrinfo(outgoing->ai);
-	}
-
-	if(outgoing->nai) {
-		free_known_addresses(outgoing->nai);
+		if(outgoing->state == OUTGOING_KNOWN) {
+			free_known_addresses(outgoing->ai);
+		} else {
+			freeaddrinfo(outgoing->ai);
+		}
 	}
 
 	if(outgoing->config_tree) {
@@ -706,8 +782,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 line %d",
+			       cfg->line);
 			free(name);
 			continue;
 		}