X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps_test.c;h=acc692ad31bf479124e65afddd9652049a375636;hb=c44b08613508c993e7fd9f625e0b1b4775efffed;hp=1da0571c6fc8b2ee1c4ad54d49b3e99046d853b0;hpb=df716df33af8e9a5b93d573a023ecd7fc24d9a03;p=tinc diff --git a/src/sptps_test.c b/src/sptps_test.c index 1da0571c..acc692ad 100644 --- a/src/sptps_test.c +++ b/src/sptps_test.c @@ -23,12 +23,6 @@ #include #endif -#include - -#ifdef HAVE_MINGW -#include -#endif - #include "crypto.h" #include "ecdsa.h" #include "meta.h" @@ -36,8 +30,9 @@ #include "sptps.h" #include "utils.h" #include "names.h" +#include "random.h" -#ifndef HAVE_MINGW +#ifndef HAVE_WINDOWS #define closesocket(s) close(s) #endif @@ -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) { @@ -160,7 +155,7 @@ static void usage(void) { fprintf(stderr, message, program_name); } -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS int stdin_sock_fd = -1; @@ -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; } @@ -308,9 +300,22 @@ server_err: return -1; } -#endif // HAVE_MINGW +#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; @@ -428,7 +433,7 @@ int main(int argc, char *argv[]) { #endif -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS static struct WSAData wsa_state; if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) { @@ -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) { @@ -541,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; } @@ -561,20 +563,20 @@ 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; } -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS if(!readonly) { in = start_input_reader(); if(in < 0) { fprintf(stderr, "Could not init stdin reader thread\n"); - free(mykey); - free(hiskey); + ecdsa_free(mykey); + ecdsa_free(hiskey); return 1; } } @@ -601,13 +603,13 @@ 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; } if(FD_ISSET(in, &fds)) { -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS ssize_t len = recv(in, buf, readsize, 0); #else ssize_t len = read(in, buf, readsize); @@ -615,13 +617,13 @@ 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; } if(len == 0) { -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS shutdown(in, SD_SEND); closesocket(in); #endif @@ -647,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; } } @@ -658,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; } @@ -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); } @@ -689,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; } } @@ -703,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); - 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; }