X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test.c;h=96ebb0c45799ff999d3a8af9b05d867b7eb2adf5;hb=275129c9d08b2d29529b2f9d039198168aeb52a7;hp=4a1bf16e3bff39ca60ac67472b3c4e0c8f9f0cd5;hpb=b52e9aa456dfeedfaa8c3be0e8347d1e1477b611;p=utcp diff --git a/test.c b/test.c index 4a1bf16..96ebb0c 100644 --- a/test.c +++ b/test.c @@ -47,10 +47,12 @@ void debug(const char *format, ...) { va_end(ap); } #else -#define debug(...) +#define debug(...) do {} while(0) #endif ssize_t do_recv(struct utcp_connection *c, const void *data, size_t len) { + (void)c; + if(!data || !len) { if(errno) { debug("Error: %s\n", strerror(errno)); @@ -59,23 +61,29 @@ ssize_t do_recv(struct utcp_connection *c, const void *data, size_t len) { dir &= ~DIR_WRITE; debug("Connection closed by peer\n"); } + return -1; } + if(reference) { char buf[len]; + if(fread(buf, len, 1, reference) != 1) { debug("Error reading reference\n"); abort(); } + if(memcmp(buf, data, len)) { debug("Received data differs from reference\n"); abort(); } } + return write(1, data, len); } void do_accept(struct utcp_connection *nc, uint16_t port) { + (void)port; utcp_accept(nc, do_recv, NULL); c = nc; utcp_set_accept_cb(c->utcp, NULL, NULL); @@ -84,17 +92,21 @@ void do_accept(struct utcp_connection *nc, uint16_t port) { ssize_t do_send(struct utcp *utcp, const void *data, size_t len) { int s = *(int *)utcp->priv; 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; @@ -113,8 +125,11 @@ ssize_t do_send(struct utcp *utcp, const void *data, size_t len) { total_out += len; ssize_t result = send(s, data, len, MSG_DONTWAIT); - if(result <= 0) + + if(result <= 0) { debug("Error sending UDP packet: %s\n", strerror(errno)); + } + return result; } @@ -122,60 +137,110 @@ int main(int argc, char *argv[]) { srand(time(NULL)); srand48(time(NULL)); - if(argc < 2 || argc > 3) + if(argc < 2 || argc > 3) { return 1; + } bool server = argc == 2; bool connected = false; + uint32_t flags = UTCP_TCP; + size_t read_size = 102400; + + if(getenv("DROPIN")) { + dropin = atof(getenv("DROPIN")); + } - 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(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(getenv("FLAGS")) { + flags = atoi(getenv("FLAGS")); + } + + if(getenv("READ_SIZE")) { + read_size = atoi(getenv("READ_SIZE")); + } char *reference_filename = getenv("REFERENCE"); - if(reference_filename) + + if(reference_filename) { reference = fopen(reference_filename, "r"); + } - if(dropto < dropfrom) + if(dropto < dropfrom) { dropto = 1 << 30; + } struct addrinfo *ai; + struct addrinfo hint = { .ai_flags = server ? AI_PASSIVE : 0, .ai_socktype = SOCK_DGRAM, }; getaddrinfo(server ? NULL : argv[1], server ? argv[1] : argv[2], &hint, &ai); - if(!ai) + + if(!ai) { + debug("Could not lookup address: %s\n", strerror(errno)); return 1; + } int s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); - if(s == -1) + + if(s == -1) { + debug("Could not create socket: %s\n", strerror(errno)); return 1; + } + + static const int one = 1; + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one); if(server) { - if(bind(s, ai->ai_addr, ai->ai_addrlen)) + if(bind(s, ai->ai_addr, ai->ai_addrlen)) { + debug("Could not bind: %s\n", strerror(errno)); return 1; + } } else { - if(connect(s, ai->ai_addr, ai->ai_addrlen)) + if(connect(s, ai->ai_addr, ai->ai_addrlen)) { + debug("Could not connect: %s\n", strerror(errno)); return 1; + } + connected = true; } freeaddrinfo(ai); struct utcp *u = utcp_init(server ? do_accept : NULL, NULL, do_send, &s); - if(!u) + + if(!u) { + debug("Could not initialize UTCP\n"); return 1; + } utcp_set_mtu(u, 1300); utcp_set_user_timeout(u, 10); - if(!server) - c = utcp_connect(u, 1, do_recv, NULL); + if(!server) { + c = utcp_connect_ex(u, 1, do_recv, NULL, flags); + } struct pollfd fds[2] = { {.fd = 0, .events = POLLIN | POLLERR | POLLHUP}, @@ -183,39 +248,56 @@ int main(int argc, char *argv[]) { }; char buf[102400]; + struct timeval timeout = utcp_timeout(u); while(!connected || utcp_is_active(u)) { size_t max = c ? utcp_get_sndbuf_free(c) : 0; - if(max > sizeof buf) - max = sizeof buf; + + if(max > sizeof(buf)) { + max = sizeof(buf); + } + + if(max > read_size) { + max = read_size; + } 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) + + if((dir & DIR_READ) && max) { poll(fds, 2, timeout_ms); - else + } else { poll(fds + 1, 1, timeout_ms); + } if(fds[0].revents) { fds[0].revents = 0; debug("stdin\n"); ssize_t len = read(0, buf, max); + if(len <= 0) { fds[0].fd = -1; dir &= ~DIR_READ; - if(c) + + if(c) { utcp_shutdown(c, SHUT_WR); - if(len == -1) + } + + if(len == -1) { break; - else + } else { continue; + } } + if(c) { ssize_t sent = utcp_send(c, buf, len); - if(sent != len) + + if(sent != len) { debug("Short send: %zd != %zd\n", sent, len); + } } } @@ -223,20 +305,27 @@ int main(int argc, char *argv[]) { fds[1].revents = 0; debug("netin\n"); struct sockaddr_storage ss; - socklen_t sl = sizeof ss; - int len = recvfrom(s, buf, sizeof buf, MSG_DONTWAIT, (struct sockaddr *)&ss, &sl); + socklen_t sl = sizeof(ss); + int len = recvfrom(s, buf, sizeof(buf), MSG_DONTWAIT, (struct sockaddr *)&ss, &sl); + if(len <= 0) { debug("Error receiving UDP packet: %s\n", strerror(errno)); break; } + if(!connected) - if(!connect(s, (struct sockaddr *)&ss, sl)) + if(!connect(s, (struct sockaddr *)&ss, sl)) { connected = true; + } + inpktno++; + if(inpktno >= dropto || inpktno < dropfrom || drand48() >= dropin) { total_in += len; - if(utcp_recv(u, buf, len) == -1) + + if(utcp_recv(u, buf, len) == -1) { debug("Error receiving UTCP packet: %s\n", strerror(errno)); + } } else { debug("Dropped incoming packet\n"); } @@ -246,7 +335,9 @@ int main(int argc, char *argv[]) { }; utcp_close(c); + utcp_exit(u); + free(reorder_data); debug("Total bytes in: %ld, out: %ld\n", total_in, total_out);