Suppress UBSan warnings in the xoshiro implementation.

[tinc] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index 24ebdff..d372ced 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -55,10 +55,6 @@
 #include "route.h"
 #include "utils.h"
 
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
 /* The minimum size of a probe is 14 bytes, but since we normally use CBC mode
    encryption, we can add a few extra random bytes without increasing the
    resulting packet size. */
@@ -743,7 +739,7 @@ static void choose_udp_address(const node_t *n, const sockaddr_t **sa, size_t *s
           So we pick a random edge and a random socket. */
 
        unsigned int i = 0;
-       unsigned int j = rand() % n->edge_tree.count;
+       unsigned int j = prng(n->edge_tree.count);
        edge_t *candidate = NULL;
 
        for splay_each(edge_t, e, &n->edge_tree) {
@@ -755,7 +751,7 @@ static void choose_udp_address(const node_t *n, const sockaddr_t **sa, size_t *s
 
        if(candidate) {
                *sa = &candidate->address;
-               *sock = rand() % listen_sockets;
+               *sock = prng(listen_sockets);
        }
 
        adapt_socket(*sa, sock);
@@ -767,7 +763,7 @@ static void choose_local_address(const node_t *n, const sockaddr_t **sa, size_t
        /* Pick one of the edges from this node at random, then use its local address. */
 
        unsigned int i = 0;
-       unsigned int j = rand() % n->edge_tree.count;
+       unsigned int j = prng(n->edge_tree.count);
        edge_t *candidate = NULL;
 
        for splay_each(edge_t, e, &n->edge_tree) {
@@ -779,7 +775,7 @@ static void choose_local_address(const node_t *n, const sockaddr_t **sa, size_t
 
        if(candidate && candidate->local_address.sa.sa_family) {
                *sa = &candidate->local_address;
-               *sock = rand() % listen_sockets;
+               *sock = prng(listen_sockets);
                adapt_socket(*sa, sock);
        }
 }