X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps_test.c;h=98da73ef6a75d15546d49b4e54aeab7e5824379f;hb=d01ab07f78f84d7d30c5788416c8d4ca0e1f74bf;hp=79a1a85d13317f2fb2e310d372252881a3990216;hpb=268c8545aaf83b7433f43402f5c77e39e20006ef;p=tinc diff --git a/src/sptps_test.c b/src/sptps_test.c index 79a1a85d..98da73ef 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 Guus Sliepen , + Copyright (C) 2011-2013 Guus Sliepen , 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 @@ -18,7 +18,8 @@ */ #include "system.h" -#include "poll.h" + +#include #include "crypto.h" #include "ecdsa.h" @@ -26,17 +27,18 @@ #include "utils.h" // Symbols necessary to link with logger.o -char *logfilename; -char *connection_tree; -char *send_request; -char *send_meta; +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, 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; @@ -49,38 +51,98 @@ static bool receive_record(void *handle, uint8_t type, const char *data, uint16_ return true; } +static struct option const long_options[] = { + {"datagram", no_argument, NULL, 'd'}, + {"packet-loss", required_argument, NULL, 'l'}, + {"replay-window", required_argument, NULL, 'r'}, + {"help", no_argument, NULL, 1}, + {NULL, 0, NULL, 0} +}; + +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, "Valid options are:\n" + " -d, --datagram Enable datagram mode.\n" + " -l, --packet-loss RATE Fake packet loss of RATE percent.\n" + " -r, --replay-window N Set replay window to N bytes.\n" + "\n"); + fprintf(stderr, "Report bugs to tinc@tinc-vpn.org.\n"); +} + int main(int argc, char *argv[]) { + program_name = argv[0]; bool initiator = false; bool datagram = false; + int packetloss = 0; + int r; + int option_index = 0; + + while((r = getopt_long(argc, argv, "dl:r:", long_options, &option_index)) != EOF) { + switch (r) { + case 0: /* long option */ + break; + + case 'd': /* datagram mode */ + datagram = true; + break; + + case 'l': /* packet loss rate */ + packetloss = atoi(optarg); + break; + + case 'r': /* replay window size */ + sptps_replaywin = atoi(optarg); + break; + + case '?': /* wrong options */ + usage(); + return 1; - if(argc > 1 && !strcmp(argv[1], "-d")) { - datagram = true; - argc--; - argv++; + case 1: /* help */ + usage(); + return 0; + + default: + break; + } } - if(argc < 4) { - fprintf(stderr, "Usage: %s [-d] my_ecdsa_key_file his_ecdsa_key_file [host] port\n", argv[0]); + argc -= optind - 1; + argv += optind - 1; + + if(argc < 4 || argc > 5) { + fprintf(stderr, "Wrong number of arguments.\n"); + usage(); return 1; } if(argc > 4) initiator = true; + srand(time(NULL)); + +#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); 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; @@ -100,16 +162,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"); @@ -118,12 +199,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); @@ -136,15 +217,16 @@ int main(int argc, char *argv[]) { 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)); @@ -152,6 +234,8 @@ int main(int argc, char *argv[]) { } if(len == 0) break; + if(buf[0] == '#') + s.outseqno = atoi(buf + 1); if(buf[0] == '^') sptps_send_record(&s, SPTPS_HANDSHAKE, NULL, 0); else if(buf[0] == '$') { @@ -163,7 +247,7 @@ int main(int argc, char *argv[]) { 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)); @@ -175,8 +259,12 @@ 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); - if(!sptps_receive_data(&s, buf, len)) + fprintf(stderr, "Received %d bytes of data:\n%s\n", (int)len, hex); + if((rand() % 100) < packetloss) { + fprintf(stderr, "Dropped.\n"); + continue; + } + if(!sptps_receive_data(&s, buf, len) && !datagram) return 1; } }