X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsptps_test.c;h=a456bb86db252c8b9fd7240e7da18f637a9823ba;hb=76c7550c8ab0e9c0ee14a9c396baa008cfb9bc42;hp=618bfb583ab569eca3ec89e2f3adf58680536801;hpb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;p=meshlink diff --git a/src/sptps_test.c b/src/sptps_test.c index 618bfb58..a456bb86 100644 --- a/src/sptps_test.c +++ b/src/sptps_test.c @@ -19,6 +19,12 @@ #include "system.h" +#ifdef HAVE_LINUX +#include +#include +#include +#endif + #include #include "crypto.h" @@ -27,17 +33,25 @@ #include "utils.h" // 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; } +bool send_request(void *c, const char *msg, ...) { + return false; +} +void *mesh; +void *global_log_cb; +int global_log_level; +bool send_meta(void *c, const char *msg, int len) { + return false; +} char *logfilename = NULL; struct timeval now; static bool verbose; static bool readonly; static bool writeonly; +static int in = 0; +static int out = 1; -static bool send_data(void *handle, uint8_t type, const char *data, size_t len) { +static bool send_data(void *handle, uint8_t type, const void *data, size_t len) { char hex[len * 2 + 1]; bin2hex(data, hex, len); if(verbose) @@ -48,11 +62,11 @@ static bool send_data(void *handle, uint8_t type, const char *data, size_t len) return true; } -static bool receive_record(void *handle, uint8_t type, const char *data, uint16_t len) { +static bool receive_record(void *handle, uint8_t type, const void *data, uint16_t len) { if(verbose) fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len); if(!writeonly) - fwrite(data, len, 1, stdout); + write(out, data, len); return true; } @@ -73,14 +87,17 @@ 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" - " -q, --quit Quit when EOF occurs on stdin.\n" - " -r, --readonly Only send data from the socket to stdout.\n" - " -w, --writeonly Only send data from stdin to the socket.\n" - " -L, --packet-loss RATE Fake packet loss of RATE percent.\n" - " -R, --replay-window N Set replay window to N bytes.\n" - " -v, --verbose Display debug messages.\n" - "\n"); + " -d, --datagram Enable datagram mode.\n" + " -q, --quit Quit when EOF occurs on stdin.\n" + " -r, --readonly Only send data from the socket to stdout.\n" +#ifdef HAVE_LINUX + " -t, --tun Use a tun device instead of stdio.\n" +#endif + " -w, --writeonly Only send data from stdin to the socket.\n" + " -L, --packet-loss RATE Fake packet loss of RATE percent.\n" + " -R, --replay-window N Set replay window to N bytes.\n" + " -v, --verbose Display debug messages.\n" + "\n"); fprintf(stderr, "Report bugs to bugs@meshlink.io.\n"); } @@ -88,55 +105,68 @@ int main(int argc, char *argv[]) { program_name = argv[0]; bool initiator = false; bool datagram = false; +#ifdef HAVE_LINUX + bool tun = false; +#endif int packetloss = 0; int r; int option_index = 0; ecdsa_t *mykey = NULL, *hiskey = NULL; bool quit = false; - while((r = getopt_long(argc, argv, "dqrwL:W:v", long_options, &option_index)) != EOF) { - switch (r) { - case 0: /* long option */ - break; + while((r = getopt_long(argc, argv, "dqrtwL:W:v", long_options, &option_index)) != EOF) { + switch(r) { + case 0: /* long option */ + break; - case 'd': /* datagram mode */ - datagram = true; - break; + case 'd': /* datagram mode */ + datagram = true; + break; - case 'q': /* close connection on EOF from stdin */ - quit = true; - break; + case 'q': /* close connection on EOF from stdin */ + quit = true; + break; - case 'r': /* read only */ - readonly = true; - break; + case 'r': /* read only */ + readonly = true; + break; - case 'w': /* write only */ - writeonly = true; - break; + case 't': /* read only */ +#ifdef HAVE_LINUX + tun = true; +#else + fprintf(stderr, "--tun is only supported on Linux.\n"); + usage(); + return 1; +#endif + break; - case 'L': /* packet loss rate */ - packetloss = atoi(optarg); - break; + case 'w': /* write only */ + writeonly = true; + break; - case 'W': /* replay window size */ - sptps_replaywin = atoi(optarg); - break; + case 'L': /* packet loss rate */ + packetloss = atoi(optarg); + break; - case 'v': /* be verbose */ - verbose = true; - break; + case 'W': /* replay window size */ + sptps_replaywin = atoi(optarg); + break; - case '?': /* wrong options */ - usage(); - return 1; + case 'v': /* be verbose */ + verbose = true; + break; - case 1: /* help */ - usage(); - return 0; + case '?': /* wrong options */ + usage(); + return 1; - default: - break; + case 1: /* help */ + usage(); + return 0; + + default: + break; } } @@ -154,6 +184,25 @@ int main(int argc, char *argv[]) { srand(time(NULL)); +#ifdef HAVE_LINUX + if(tun) { + in = out = open("/dev/net/tun", O_RDWR | O_NONBLOCK); + if(in < 0) { + fprintf(stderr, "Could not open tun device: %s\n", strerror(errno)); + return 1; + } + struct ifreq ifr = { + .ifr_flags = IFF_TUN + }; + if(ioctl(in, TUNSETIFF, &ifr)) { + fprintf(stderr, "Could not configure tun interface: %s\n", strerror(errno)); + return 1; + } + ifr.ifr_name[IFNAMSIZ - 1] = 0; + fprintf(stderr, "Using tun interface %s\n", ifr.ifr_name); + } +#endif + #ifdef HAVE_MINGW static struct WSAData wsa_state; if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) @@ -161,7 +210,7 @@ int main(int argc, char *argv[]) { #endif struct addrinfo *ai, hint; - memset(&hint, 0, sizeof hint); + memset(&hint, 0, sizeof(hint)); hint.ai_family = AF_UNSPEC; hint.ai_socktype = datagram ? SOCK_DGRAM : SOCK_STREAM; @@ -180,7 +229,7 @@ int main(int argc, char *argv[]) { } int one = 1; - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof one); + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(one)); if(initiator) { if(connect(sock, ai->ai_addr, ai->ai_addrlen)) { @@ -211,9 +260,9 @@ int main(int argc, char *argv[]) { char buf[65536]; struct sockaddr addr; - socklen_t addrlen = sizeof addr; + socklen_t addrlen = sizeof(addr); - if(recvfrom(sock, buf, sizeof buf, MSG_PEEK, &addr, &addrlen) <= 0) { + if(recvfrom(sock, buf, sizeof(buf), MSG_PEEK, &addr, &addrlen) <= 0) { fprintf(stderr, "Could not read from socket: %s\n", strerror(errno)); return 1; } @@ -256,14 +305,14 @@ int main(int argc, char *argv[]) { FD_ZERO(&fds); #ifndef HAVE_MINGW if(!readonly && s.instate) - FD_SET(0, &fds); + FD_SET(in, &fds); #endif FD_SET(sock, &fds); if(select(sock + 1, &fds, NULL, NULL, NULL) <= 0) return 1; - if(FD_ISSET(0, &fds)) { - ssize_t len = read(0, buf, sizeof buf); + if(FD_ISSET(in, &fds)) { + ssize_t len = read(in, buf, sizeof(buf)); if(len < 0) { fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno)); return 1; @@ -282,13 +331,12 @@ int main(int argc, char *argv[]) { sptps_force_kex(&s); if(len > 1) sptps_send_record(&s, 0, buf, len); - } else - if(!sptps_send_record(&s, buf[0] == '!' ? 1 : 0, buf, (len == 1 && buf[0] == '\n') ? 0 : buf[0] == '*' ? sizeof buf : len)) + } else if(!sptps_send_record(&s, buf[0] == '!' ? 1 : 0, buf, (len == 1 && buf[0] == '\n') ? 0 : buf[0] == '*' ? sizeof(buf) : len)) return 1; } if(FD_ISSET(sock, &fds)) { - ssize_t len = recv(sock, buf, sizeof buf, 0); + ssize_t len = recv(sock, buf, sizeof(buf), 0); if(len < 0) { fprintf(stderr, "Could not read from socket: %s\n", strerror(errno)); return 1;