X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=e4f3295af941bdd92335298c30b9c776e9b9c8dd;hb=a5a8005b2d89712e124ab7295165a3e229abdad5;hp=493a38ff555e9e8f59dbc40cc87298dccf7b459b;hpb=9cde0d32cf209388cc59b06b7dcb0c3432f97da5;p=meshlink

diff --git a/src/net_packet.c b/src/net_packet.c
index 493a38ff..e4f3295a 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -120,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) {
@@ -143,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)
 	});
 }
 
@@ -297,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) {
@@ -309,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 */
@@ -324,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 = 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) {
-		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) {