Add colors to tincd logger

[tinc] / src / sptps_test.c

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 7867b72..acc692a 100644 (file)
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -30,6 +30,7 @@
 #include "sptps.h"
 #include "utils.h"
 #include "names.h"
+#include "random.h"
 
 #ifndef HAVE_WINDOWS
 #define closesocket(s) close(s)
@@ -301,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;
@@ -481,7 +495,7 @@ int main(int argc, char *argv[]) {
                                return 1;
                        }
 
-                       fprintf(stderr, "Listening...\n");
+                       print_listening_msg(sock);
 
                        sock = accept(sock, NULL, NULL);
 
@@ -490,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;
@@ -510,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) {
@@ -532,14 +543,14 @@ int main(int argc, char *argv[]) {
 
        if(!fp) {
                fprintf(stderr, "Could not open %s: %s\n", argv[2], strerror(errno));
-               free(mykey);
+               ecdsa_free(mykey);
                return 1;
        }
 
        ecdsa_t *hiskey = NULL;
 
        if(!(hiskey = ecdsa_read_pem_public_key(fp))) {
-               free(mykey);
+               ecdsa_free(mykey);
                return 1;
        }
 
@@ -552,8 +563,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);
+               ecdsa_free(mykey);
+               ecdsa_free(hiskey);
                return 1;
        }
 
@@ -564,8 +575,8 @@ int main(int argc, char *argv[]) {
 
                if(in < 0) {
                        fprintf(stderr, "Could not init stdin reader thread\n");
-                       free(mykey);
-                       free(hiskey);
+                       ecdsa_free(mykey);
+                       ecdsa_free(hiskey);
                        return 1;
                }
        }
@@ -592,8 +603,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);
+                       ecdsa_free(mykey);
+                       ecdsa_free(hiskey);
                        return 1;
                }
 
@@ -606,8 +617,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);
+                               ecdsa_free(mykey);
+                               ecdsa_free(hiskey);
                                return 1;
                        }
 
@@ -638,8 +649,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);
+                               ecdsa_free(mykey);
+                               ecdsa_free(hiskey);
                                return 1;
                        }
                }
@@ -649,8 +660,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);
+                               ecdsa_free(mykey);
+                               ecdsa_free(hiskey);
                                return 1;
                        }
 
@@ -680,8 +691,8 @@ int main(int argc, char *argv[]) {
 
                                if(!done) {
                                        if(!datagram) {
-                                               free(mykey);
-                                               free(hiskey);
+                                               ecdsa_free(mykey);
+                                               ecdsa_free(hiskey);
                                                return 1;
                                        }
                                }
@@ -694,14 +705,21 @@ int main(int argc, char *argv[]) {
 
        bool stopped = sptps_stop(&s);
 
-       free(mykey);
-       free(hiskey);
+       ecdsa_free(mykey);
+       ecdsa_free(hiskey);
+       closesocket(sock);
+
+       return !stopped;
+}
 
-       if(!stopped) {
-               return 1;
-       }
+int main(int argc, char *argv[]) {
+       random_init();
+       crypto_init();
+       prng_init();
 
-       closesocket(sock);
+       int result = run_test(argc, argv);
 
-       return 0;
+       random_exit();
+
+       return result;
 }