Use xoshiro256** to generate pseudo-random numbers.

[tinc] / src / sptps_test.c

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 87f9b51..2c01322 100644 (file)
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -34,10 +34,6 @@
 #include "sptps.h"
 #include "utils.h"
 
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)
 #endif
@@ -76,7 +72,7 @@ static bool send_data(void *handle, uint8_t type, const void *data, size_t len)
        bin2hex(data, hex, len);
 
        if(verbose) {
-               fprintf(stderr, "Sending %d bytes of data:\n%s\n", (int)len, hex);
+               fprintf(stderr, "Sending %zu bytes of data:\n%s\n", len, hex);
        }
 
        const int *sock = handle;
@@ -162,7 +158,7 @@ void *stdin_reader_thread(void *arg) {
                        fprintf(stderr, "New connection received from :%d\n", ntohs(sa.sin_port));
                }
 
-               char buf[1024];
+               uint8_t buf[1024];
                ssize_t nread;
 
                while((nread = read(STDIN_FILENO, buf, sizeof(buf))) > 0) {
@@ -170,7 +166,7 @@ void *stdin_reader_thread(void *arg) {
                                fprintf(stderr, "Read %lld bytes from input\n", nread);
                        }
 
-                       char *start = buf;
+                       uint8_t *start = buf;
                        ssize_t nleft = nread;
 
                        while(nleft) {
@@ -296,7 +292,6 @@ int main(int argc, char *argv[]) {
        int packetloss = 0;
        int r;
        int option_index = 0;
-       ecdsa_t *mykey = NULL, *hiskey = NULL;
        bool quit = false;
 
        while((r = getopt_long(argc, argv, "dqrstwL:W:v46", long_options, &option_index)) != EOF) {
@@ -380,8 +375,6 @@ int main(int argc, char *argv[]) {
                initiator = true;
        }
 
-       srand(getpid());
-
 #ifdef HAVE_LINUX
 
        if(tun) {
@@ -433,6 +426,7 @@ int main(int argc, char *argv[]) {
 
        if(sock < 0) {
                fprintf(stderr, "Could not create socket: %s\n", sockstrerror(sockerrno));
+               freeaddrinfo(ai);
                return 1;
        }
 
@@ -440,14 +434,24 @@ int main(int argc, char *argv[]) {
        setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(one));
 
        if(initiator) {
-               if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
+               int res = connect(sock, ai->ai_addr, ai->ai_addrlen);
+
+               freeaddrinfo(ai);
+               ai = NULL;
+
+               if(res) {
                        fprintf(stderr, "Could not connect to peer: %s\n", sockstrerror(sockerrno));
                        return 1;
                }
 
                fprintf(stderr, "Connected\n");
        } else {
-               if(bind(sock, ai->ai_addr, ai->ai_addrlen)) {
+               int res = bind(sock, ai->ai_addr, ai->ai_addrlen);
+
+               freeaddrinfo(ai);
+               ai = NULL;
+
+               if(res) {
                        fprintf(stderr, "Could not bind socket: %s\n", sockstrerror(sockerrno));
                        return 1;
                }
@@ -469,7 +473,7 @@ int main(int argc, char *argv[]) {
                } else {
                        fprintf(stderr, "Listening...\n");
 
-                       char buf[65536];
+                       uint8_t buf[65536];
                        struct sockaddr addr;
                        socklen_t addrlen = sizeof(addr);
 
@@ -488,6 +492,7 @@ int main(int argc, char *argv[]) {
        }
 
        crypto_init();
+       prng_init();
 
        FILE *fp = fopen(argv[1], "r");
 
@@ -496,6 +501,8 @@ int main(int argc, char *argv[]) {
                return 1;
        }
 
+       ecdsa_t *mykey = NULL;
+
        if(!(mykey = ecdsa_read_pem_private_key(fp))) {
                return 1;
        }
@@ -506,10 +513,14 @@ int main(int argc, char *argv[]) {
 
        if(!fp) {
                fprintf(stderr, "Could not open %s: %s\n", argv[2], strerror(errno));
+               free(mykey);
                return 1;
        }
 
+       ecdsa_t *hiskey = NULL;
+
        if(!(hiskey = ecdsa_read_pem_public_key(fp))) {
+               free(mykey);
                return 1;
        }
 
@@ -522,6 +533,8 @@ int main(int argc, char *argv[]) {
        sptps_t s;
 
        if(!sptps_start(&s, &sock, initiator, datagram, mykey, hiskey, "sptps_test", 10, send_data, receive_record)) {
+               free(mykey);
+               free(hiskey);
                return 1;
        }
 
@@ -532,6 +545,8 @@ int main(int argc, char *argv[]) {
 
                if(in < 0) {
                        fprintf(stderr, "Could not init stdin reader thread\n");
+                       free(mykey);
+                       free(hiskey);
                        return 1;
                }
        }
@@ -558,6 +573,8 @@ int main(int argc, char *argv[]) {
                FD_SET(sock, &fds);
 
                if(select(max_fd + 1, &fds, NULL, NULL, NULL) <= 0) {
+                       free(mykey);
+                       free(hiskey);
                        return 1;
                }
 
@@ -570,6 +587,8 @@ int main(int argc, char *argv[]) {
 
                        if(len < 0) {
                                fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno));
+                               free(mykey);
+                               free(hiskey);
                                return 1;
                        }
 
@@ -600,6 +619,8 @@ int main(int argc, char *argv[]) {
                                        sptps_send_record(&s, 0, buf, len);
                                }
                        } else if(!sptps_send_record(&s, buf[0] == '!' ? 1 : 0, buf, (len == 1 && buf[0] == '\n') ? 0 : buf[0] == '*' ? sizeof(buf) : (size_t)len)) {
+                               free(mykey);
+                               free(hiskey);
                                return 1;
                        }
                }
@@ -609,6 +630,8 @@ int main(int argc, char *argv[]) {
 
                        if(len < 0) {
                                fprintf(stderr, "Could not read from socket: %s\n", sockstrerror(sockerrno));
+                               free(mykey);
+                               free(hiskey);
                                return 1;
                        }
 
@@ -620,10 +643,10 @@ int main(int argc, char *argv[]) {
                        if(verbose) {
                                char hex[len * 2 + 1];
                                bin2hex(buf, hex, len);
-                               fprintf(stderr, "Received %d bytes of data:\n%s\n", (int)len, hex);
+                               fprintf(stderr, "Received %zd bytes of data:\n%s\n", len, hex);
                        }
 
-                       if(packetloss && (rand() % 100) < packetloss) {
+                       if(packetloss && prng(100) < packetloss) {
                                if(verbose) {
                                        fprintf(stderr, "Dropped.\n");
                                }
@@ -638,17 +661,24 @@ int main(int argc, char *argv[]) {
 
                                if(!done) {
                                        if(!datagram) {
+                                               free(mykey);
+                                               free(hiskey);
                                                return 1;
                                        }
                                }
 
                                bufp += done;
-                               len -= done;
+                               len -= (ssize_t) done;
                        }
                }
        }
 
-       if(!sptps_stop(&s)) {
+       bool stopped = sptps_stop(&s);
+
+       free(mykey);
+       free(hiskey);
+
+       if(!stopped) {
                return 1;
        }