Refactor crypto RNG; add getrandom() support

[tinc] / src / sptps_test.c

diff --git a/src/sptps_test.c b/src/sptps_test.c
index baca66b..249f2e4 100644 (file)
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -23,12 +23,6 @@
 #include <linux/if_tun.h>
 #endif
 
-#include <getopt.h>
-
-#ifdef HAVE_WINDOWS
-#include <pthread.h>
-#endif
-
 #include "crypto.h"
 #include "ecdsa.h"
 #include "meta.h"
@@ -36,6 +30,7 @@
 #include "sptps.h"
 #include "utils.h"
 #include "names.h"
+#include "random.h"
 
 #ifndef HAVE_WINDOWS
 #define closesocket(s) close(s)
@@ -70,7 +65,7 @@ int addressfamily = AF_UNSPEC;
 
 static bool send_data(void *handle, uint8_t type, const void *data, size_t len) {
        (void)type;
-       char hex[len * 2 + 1];
+       char *hex = alloca(len * 2 + 1);
        bin2hex(data, hex, len);
 
        if(verbose) {
@@ -169,7 +164,7 @@ int stdin_sock_fd = -1;
 // separate thread between the stdin and the sptps loop way below. This thread
 // reads stdin and sends its content to the main thread through a TCP socket,
 // which can be properly select()'ed.
-static void *stdin_reader_thread(void *arg) {
+static DWORD WINAPI stdin_reader_thread(LPVOID arg) {
        struct sockaddr_in sa;
        socklen_t sa_size = sizeof(sa);
 
@@ -226,7 +221,7 @@ static void *stdin_reader_thread(void *arg) {
 
        closesocket(stdin_sock_fd);
        stdin_sock_fd = -1;
-       return NULL;
+       return 0;
 }
 
 static int start_input_reader(void) {
@@ -275,11 +270,8 @@ static int start_input_reader(void) {
                fprintf(stderr, "stdin thread is listening on :%d\n", ntohs(connect_sa.sin_port));
        }
 
-       pthread_t th;
-       int err = pthread_create(&th, NULL, stdin_reader_thread, NULL);
-
-       if(err) {
-               fprintf(stderr, "Could not start reader thread: %s\n", strerror(err));
+       if(!CreateThread(NULL, 0, stdin_reader_thread, NULL, 0, NULL)) {
+               fprintf(stderr, "Could not start reader thread: %d\n", GetLastError());
                goto server_err;
        }
 
@@ -310,7 +302,20 @@ server_err:
 
 #endif // HAVE_WINDOWS
 
-int main(int argc, char *argv[]) {
+static void print_listening_msg(int sock) {
+       sockaddr_t sa = {0};
+       socklen_t salen = sizeof(sa);
+       int port = 0;
+
+       if(!getsockname(sock, &sa.sa, &salen)) {
+               port = ntohs(sa.in.sin_port);
+       }
+
+       fprintf(stderr, "Listening on %d...\n", port);
+       fflush(stderr);
+}
+
+static int run_test(int argc, char *argv[]) {
        program_name = argv[0];
        bool initiator = false;
        bool datagram = false;
@@ -490,7 +495,7 @@ int main(int argc, char *argv[]) {
                                return 1;
                        }
 
-                       fprintf(stderr, "Listening...\n");
+                       print_listening_msg(sock);
 
                        sock = accept(sock, NULL, NULL);
 
@@ -499,7 +504,7 @@ int main(int argc, char *argv[]) {
                                return 1;
                        }
                } else {
-                       fprintf(stderr, "Listening...\n");
+                       print_listening_msg(sock);
 
                        char buf[65536];
                        struct sockaddr addr;
@@ -519,9 +524,6 @@ int main(int argc, char *argv[]) {
                fprintf(stderr, "Connected\n");
        }
 
-       crypto_init();
-       prng_init();
-
        FILE *fp = fopen(argv[1], "r");
 
        if(!fp) {
@@ -669,7 +671,7 @@ int main(int argc, char *argv[]) {
                        }
 
                        if(verbose) {
-                               char hex[len * 2 + 1];
+                               char *hex = alloca(len * 2 + 1);
                                bin2hex(buf, hex, len);
                                fprintf(stderr, "Received %ld bytes of data:\n%s\n", (long)len, hex);
                        }
@@ -705,12 +707,19 @@ int main(int argc, char *argv[]) {
 
        free(mykey);
        free(hiskey);
+       closesocket(sock);
 
-       if(!stopped) {
-               return 1;
-       }
+       return !stopped;
+}
 
-       closesocket(sock);
+int main(int argc, char *argv[]) {
+       random_init();
+       crypto_init();
+       prng_init();
 
-       return 0;
+       int result = run_test(argc, argv);
+
+       random_exit();
+
+       return result;
 }