X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps_test.c;h=98da73ef6a75d15546d49b4e54aeab7e5824379f;hb=d01ab07f78f84d7d30c5788416c8d4ca0e1f74bf;hp=2a9fca0c48d6172012df1f00f67bf3ba9dc0d73c;hpb=4d05e695ab68a16cc5ed853b50482c443c6e12a9;p=tinc

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 2a9fca0c..98da73ef 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-2012 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
@@ -19,6 +19,8 @@
 
 #include "system.h"
 
+#include <getopt.h>
+
 #include "crypto.h"
 #include "ecdsa.h"
 #include "sptps.h"
@@ -31,7 +33,7 @@ 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];
@@ -49,24 +51,78 @@ static bool receive_record(void *handle, uint8_t type, const char *data, uint16_
 	return true;
 }
 
+static struct option const long_options[] = {
+	{"datagram", no_argument, NULL, 'd'},
+	{"packet-loss", required_argument, NULL, 'l'},
+	{"replay-window", required_argument, NULL, 'r'},
+	{"help", no_argument, NULL, 1},
+	{NULL, 0, NULL, 0}
+};
+
+const char *program_name;
+
+static void usage() {
+	fprintf(stderr, "Usage: %s [options] my_ecdsa_key_file his_ecdsa_key_file [host] port\n\n", program_name);
+	fprintf(stderr, "Valid options are:\n"
+			"  -d, --datagram          Enable datagram mode.\n"
+			"  -l, --packet-loss RATE  Fake packet loss of RATE percent.\n"
+			"  -r, --replay-window N   Set replay window to N bytes.\n"
+			"\n");
+	fprintf(stderr, "Report bugs to tinc@tinc-vpn.org.\n");
+}
+
 int main(int argc, char *argv[]) {
+	program_name = argv[0];
 	bool initiator = false;
 	bool datagram = false;
+	int packetloss = 0;
+	int r;
+	int option_index = 0;
+
+	while((r = getopt_long(argc, argv, "dl:r:", long_options, &option_index)) != EOF) {
+		switch (r) {
+			case 0:   /* long option */
+				break;
 
-	if(argc > 1 && !strcmp(argv[1], "-d")) {
-		datagram = true;
-		argc--;
-		argv++;
+			case 'd': /* datagram mode */
+				datagram = true;
+				break;
+
+			case 'l': /* packet loss rate */
+				packetloss = atoi(optarg);
+				break;
+
+			case 'r': /* replay window size */
+				sptps_replaywin = atoi(optarg);
+				break;
+
+			case '?': /* wrong options */
+				usage();
+				return 1;
+
+			case 1: /* help */
+				usage();
+				return 0;
+
+			default:
+				break;
+		}
 	}
 
-	if(argc < 4) {
-		fprintf(stderr, "Usage: %s [-d] my_ecdsa_key_file his_ecdsa_key_file [host] port\n", argv[0]);
+	argc -= optind - 1;
+	argv += optind - 1;
+
+	if(argc < 4 || argc > 5) {
+		fprintf(stderr, "Wrong number of arguments.\n");
+		usage();
 		return 1;
 	}
 
 	if(argc > 4)
 		initiator = true;
 
+	srand(time(NULL));
+
 #ifdef HAVE_MINGW
 	static struct WSAData wsa_state;
 	if(WSAStartup(MAKEWORD(2, 2), &wsa_state))
@@ -143,12 +199,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);
 
@@ -178,6 +234,8 @@ int main(int argc, char *argv[]) {
 			}
 			if(len == 0)
 				break;
+			if(buf[0] == '#')
+				s.outseqno = atoi(buf + 1);
 			if(buf[0] == '^')
 				sptps_send_record(&s, SPTPS_HANDSHAKE, NULL, 0);
 			else if(buf[0] == '$') {
@@ -202,7 +260,11 @@ int main(int argc, char *argv[]) {
 			char hex[len * 2 + 1];
 			bin2hex(buf, hex, len);
 			fprintf(stderr, "Received %d bytes of data:\n%s\n", (int)len, hex);
-			if(!sptps_receive_data(&s, buf, len))
+			if((rand() % 100) < packetloss) {
+				fprintf(stderr, "Dropped.\n");
+				continue;
+			}
+			if(!sptps_receive_data(&s, buf, len) && !datagram)
 				return 1;
 		}
 	}