X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps_test.c;h=249f2e4f05f3e3c8cbe02d4f6bf5daf99c650823;hb=90cde91141ec61be4354d8deab21edb8fdf01022;hp=7867b722dec5268a2c0e16354dfcdf81ff802062;hpb=ccbe79c03b8c64432bbf1ce82dc0e123cc02bd6d;p=tinc

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 7867b722..249f2e4f 100644
--- 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) {
@@ -696,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;
 }