Replace the connection_tree with a connection_list.

[tinc] / src / sptps_test.c

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 06d8dea..d8b25d4 100644 (file)
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -18,20 +18,24 @@
 */
 
 #include "system.h"
-#include "poll.h"
 
 #include "crypto.h"
 #include "ecdsa.h"
 #include "sptps.h"
 #include "utils.h"
 
-char *logfilename;
+// Symbols necessary to link with logger.o
+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;
+
 ecdsa_t mykey, hiskey;
 
-static bool send_data(void *handle, const char *data, size_t len) {
+static bool send_data(void *handle, uint8_t type, const char *data, size_t len) {
        char hex[len * 2 + 1];
        bin2hex(data, hex, len);
-       fprintf(stderr, "Sending %zu bytes of data:\n%s\n", len, hex);
+       fprintf(stderr, "Sending %d bytes of data:\n%s\n", (int)len, hex);
        const int *sock = handle;
        if(send(*sock, data, len, 0) != len)
                return false;
@@ -46,15 +50,28 @@ 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;
        }
 
        if(argc > 4)
                initiator = true;
 
+#ifdef HAVE_MINGW
+       static struct WSAData wsa_state;
+       if(WSAStartup(MAKEWORD(2, 2), &wsa_state))
+               return 1;
+#endif
+
        struct addrinfo *ai, hint;
        memset(&hint, 0, sizeof hint);
 
@@ -118,21 +135,22 @@ 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) {
                char buf[65535] = "";
 
-               struct pollfd fds[2];
-               fds[0].fd = 0;
-               fds[0].events = POLLIN;
-               fds[1].fd = sock;
-               fds[1].events = POLLIN;
-               if(poll(fds, 2, -1) < 0)
+               fd_set fds;
+               FD_ZERO(&fds);
+#ifndef HAVE_MINGW
+               FD_SET(0, &fds);
+#endif
+               FD_SET(sock, &fds);
+               if(select(sock + 1, &fds, NULL, NULL, NULL) <= 0)
                        return 1;
 
-               if(fds[0].revents) {
+               if(FD_ISSET(0, &fds)) {
                        ssize_t len = read(0, buf, sizeof buf);
                        if(len < 0) {
                                fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno));
@@ -142,14 +160,16 @@ 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;
                }
 
-               if(fds[1].revents) {
+               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));
@@ -161,7 +181,7 @@ int main(int argc, char *argv[]) {
                        }
                        char hex[len * 2 + 1];
                        bin2hex(buf, hex, len);
-                       fprintf(stderr, "Received %zd bytes of data:\n%s\n", len, hex);
+                       fprintf(stderr, "Received %d bytes of data:\n%s\n", (int)len, hex);
                        if(!sptps_receive_data(&s, buf, len))
                                return 1;
                }