X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps_test.c;h=79a1a85d13317f2fb2e310d372252881a3990216;hb=86c2990327fdf7ec1197aa73cb2b9a926a734db4;hp=06d8deab97432c09459eece0e46016d58e69fdaf;hpb=483c5dcfb43719e5fd50902641252e28a04fd74e;p=tinc

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 06d8deab..79a1a85d 100644
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -25,7 +25,12 @@
 #include "sptps.h"
 #include "utils.h"
 
+// Symbols necessary to link with logger.o
 char *logfilename;
+char *connection_tree;
+char *send_request;
+char *send_meta;
+
 ecdsa_t mykey, hiskey;
 
 static bool send_data(void *handle, const char *data, size_t len) {
@@ -46,9 +51,16 @@ static bool receive_record(void *handle, uint8_t type, const char *data, uint16_
 
 int main(int argc, char *argv[]) {
 	bool initiator = false;
+	bool datagram = false;
+
+	if(argc > 1 && !strcmp(argv[1], "-d")) {
+		datagram = true;
+		argc--;
+		argv++;
+	}
 
-	if(argc < 3) {
-		fprintf(stderr, "Usage: %s my_ecdsa_key_file his_ecdsa_key_file [host] port\n", argv[0]);
+	if(argc < 4) {
+		fprintf(stderr, "Usage: %s [-d] my_ecdsa_key_file his_ecdsa_key_file [host] port\n", argv[0]);
 		return 1;
 	}
 
@@ -118,7 +130,7 @@ int main(int argc, char *argv[]) {
 	fprintf(stderr, "Keys loaded\n");
 
 	sptps_t s;
-	if(!sptps_start(&s, &sock, initiator, mykey, hiskey, "sptps_test", 10, send_data, receive_record))
+	if(!sptps_start(&s, &sock, initiator, datagram, mykey, hiskey, "sptps_test", 10, send_data, receive_record))
 		return 1;
 
 	while(true) {
@@ -142,9 +154,11 @@ int main(int argc, char *argv[]) {
 				break;
 			if(buf[0] == '^')
 				sptps_send_record(&s, SPTPS_HANDSHAKE, NULL, 0);
-			else if(buf[0] == '$')
+			else if(buf[0] == '$') {
 				sptps_force_kex(&s);
-			else
+				if(len > 1)
+					sptps_send_record(&s, 0, buf, len);
+			} else
 			if(!sptps_send_record(&s, buf[0] == '!' ? 1 : 0, buf, buf[0] == '\n' ? 0 : buf[0] == '*' ? sizeof buf : len))
 				return 1;
 		}