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

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 38c2c08e..3a72f1d6 100644
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -35,13 +35,16 @@ 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 void *data, size_t len) {
 	char hex[len * 2 + 1];
@@ -69,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}
@@ -88,7 +92,10 @@ static void usage() {
 			"  -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");
 }
@@ -106,7 +113,7 @@ int main(int argc, char *argv[]) {
 	ecdsa_t *mykey = NULL, *hiskey = NULL;
 	bool quit = false;
 
-	while((r = getopt_long(argc, argv, "dqrtwL: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;
@@ -149,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;
@@ -204,7 +223,7 @@ 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;
@@ -323,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);
@@ -356,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;
+			}
 		}
 	}