X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsptps_test.c;h=2ce980441b43b3e281803e2590e718968ea890f0;hb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;hp=06d8deab97432c09459eece0e46016d58e69fdaf;hpb=483c5dcfb43719e5fd50902641252e28a04fd74e;p=meshlink diff --git a/src/sptps_test.c b/src/sptps_test.c index 06d8deab..2ce98044 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,20 +18,25 @@ */ #include "system.h" -#include "poll.h" #include "crypto.h" #include "ecdsa.h" #include "sptps.h" #include "utils.h" -char *logfilename; -ecdsa_t mykey, hiskey; +// 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; +struct timeval now; -static bool send_data(void *handle, const char *data, size_t len) { +ecdsa_t *mykey, *hiskey; + +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,29 +51,42 @@ 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); 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; @@ -88,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"); @@ -106,33 +143,34 @@ 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); 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 +180,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 +201,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; }