X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsptps_test.c;h=2ce980441b43b3e281803e2590e718968ea890f0;hb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;hp=7af8522e136a3d5406a7599c94cb4e3cc76e5797;hpb=0b0949e5bb63f9545feb4714812e2aa2112fb092;p=meshlink

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 7af8522e..2ce98044 100644
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -1,6 +1,6 @@
 /*
     sptps_test.c -- Simple Peer-to-Peer Security test program
-    Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>,
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,11 +26,12 @@
 
 // Symbols necessary to link with logger.o
 bool send_request(void *c, const char *msg, ...) { return false; }
-struct splay_tree_t *connection_tree = NULL;
+struct list_t *connection_list = NULL;
 bool send_meta(void *c, const char *msg , int len) { return false; }
 char *logfilename = NULL;
+struct timeval now;
 
-ecdsa_t mykey, hiskey;
+ecdsa_t *mykey, *hiskey;
 
 static bool send_data(void *handle, uint8_t type, const char *data, size_t len) {
 	char hex[len * 2 + 1];
@@ -76,16 +77,16 @@ int main(int argc, char *argv[]) {
 	memset(&hint, 0, sizeof hint);
 
 	hint.ai_family = AF_UNSPEC;
-	hint.ai_socktype = SOCK_STREAM;
-	hint.ai_protocol = IPPROTO_TCP;
+	hint.ai_socktype = datagram ? SOCK_DGRAM : SOCK_STREAM;
+	hint.ai_protocol = datagram ? IPPROTO_UDP : IPPROTO_TCP;
 	hint.ai_flags = initiator ? 0 : AI_PASSIVE;
-	
+
 	if(getaddrinfo(initiator ? argv[3] : NULL, initiator ? argv[4] : argv[3], &hint, &ai) || !ai) {
 		fprintf(stderr, "getaddrinfo() failed: %s\n", strerror(errno));
 		return 1;
 	}
 
-	int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+	int sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
 	if(sock < 0) {
 		fprintf(stderr, "Could not create socket: %s\n", strerror(errno));
 		return 1;
@@ -105,16 +106,35 @@ int main(int argc, char *argv[]) {
 			fprintf(stderr, "Could not bind socket: %s\n", strerror(errno));
 			return 1;
 		}
-		if(listen(sock, 1)) {
-			fprintf(stderr, "Could not listen on socket: %s\n", strerror(errno));
-			return 1;
-		}
-		fprintf(stderr, "Listening...\n");
 
-		sock = accept(sock, NULL, NULL);
-		if(sock < 0) {
-			fprintf(stderr, "Could not accept connection: %s\n", strerror(errno));
-			return 1;
+		if(!datagram) {
+			if(listen(sock, 1)) {
+				fprintf(stderr, "Could not listen on socket: %s\n", strerror(errno));
+				return 1;
+			}
+			fprintf(stderr, "Listening...\n");
+
+			sock = accept(sock, NULL, NULL);
+			if(sock < 0) {
+				fprintf(stderr, "Could not accept connection: %s\n", strerror(errno));
+				return 1;
+			}
+		} else {
+			fprintf(stderr, "Listening...\n");
+
+			char buf[65536];
+			struct sockaddr addr;
+			socklen_t addrlen = sizeof addr;
+
+			if(recvfrom(sock, buf, sizeof buf, MSG_PEEK, &addr, &addrlen) <= 0) {
+				fprintf(stderr, "Could not read from socket: %s\n", strerror(errno));
+				return 1;
+			}
+
+			if(connect(sock, &addr, addrlen)) {
+				fprintf(stderr, "Could not accept connection: %s\n", strerror(errno));
+				return 1;
+			}
 		}
 
 		fprintf(stderr, "Connected\n");
@@ -123,12 +143,12 @@ int main(int argc, char *argv[]) {
 	crypto_init();
 
 	FILE *fp = fopen(argv[1], "r");
-	if(!ecdsa_read_pem_private_key(&mykey, fp))
+	if(!(mykey = ecdsa_read_pem_private_key(fp)))
 		return 1;
 	fclose(fp);
 
 	fp = fopen(argv[2], "r");
-	if(!ecdsa_read_pem_public_key(&hiskey, fp))
+	if(!(hiskey = ecdsa_read_pem_public_key(fp)))
 		return 1;
 	fclose(fp);