X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=e4f3295af941bdd92335298c30b9c776e9b9c8dd;hb=a5a8005b2d89712e124ab7295165a3e229abdad5;hp=36ad02bcf7b19fbfe05d19184b11be8f96e6d20d;hpb=282b99f3c71705bd6e34d4e4f9e8369ea63c87ed;p=meshlink

diff --git a/src/net_packet.c b/src/net_packet.c
index 36ad02bc..e4f3295a 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -70,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;
 		}
 
@@ -79,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) {
@@ -89,6 +91,7 @@ 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) {
 			n->minmtu = n->maxmtu;
+			update_node_pmtu(mesh, n);
 		} else {
 			n->maxmtu = n->minmtu;
 		}
@@ -99,10 +102,10 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 	}
 
 	if(n->mtuprobes == 31) {
-		timeout = mesh->pinginterval;
+		timeout = mesh->dev_class_traits[n->devclass].pinginterval;
 		goto end;
 	} else if(n->mtuprobes == 32) {
-		timeout = mesh->pingtimeout;
+		timeout = mesh->dev_class_traits[n->devclass].pingtimeout;
 	}
 
 	for(int i = 0; i < 5; i++) {
@@ -117,7 +120,7 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 		} else if(n->maxmtu <= n->minmtu) {
 			len = n->maxmtu;
 		} else {
-			len = n->minmtu + 1 + rand() % (n->maxmtu - n->minmtu);
+			len = n->minmtu + 1 + prng(mesh, n->maxmtu - n->minmtu);
 		}
 
 		if(len < 64) {
@@ -140,7 +143,7 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 
 end:
 	timeout_set(&mesh->loop, &n->mtutimeout, &(struct timeval) {
-		timeout, rand() % 100000
+		timeout, prng(mesh, TIMER_FUDGE)
 	});
 }
 
@@ -152,6 +155,11 @@ void send_mtu_probe(meshlink_handle_t *mesh, node_t *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]) {
@@ -198,6 +206,7 @@ static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet
 
 		if(n->minmtu < len) {
 			n->minmtu = len;
+			update_node_pmtu(mesh, n);
 		}
 	}
 }
@@ -279,10 +288,8 @@ static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const s
 	   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;
 	}
 
@@ -290,7 +297,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) {
@@ -302,7 +309,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 */
@@ -317,32 +324,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 = rand() % mesh->listen_sockets;
+	*sock = prng(mesh, mesh->listen_sockets);
+	sockaddr_t *broadcast_sa = &mesh->listen_socket[*sock].broadcast_sa;
 
-	if(mesh->listen_socket[*sock].sa.sa.sa_family == AF_INET6) {
-		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 {
-		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) {
@@ -355,6 +346,10 @@ static void send_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *ori
 }
 
 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;
 
@@ -403,6 +398,9 @@ 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;
 
@@ -498,7 +496,6 @@ void broadcast_packet(meshlink_handle_t *mesh, const node_t *from, vpn_packet_t
 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) {
@@ -506,7 +503,7 @@ static node_t *try_harder(meshlink_handle_t *mesh, const sockaddr_t *from, const
 		}
 
 		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;
 			}
 
@@ -522,10 +519,9 @@ static node_t *try_harder(meshlink_handle_t *mesh, const sockaddr_t *from, const
 	}
 
 	if(hard) {
-		last_hard_try = mesh->loop.now.tv_sec;
+		mesh->last_hard_try = mesh->loop.now.tv_sec;
 	}
 
-	last_hard_try = mesh->loop.now.tv_sec;
 	return n;
 }