Use conditional compilation for cryptographic functions.

[tinc] / src / sptps_test.c

diff --git a/src/sptps_test.c b/src/sptps_test.c
index d8b25d4..2ce9804 100644 (file)
--- 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
@@ -29,8 +29,9 @@ 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;
+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);