X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps_test.c;h=3a72f1d6fb7a6a624b8e1a6d173fed476fc7eee4;hb=843990d8df0c060db9b64e170996e9d49c8c921d;hp=44cdeb73b64132ecbc77a503fb8b1823538f4a05;hpb=29b42aa17ede17bc67963292e86b186cc09039b1;p=tinc

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 44cdeb73..3a72f1d6 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-2013 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2011-2014 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,10 @@
 
 #include "system.h"
 
+#ifdef HAVE_LINUX
+#include <linux/if_tun.h>
+#endif
+
 #include <getopt.h>
 
 #include "crypto.h"
@@ -31,13 +35,18 @@ bool send_request(void *c, const char *msg, ...) { return false; }
 struct list_t *connection_list = NULL;
 bool send_meta(void *c, const char *msg , int len) { return false; }
 char *logfilename = NULL;
+bool do_detach = false;
 struct timeval now;
 
+static bool special;
 static bool verbose;
 static bool readonly;
 static bool writeonly;
+static int in = 0;
+static int out = 1;
+static int addressfamily = AF_UNSPEC;
 
-static bool send_data(void *handle, uint8_t type, const char *data, size_t len) {
+static bool send_data(void *handle, uint8_t type, const void *data, size_t len) {
 	char hex[len * 2 + 1];
 	bin2hex(data, hex, len);
 	if(verbose)
@@ -48,11 +57,11 @@ static bool send_data(void *handle, uint8_t type, const char *data, size_t len)
 	return true;
 }
 
-static bool receive_record(void *handle, uint8_t type, const char *data, uint16_t len) {
+static bool receive_record(void *handle, uint8_t type, const void *data, uint16_t len) {
 	if(verbose)
 		fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len);
 	if(!writeonly)
-		fwrite(data, len, 1, stdout);
+		write(out, data, len);
 	return true;
 }
 
@@ -63,6 +72,7 @@ static struct option const long_options[] = {
 	{"writeonly", no_argument, NULL, 'w'},
 	{"packet-loss", required_argument, NULL, 'L'},
 	{"replay-window", required_argument, NULL, 'W'},
+	{"special", no_argument, NULL, 's'},
 	{"verbose", required_argument, NULL, 'v'},
 	{"help", no_argument, NULL, 1},
 	{NULL, 0, NULL, 0}
@@ -71,15 +81,21 @@ static struct option const long_options[] = {
 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, "Usage: %s [options] my_ed25519_key_file his_ed25519_key_file [host] port\n\n", program_name);
 	fprintf(stderr, "Valid options are:\n"
 			"  -d, --datagram          Enable datagram mode.\n"
 			"  -q, --quit              Quit when EOF occurs on stdin.\n"
 			"  -r, --readonly          Only send data from the socket to stdout.\n"
+#ifdef HAVE_LINUX
+			"  -t, --tun               Use a tun device instead of stdio.\n"
+#endif
 			"  -w, --writeonly         Only send data from stdin to the socket.\n"
 			"  -L, --packet-loss RATE  Fake packet loss of RATE percent.\n"
 			"  -R, --replay-window N   Set replay window to N bytes.\n"
+			"  -s, --special           Enable special handling of lines starting with #, ^ and $.\n"
 			"  -v, --verbose           Display debug messages.\n"
+			"  -4                      Use IPv4.\n"
+			"  -6                      Use IPv6.\n"
 			"\n");
 	fprintf(stderr, "Report bugs to tinc@tinc-vpn.org.\n");
 }
@@ -88,13 +104,16 @@ int main(int argc, char *argv[]) {
 	program_name = argv[0];
 	bool initiator = false;
 	bool datagram = false;
+#ifdef HAVE_LINUX
+	bool tun = false;
+#endif
 	int packetloss = 0;
 	int r;
 	int option_index = 0;
 	ecdsa_t *mykey = NULL, *hiskey = NULL;
 	bool quit = false;
 
-	while((r = getopt_long(argc, argv, "dqrwL:W:v", long_options, &option_index)) != EOF) {
+	while((r = getopt_long(argc, argv, "dqrstwL:W:v46", long_options, &option_index)) != EOF) {
 		switch (r) {
 			case 0:   /* long option */
 				break;
@@ -111,6 +130,16 @@ int main(int argc, char *argv[]) {
 				readonly = true;
 				break;
 
+			case 't': /* read only */
+#ifdef HAVE_LINUX
+				tun = true;
+#else
+				fprintf(stderr, "--tun is only supported on Linux.\n");
+				usage();
+				return 1;
+#endif
+				break;
+
 			case 'w': /* write only */
 				writeonly = true;
 				break;
@@ -127,10 +156,22 @@ int main(int argc, char *argv[]) {
 				verbose = true;
 				break;
 
+			case 's': /* special character handling */
+				special = true;
+				break;
+
 			case '?': /* wrong options */
 				usage();
 				return 1;
 
+			case '4': /* IPv4 */
+				addressfamily = AF_INET;
+				break;
+
+			case '6': /* IPv6 */
+				addressfamily = AF_INET6;
+				break;
+
 			case 1: /* help */
 				usage();
 				return 0;
@@ -154,6 +195,25 @@ int main(int argc, char *argv[]) {
 
 	srand(time(NULL));
 
+#ifdef HAVE_LINUX
+	if(tun) {
+		in = out = open("/dev/net/tun", O_RDWR | O_NONBLOCK);
+		if(in < 0) {
+			fprintf(stderr, "Could not open tun device: %s\n", strerror(errno));
+			return 1;
+		}
+		struct ifreq ifr = {
+			.ifr_flags = IFF_TUN
+		};
+		if(ioctl(in, TUNSETIFF, &ifr)) {
+			fprintf(stderr, "Could not configure tun interface: %s\n", strerror(errno));
+			return 1;
+		}
+		ifr.ifr_name[IFNAMSIZ - 1] = 0;
+		fprintf(stderr, "Using tun interface %s\n", ifr.ifr_name);
+	}
+#endif
+
 #ifdef HAVE_MINGW
 	static struct WSAData wsa_state;
 	if(WSAStartup(MAKEWORD(2, 2), &wsa_state))
@@ -163,19 +223,19 @@ int main(int argc, char *argv[]) {
 	struct addrinfo *ai, hint;
 	memset(&hint, 0, sizeof hint);
 
-	hint.ai_family = AF_UNSPEC;
+	hint.ai_family = addressfamily;
 	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));
+		fprintf(stderr, "getaddrinfo() failed: %s\n", sockstrerror(sockerrno));
 		return 1;
 	}
 
 	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));
+		fprintf(stderr, "Could not create socket: %s\n", sockstrerror(sockerrno));
 		return 1;
 	}
 
@@ -184,26 +244,26 @@ int main(int argc, char *argv[]) {
 
 	if(initiator) {
 		if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
-			fprintf(stderr, "Could not connect to peer: %s\n", strerror(errno));
+			fprintf(stderr, "Could not connect to peer: %s\n", sockstrerror(sockerrno));
 			return 1;
 		}
 		fprintf(stderr, "Connected\n");
 	} else {
 		if(bind(sock, ai->ai_addr, ai->ai_addrlen)) {
-			fprintf(stderr, "Could not bind socket: %s\n", strerror(errno));
+			fprintf(stderr, "Could not bind socket: %s\n", sockstrerror(sockerrno));
 			return 1;
 		}
 
 		if(!datagram) {
 			if(listen(sock, 1)) {
-				fprintf(stderr, "Could not listen on socket: %s\n", strerror(errno));
+				fprintf(stderr, "Could not listen on socket: %s\n", sockstrerror(sockerrno));
 				return 1;
 			}
 			fprintf(stderr, "Listening...\n");
 
 			sock = accept(sock, NULL, NULL);
 			if(sock < 0) {
-				fprintf(stderr, "Could not accept connection: %s\n", strerror(errno));
+				fprintf(stderr, "Could not accept connection: %s\n", sockstrerror(sockerrno));
 				return 1;
 			}
 		} else {
@@ -214,12 +274,12 @@ int main(int argc, char *argv[]) {
 			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));
+				fprintf(stderr, "Could not read from socket: %s\n", sockstrerror(sockerrno));
 				return 1;
 			}
 
 			if(connect(sock, &addr, addrlen)) {
-				fprintf(stderr, "Could not accept connection: %s\n", strerror(errno));
+				fprintf(stderr, "Could not accept connection: %s\n", sockstrerror(sockerrno));
 				return 1;
 			}
 		}
@@ -230,11 +290,19 @@ int main(int argc, char *argv[]) {
 	crypto_init();
 
 	FILE *fp = fopen(argv[1], "r");
+	if(!fp) {
+		fprintf(stderr, "Could not open %s: %s\n", argv[1], strerror(errno));
+		return 1;
+	}
 	if(!(mykey = ecdsa_read_pem_private_key(fp)))
 		return 1;
 	fclose(fp);
 
 	fp = fopen(argv[2], "r");
+	if(!fp) {
+		fprintf(stderr, "Could not open %s: %s\n", argv[2], strerror(errno));
+		return 1;
+	}
 	if(!(hiskey = ecdsa_read_pem_public_key(fp)))
 		return 1;
 	fclose(fp);
@@ -256,14 +324,14 @@ int main(int argc, char *argv[]) {
 		FD_ZERO(&fds);
 #ifndef HAVE_MINGW
 		if(!readonly && s.instate)
-			FD_SET(0, &fds);
+			FD_SET(in, &fds);
 #endif
 		FD_SET(sock, &fds);
 		if(select(sock + 1, &fds, NULL, NULL, NULL) <= 0)
 			return 1;
 
-		if(FD_ISSET(0, &fds)) {
-			ssize_t len = read(0, buf, sizeof buf);
+		if(FD_ISSET(in, &fds)) {
+			ssize_t len = read(in, buf, sizeof buf);
 			if(len < 0) {
 				fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno));
 				return 1;
@@ -274,11 +342,11 @@ int main(int argc, char *argv[]) {
 				readonly = true;
 				continue;
 			}
-			if(buf[0] == '#')
+			if(special && buf[0] == '#')
 				s.outseqno = atoi(buf + 1);
-			if(buf[0] == '^')
+			if(special && buf[0] == '^')
 				sptps_send_record(&s, SPTPS_HANDSHAKE, NULL, 0);
-			else if(buf[0] == '$') {
+			else if(special && buf[0] == '$') {
 				sptps_force_kex(&s);
 				if(len > 1)
 					sptps_send_record(&s, 0, buf, len);
@@ -290,7 +358,7 @@ int main(int argc, char *argv[]) {
 		if(FD_ISSET(sock, &fds)) {
 			ssize_t len = recv(sock, buf, sizeof buf, 0);
 			if(len < 0) {
-				fprintf(stderr, "Could not read from socket: %s\n", strerror(errno));
+				fprintf(stderr, "Could not read from socket: %s\n", sockstrerror(sockerrno));
 				return 1;
 			}
 			if(len == 0) {
@@ -307,8 +375,19 @@ int main(int argc, char *argv[]) {
 					fprintf(stderr, "Dropped.\n");
 				continue;
 			}
-			if(!sptps_receive_data(&s, buf, len) && !datagram)
-				return 1;
+			char *bufp = buf;
+			while(len) {
+				size_t done = sptps_receive_data(&s, bufp, len);
+				if(!done) {
+					if(!datagram)
+						return 1;
+				} else {
+					break;
+				}
+
+				bufp += done;
+				len -= done;
+			}
 		}
 	}