X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test.c;h=81244f90027819f5a456027c390f5a48ecd5a1ac;hb=16ecd6d75bfabb97193581bcc8095652759cdb8e;hp=956d1efd8d8fc5cee726b19b41ef55ba6a623888;hpb=c93ef1391476090d5afacb899632df5476f964ed;p=utcp diff --git a/test.c b/test.c index 956d1ef..81244f9 100644 --- a/test.c +++ b/test.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -13,35 +14,101 @@ #include "utcp.h" +#define DIR_READ 1 +#define DIR_WRITE 2 + struct utcp_connection *c; -int dir = 3; +int dir = DIR_READ | DIR_WRITE; bool running = true; +long inpktno; +long outpktno; +long dropfrom; +long dropto; +double reorder; +long reorder_dist = 10; +double dropin; +double dropout; +long total_out; +long total_in; + +char *reorder_data; +size_t reorder_len; +int reorder_countdown; + +#if UTCP_DEBUG +void debug(const char *format, ...) { + struct timeval now; + gettimeofday(&now, NULL); + fprintf(stderr, "%lu.%lu ", now.tv_sec, now.tv_usec / 1000); + va_list ap; + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); +} +#else +#define debug(...) +#endif -int do_recv(struct utcp_connection *c, void *data, size_t len) { +ssize_t do_recv(struct utcp_connection *c, const void *data, size_t len) { if(!data || !len) { - if(errno) - fprintf(stderr, "Error: %s\n", strerror(errno)); - else { - dir &= ~2; - fprintf(stderr, "Connection closed by peer\n"); + if(errno) { + debug("Error: %s\n", strerror(errno)); + dir = 0; + } else { + dir &= ~DIR_WRITE; + debug("Connection closed by peer\n"); } - return 0; + return -1; } - return write(0, data, len); + return write(1, data, len); } void do_accept(struct utcp_connection *nc, uint16_t port) { utcp_accept(nc, do_recv, NULL); c = nc; + utcp_set_accept_cb(c->utcp, NULL, NULL); } -int do_send(struct utcp *utcp, void *data, size_t len) { +ssize_t do_send(struct utcp *utcp, const void *data, size_t len) { int s = *(int *)utcp->priv; - return send(s, data, len, MSG_DONTWAIT); + outpktno++; + if(outpktno >= dropfrom && outpktno < dropto) { + if(drand48() < dropout) { + debug("Dropped outgoing packet\n"); + return len; + } + if(!reorder_data && drand48() < reorder) { + reorder_data = malloc(len); + if(!reorder_data) { + debug("Out of memory\n"); + return len; + } + reorder_len = len; + memcpy(reorder_data, data, len); + reorder_countdown = 1 + drand48() * reorder_dist; + return len; + } + } + + if(reorder_data) { + if(--reorder_countdown < 0) { + total_out += reorder_len; + send(s, reorder_data, reorder_len, MSG_DONTWAIT); + free(reorder_data); + reorder_data = NULL; + } + } + + total_out += len; + ssize_t result = send(s, data, len, MSG_DONTWAIT); + if(result <= 0) + debug("Error sending UDP packet: %s\n", strerror(errno)); + return result; } int main(int argc, char *argv[]) { srand(time(NULL)); + srand48(time(NULL)); if(argc < 2 || argc > 3) return 1; @@ -49,6 +116,16 @@ int main(int argc, char *argv[]) { bool server = argc == 2; bool connected = false; + if(getenv("DROPIN")) dropin = atof(getenv("DROPIN")); + if(getenv("DROPOUT")) dropout = atof(getenv("DROPOUT")); + if(getenv("DROPFROM")) dropfrom = atoi(getenv("DROPFROM")); + if(getenv("DROPTO")) dropto = atoi(getenv("DROPTO")); + if(getenv("REORDER")) reorder = atof(getenv("REORDER")); + if(getenv("REORDER_DIST")) reorder_dist = atoi(getenv("REORDER_DIST")); + + if(dropto < dropfrom) + dropto = 1 << 30; + struct addrinfo *ai; struct addrinfo hint = { .ai_flags = server ? AI_PASSIVE : 0, @@ -60,7 +137,7 @@ int main(int argc, char *argv[]) { return 1; int s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); - if(s < 0) + if(s == -1) return 1; if(server) { @@ -72,10 +149,15 @@ int main(int argc, char *argv[]) { connected = true; } + freeaddrinfo(ai); + struct utcp *u = utcp_init(server ? do_accept : NULL, NULL, do_send, &s); if(!u) return 1; + utcp_set_mtu(u, 1300); + utcp_set_user_timeout(u, 10); + if(!server) c = utcp_connect(u, 1, do_recv, NULL); @@ -84,46 +166,74 @@ int main(int argc, char *argv[]) { {.fd = s, .events = POLLIN | POLLERR | POLLHUP}, }; - char buf[1024]; + char buf[102400]; + struct timeval timeout = utcp_timeout(u); - while(dir) { - int r = poll(fds, 2, 1000); - if(!r) { - utcp_timeout(u); - continue; - } + while(!connected || utcp_is_active(u)) { + size_t max = c ? utcp_get_sndbuf_free(c) : 0; + if(max > sizeof buf) + max = sizeof buf; + + int timeout_ms = timeout.tv_sec * 1000 + timeout.tv_usec / 1000 + 1; + + debug("polling, dir = %d, timeout = %d\n", dir, timeout_ms); + if((dir & DIR_READ) && max) + poll(fds, 2, timeout_ms); + else + poll(fds + 1, 1, timeout_ms); if(fds[0].revents) { - int len = read(0, buf, sizeof buf); + fds[0].revents = 0; + debug("stdin\n"); + ssize_t len = read(0, buf, max); if(len <= 0) { fds[0].fd = -1; - dir &= ~1; + dir &= ~DIR_READ; if(c) utcp_shutdown(c, SHUT_WR); - if(len < 0) + if(len == -1) break; else continue; } - if(c) - utcp_send(c, buf, len); + if(c) { + ssize_t sent = utcp_send(c, buf, len); + if(sent != len) + debug("Short send: %zd != %zd\n", sent, len); + } } if(fds[1].revents) { + fds[1].revents = 0; + debug("netin\n"); struct sockaddr_storage ss; - socklen_t sl; + socklen_t sl = sizeof ss; int len = recvfrom(s, buf, sizeof buf, MSG_DONTWAIT, (struct sockaddr *)&ss, &sl); - if(len <= 0) + if(len <= 0) { + debug("Error receiving UDP packet: %s\n", strerror(errno)); break; + } if(!connected) if(!connect(s, (struct sockaddr *)&ss, sl)) connected = true; - utcp_recv(u, buf, len); + inpktno++; + if(inpktno >= dropto || inpktno < dropfrom || drand48() >= dropin) { + total_in += len; + if(utcp_recv(u, buf, len) == -1) + debug("Error receiving UTCP packet: %s\n", strerror(errno)); + } else { + debug("Dropped incoming packet\n"); + } } + + timeout = utcp_timeout(u); }; utcp_close(c); utcp_exit(u); + free(reorder_data); + + debug("Total bytes in: %ld, out: %ld\n", total_in, total_out); return 0; }