X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnet_packet.c;h=8aca6aa59adda1ef8f78d9eecec914625a9a367a;hp=96f16d57a34b636823bcbf0eef019d4c81223e81;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=f79cc0e0bba16a3aa42a5fa13098cda714623205

diff --git a/src/net_packet.c b/src/net_packet.c
index 96f16d57..8aca6aa5 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -19,10 +19,6 @@
 
 #include "system.h"
 
-#ifdef HAVE_ZLIB
-#include <zlib.h>
-#endif
-
 #include "conf.h"
 #include "connection.h"
 #include "crypto.h"
@@ -74,7 +70,7 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 	if(n->mtuprobes > 32) {
 		if(!n->minmtu) {
 			n->mtuprobes = 31;
-			timeout = mesh->pinginterval;
+			timeout = mesh->dev_class_traits[n->devclass].pinginterval;
 			goto end;
 		}
 
@@ -83,6 +79,8 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 		n->mtuprobes = 1;
 		n->minmtu = 0;
 		n->maxmtu = MTU;
+
+		update_node_pmtu(mesh, n);
 	}
 
 	if(n->mtuprobes >= 10 && n->mtuprobes < 32 && !n->minmtu) {
@@ -91,35 +89,49 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 	}
 
 	if(n->mtuprobes == 30 || (n->mtuprobes < 30 && n->minmtu >= n->maxmtu)) {
-		if(n->minmtu > n->maxmtu)
+		if(n->minmtu > n->maxmtu) {
 			n->minmtu = n->maxmtu;
-		else
+			update_node_pmtu(mesh, n);
+		} else {
 			n->maxmtu = n->minmtu;
+		}
+
 		n->mtu = n->minmtu;
 		logger(mesh, MESHLINK_INFO, "Fixing MTU of %s to %d after %d probes", n->name, n->mtu, n->mtuprobes);
 		n->mtuprobes = 31;
 	}
 
 	if(n->mtuprobes == 31) {
-		timeout = mesh->pinginterval;
+		if(!n->minmtu && n->status.want_udp) {
+			/* Send a dummy ANS_KEY to try to update the reflexive UDP address */
+			send_request(mesh, n->nexthop->connection, NULL, "%d %s %s . -1 -1 -1 0", ANS_KEY, mesh->self->name, n->name);
+			n->status.want_udp = false;
+		}
+
+		timeout = mesh->dev_class_traits[n->devclass].pinginterval;
 		goto end;
-	} else if(n->mtuprobes == 32)
-		timeout = mesh->pingtimeout;
+	} else if(n->mtuprobes == 32) {
+		timeout = mesh->dev_class_traits[n->devclass].pingtimeout;
+	}
 
-	for(int i = 0; i < 4 + mesh->localdiscovery; i++) {
+	for(int i = 0; i < 5; i++) {
 		int len;
 
 		if(i == 0) {
-			if(n->mtuprobes < 30 || n->maxmtu + 8 >= MTU)
+			if(n->mtuprobes < 30 || n->maxmtu + 8 >= MTU) {
 				continue;
+			}
+
 			len = n->maxmtu + 8;
-		} else if(n->maxmtu <= n->minmtu)
+		} else if(n->maxmtu <= n->minmtu) {
 			len = n->maxmtu;
-		else
-			len = n->minmtu + 1 + rand() % (n->maxmtu - n->minmtu);
+		} else {
+			len = n->minmtu + 1 + prng(mesh, n->maxmtu - n->minmtu);
+		}
 
-		if(len < 64)
+		if(len < 64) {
 			len = 64;
+		}
 
 		vpn_packet_t packet;
 		packet.probe = true;
@@ -136,19 +148,24 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 	n->status.broadcast = false;
 
 end:
-	timeout_set(&mesh->loop, &n->mtutimeout, &(struct timeval) {
-		timeout, rand() % 100000
+	timeout_set(&mesh->loop, &n->mtutimeout, &(struct timespec) {
+		timeout, prng(mesh, TIMER_FUDGE)
 	});
 }
 
 void send_mtu_probe(meshlink_handle_t *mesh, node_t *n) {
-	timeout_add(&mesh->loop, &n->mtutimeout, send_mtu_probe_handler, n, &(struct timeval) {
+	timeout_add(&mesh->loop, &n->mtutimeout, send_mtu_probe_handler, n, &(struct timespec) {
 		1, 0
 	});
 	send_mtu_probe_handler(&mesh->loop, n);
 }
 
 static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet, uint16_t len) {
+	if(len < 64) {
+		logger(mesh, MESHLINK_WARNING, "Got too short MTU probe length %d from %s", packet->len, n->name);
+		return;
+	}
+
 	logger(mesh, MESHLINK_DEBUG, "Got MTU probe length %d from %s", packet->len, n->name);
 
 	if(!packet->data[0]) {
@@ -168,7 +185,14 @@ static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet
 		   is possible using the address and socket that the reply
 		   packet used. */
 
-		n->status.udp_confirmed = true;
+		if(!n->status.udp_confirmed) {
+			char *address, *port;
+			sockaddr2str(&n->address, &address, &port);
+			send_request(mesh, n->nexthop->connection, NULL, "%d %s %s . -1 -1 -1 0 %s %s", ANS_KEY, n->name, n->name, address, port);
+			free(address);
+			free(port);
+			n->status.udp_confirmed = true;
+		}
 
 		/* If we haven't established the PMTU yet, restart the discovery process. */
 
@@ -180,18 +204,23 @@ static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet
 				return;
 			}
 
-			if(n->minmtu)
+			if(n->minmtu) {
 				n->mtuprobes = 30;
-			else
+			} else {
 				n->mtuprobes = 1;
+			}
 		}
 
 		/* If applicable, raise the minimum supported MTU */
 
-		if(len > n->maxmtu)
+		if(len > n->maxmtu) {
 			len = n->maxmtu;
-		if(n->minmtu < len)
+		}
+
+		if(n->minmtu < len) {
 			n->minmtu = len;
+			update_node_pmtu(mesh, n);
+		}
 	}
 }
 
@@ -200,9 +229,9 @@ static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet
 static void receive_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet) {
 	logger(mesh, MESHLINK_DEBUG, "Received packet of %d bytes from %s", packet->len, n->name);
 
-	if(n->status.blacklisted)
+	if(n->status.blacklisted) {
 		logger(mesh, MESHLINK_WARNING, "Dropping packet from blacklisted node %s", n->name);
-	else {
+	} else {
 		n->in_packets++;
 		n->in_bytes += packet->len;
 
@@ -220,24 +249,31 @@ static void receive_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *
 		if(!n->status.waitingforkey) {
 			logger(mesh, MESHLINK_DEBUG, "Got packet from %s but we haven't exchanged keys yet", n->name);
 			send_req_key(mesh, n);
-		} else
+		} else {
 			logger(mesh, MESHLINK_DEBUG, "Got packet from %s but he hasn't got our key yet", n->name);
+		}
+
 		return;
 	}
-	sptps_receive_data(&n->sptps, inpkt->data, inpkt->len);
+
+	if(!sptps_receive_data(&n->sptps, inpkt->data, inpkt->len)) {
+		logger(mesh, MESHLINK_ERROR, "Could not process SPTPS data from %s: %s", n->name, strerror(errno));
+	}
 }
 
 static void send_sptps_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *origpkt) {
 	if(!n->status.validkey) {
 		logger(mesh, MESHLINK_INFO, "No valid key known yet for %s", n->name);
-		if(!n->status.waitingforkey)
+
+		if(!n->status.waitingforkey) {
 			send_req_key(mesh, n);
-		else if(n->last_req_key + 10 < mesh->loop.now.tv_sec) {
+		} else if(n->last_req_key + 10 < mesh->loop.now.tv_sec) {
 			logger(mesh, MESHLINK_DEBUG, "No key from %s after 10 seconds, restarting SPTPS", n->name);
 			sptps_stop(&n->sptps);
 			n->status.waitingforkey = false;
 			send_req_key(mesh, n);
 		}
+
 		return;
 	}
 
@@ -249,11 +285,6 @@ static void send_sptps_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *
 		return;
 	}
 
-	if(n->outcompression) {
-		logger(mesh, MESHLINK_ERROR, "Error while compressing packet to %s", n->name);
-		return;
-	}
-
 	sptps_send_record(&n->sptps, type, origpkt->data, origpkt->len);
 	return;
 }
@@ -264,16 +295,16 @@ static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const s
 	*sock = n->sock;
 
 	/* If the UDP address is confirmed, use it. */
-	if(n->status.udp_confirmed)
+	if(n->status.udp_confirmed) {
 		return;
+	}
 
 	/* Send every third packet to n->address; that could be set
 	   to the node's reflexive UDP address discovered during key
 	   exchange. */
 
-	static int x = 0;
-	if(++x >= 3) {
-		x = 0;
+	if(++mesh->udp_choice >= 3) {
+		mesh->udp_choice = 0;
 		return;
 	}
 
@@ -281,7 +312,7 @@ static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const s
 	   So we pick a random edge and a random socket. */
 
 	int i = 0;
-	int j = rand() % n->edge_tree->count;
+	int j = prng(mesh, n->edge_tree->count);
 	edge_t *candidate = NULL;
 
 	for splay_each(edge_t, e, n->edge_tree) {
@@ -293,7 +324,7 @@ static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const s
 
 	if(candidate) {
 		*sa = &candidate->address;
-		*sock = rand() % mesh->listen_sockets;
+		*sock = prng(mesh, mesh->listen_sockets);
 	}
 
 	/* Make sure we have a suitable socket for the chosen address */
@@ -308,42 +339,16 @@ static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const s
 }
 
 static void choose_broadcast_address(meshlink_handle_t *mesh, const node_t *n, const sockaddr_t **sa, int *sock) {
-	static sockaddr_t broadcast_ipv4 = {
-		.in = {
-			.sin_family = AF_INET,
-			.sin_addr.s_addr = -1,
-		}
-	};
-
-	static sockaddr_t broadcast_ipv6 = {
-		.in6 = {
-			.sin6_family = AF_INET6,
-			.sin6_addr.s6_addr[0x0] = 0xff,
-			.sin6_addr.s6_addr[0x1] = 0x02,
-			.sin6_addr.s6_addr[0xf] = 0x01,
-		}
-	};
+	*sock = prng(mesh, mesh->listen_sockets);
+	sockaddr_t *broadcast_sa = &mesh->listen_socket[*sock].broadcast_sa;
 
-	*sock = rand() % mesh->listen_sockets;
-
-	if(mesh->listen_socket[*sock].sa.sa.sa_family == AF_INET6) {
-		if(mesh->localdiscovery_address.sa.sa_family == AF_INET6) {
-			mesh->localdiscovery_address.in6.sin6_port = n->prevedge->address.in.sin_port;
-			*sa = &mesh->localdiscovery_address;
-		} else {
-			broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port;
-			broadcast_ipv6.in6.sin6_scope_id = mesh->listen_socket[*sock].sa.in6.sin6_scope_id;
-			*sa = &broadcast_ipv6;
-		}
+	if(broadcast_sa->sa.sa_family == AF_INET6) {
+		broadcast_sa->in6.sin6_port = n->prevedge->address.in.sin_port;
 	} else {
-		if(mesh->localdiscovery_address.sa.sa_family == AF_INET) {
-			mesh->localdiscovery_address.in.sin_port = n->prevedge->address.in.sin_port;
-			*sa = &mesh->localdiscovery_address;
-		} else {
-			broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port;
-			*sa = &broadcast_ipv4;
-		}
+		broadcast_sa->in.sin_port = n->prevedge->address.in.sin_port;
 	}
+
+	*sa = broadcast_sa;
 }
 
 static void send_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *origpkt) {
@@ -352,25 +357,30 @@ static void send_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *ori
 		return;
 	}
 
-	return send_sptps_packet(mesh, n, origpkt);
+	send_sptps_packet(mesh, n, origpkt);
 }
 
 bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
+	assert(handle);
+	assert(data);
+	assert(len);
+
 	node_t *to = handle;
 	meshlink_handle_t *mesh = to->mesh;
 
 	/* Send it via TCP if it is a handshake packet, TCPOnly is in use, or this packet is larger than the MTU. */
 
-	if(type >= SPTPS_HANDSHAKE || ((mesh->self->options | to->options) & OPTION_TCPONLY) || (type != PKT_PROBE && len > to->minmtu)) {
+	if(type >= SPTPS_HANDSHAKE || (type != PKT_PROBE && (len - 21) > to->minmtu)) {
 		char buf[len * 4 / 3 + 5];
 		b64encode(data, buf, len);
+
 		/* If no valid key is known yet, send the packets using ANS_KEY requests,
 		   to ensure we get to learn the reflexive UDP address. */
 		if(!to->status.validkey) {
-			to->incompression = mesh->self->incompression;
-			return send_request(mesh, to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, mesh->self->name, to->name, buf, to->incompression);
-		} else
-			return send_request(mesh, to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_SPTPS, buf);
+			return send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, mesh->self->name, to->name, buf, 0);
+		} else {
+			return send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_SPTPS, buf);
+		}
 	}
 
 	/* Otherwise, send the packet via UDP */
@@ -378,17 +388,21 @@ bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
 	const sockaddr_t *sa;
 	int sock;
 
-	if(to->status.broadcast)
+	if(to->status.broadcast) {
 		choose_broadcast_address(mesh, to, &sa, &sock);
-	else
+	} else {
 		choose_udp_address(mesh, to, &sa, &sock);
+	}
 
 	if(sendto(mesh->listen_socket[sock].udp.fd, data, len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) {
 		if(sockmsgsize(sockerrno)) {
-			if(to->maxmtu >= len)
+			if(to->maxmtu >= len) {
 				to->maxmtu = len - 1;
-			if(to->mtu >= len)
+			}
+
+			if(to->mtu >= len) {
 				to->mtu = len - 1;
+			}
 		} else {
 			logger(mesh, MESHLINK_WARNING, "Error sending UDP SPTPS packet to %s: %s", to->name, sockstrerror(sockerrno));
 			return false;
@@ -399,22 +413,28 @@ bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
 }
 
 bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len) {
+	assert(handle);
+	assert(!data || len);
+
 	node_t *from = handle;
 	meshlink_handle_t *mesh = from->mesh;
 
 	if(type == SPTPS_HANDSHAKE) {
 		if(!from->status.validkey) {
-			logger(mesh, MESHLINK_INFO, "SPTPS key exchange with %s succesful", from->name);
+			logger(mesh, MESHLINK_INFO, "SPTPS key exchange with %s successful", from->name);
 			from->status.validkey = true;
 			from->status.waitingforkey = false;
-			if(from->utcp)
+
+			if(from->utcp) {
 				utcp_reset_timers(from->utcp);
+			}
 		}
+
 		return true;
 	}
 
-	if(len > MTU) {
-		logger(mesh, MESHLINK_ERROR, "Packet from %s larger than maximum supported size (%d > %d)", from->name, len, MTU);
+	if(len > MAXSIZE) {
+		logger(mesh, MESHLINK_ERROR, "Packet from %s larger than maximum supported size (%d > %d)", from->name, len, MAXSIZE);
 		return false;
 	}
 
@@ -426,8 +446,9 @@ bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t
 		memcpy(inpkt.data, data, len);
 		mtu_probe_h(mesh, from, &inpkt, len);
 		return true;
-	} else
+	} else {
 		inpkt.probe = false;
+	}
 
 	if(type & ~(PKT_COMPRESSED)) {
 		logger(mesh, MESHLINK_ERROR, "Unexpected SPTPS record type %d len %d from %s", type, len, from->name);
@@ -466,51 +487,41 @@ void send_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet) {
 
 	n->out_packets++;
 	n->out_bytes += packet->len;
+	n->status.want_udp = true;
 
 	send_sptps_packet(mesh, n, packet);
 	return;
 }
 
-/* Broadcast a packet using the minimum spanning tree */
-
-void broadcast_packet(meshlink_handle_t *mesh, const node_t *from, vpn_packet_t *packet) {
-	// Always give ourself a copy of the packet.
-	if(from != mesh->self)
-		send_packet(mesh, mesh->self, packet);
-
-	logger(mesh, MESHLINK_INFO, "Broadcasting packet of %d bytes from %s", packet->len, from->name);
-
-	for list_each(connection_t, c, mesh->connections)
-		if(c->status.active && c->status.mst && c != from->nexthop->connection)
-			send_packet(mesh, c->node, packet);
-}
-
 static node_t *try_harder(meshlink_handle_t *mesh, const sockaddr_t *from, const vpn_packet_t *pkt) {
 	node_t *n = NULL;
 	bool hard = false;
-	static time_t last_hard_try = 0;
 
 	for splay_each(edge_t, e, mesh->edges) {
-		if(!e->to->status.reachable || e->to == mesh->self)
+		if(!e->to->status.reachable || e->to == mesh->self) {
 			continue;
+		}
 
 		if(sockaddrcmp_noport(from, &e->address)) {
-			if(last_hard_try == mesh->loop.now.tv_sec)
+			if(mesh->last_hard_try == mesh->loop.now.tv_sec) {
 				continue;
+			}
+
 			hard = true;
 		}
 
-		if(!try_mac(mesh, e->to, pkt))
+		if(!try_mac(mesh, e->to, pkt)) {
 			continue;
+		}
 
 		n = e->to;
 		break;
 	}
 
-	if(hard)
-		last_hard_try = mesh->loop.now.tv_sec;
+	if(hard) {
+		mesh->last_hard_try = mesh->loop.now.tv_sec;
+	}
 
-	last_hard_try = mesh->loop.now.tv_sec;
 	return n;
 }
 
@@ -520,16 +531,20 @@ void handle_incoming_vpn_data(event_loop_t *loop, void *data, int flags) {
 	listen_socket_t *ls = data;
 	vpn_packet_t pkt;
 	char *hostname;
-	sockaddr_t from = {};
+	sockaddr_t from;
 	socklen_t fromlen = sizeof(from);
 	node_t *n;
 	int len;
 
+	memset(&from, 0, sizeof(from));
+
 	len = recvfrom(ls->udp.fd, pkt.data, MAXSIZE, 0, &from.sa, &fromlen);
 
 	if(len <= 0 || len > MAXSIZE) {
-		if(!sockwouldblock(sockerrno))
+		if(!sockwouldblock(sockerrno)) {
 			logger(mesh, MESHLINK_ERROR, "Receiving packet failed: %s", sockstrerror(sockerrno));
+		}
+
 		return;
 	}
 
@@ -541,21 +556,24 @@ void handle_incoming_vpn_data(event_loop_t *loop, void *data, int flags) {
 
 	if(!n) {
 		n = try_harder(mesh, &from, &pkt);
-		if(n)
+
+		if(n) {
 			update_node_udp(mesh, n, &from);
-		else if(mesh->log_level >= MESHLINK_WARNING) {
+		} else if(mesh->log_level <= MESHLINK_WARNING) {
 			hostname = sockaddr2hostname(&from);
 			logger(mesh, MESHLINK_WARNING, "Received UDP packet from unknown source %s", hostname);
 			free(hostname);
 			return;
-		} else
+		} else {
 			return;
+		}
 	}
 
 	if(n->status.blacklisted) {
 		logger(mesh, MESHLINK_WARNING, "Dropping packet from blacklisted node %s", n->name);
 		return;
 	}
+
 	n->sock = ls - mesh->listen_socket;
 
 	receive_udppacket(mesh, n, &pkt);