X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test.c;h=fec0abcdcfff6b001c1d7825d29ab4fa6289f26f;hb=613385ca4a15406aa05149a82830063db8d37a53;hp=b5d64a3eb3ba698c8c763010131fbd386df5fbd0;hpb=a521d405a461b3384cd70daf95a2219d72db3eb1;p=utcp

diff --git a/test.c b/test.c
index b5d64a3..fec0abc 100644
--- a/test.c
+++ b/test.c
@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
@@ -13,9 +14,16 @@
 
 #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 dropin;
 double dropout;
 
@@ -25,7 +33,7 @@ ssize_t do_recv(struct utcp_connection *c, const void *data, size_t len) {
 			fprintf(stderr, "Error: %s\n", strerror(errno));
 			dir = 0;
 		} else {
-			dir &= ~2;
+			dir &= ~DIR_WRITE;
 			fprintf(stderr, "Connection closed by peer\n");
 		}
 		return -1;
@@ -36,11 +44,13 @@ ssize_t do_recv(struct utcp_connection *c, const void *data, size_t 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);
 }
 
 ssize_t do_send(struct utcp *utcp, const void *data, size_t len) {
 	int s = *(int *)utcp->priv;
-	if(drand48() < dropout)
+	outpktno++;
+	if(outpktno < dropto && outpktno >= dropfrom && drand48() < dropout)
 		return len;
 
 	ssize_t result = send(s, data, len, MSG_DONTWAIT);
@@ -61,6 +71,8 @@ int main(int argc, char *argv[]) {
 
 	dropin = atof(getenv("DROPIN") ?: "0");
 	dropout = atof(getenv("DROPOUT") ?: "0");
+	dropfrom = atoi(getenv("DROPFROM") ?: "0");
+	dropto = atoi(getenv("DROPTO") ?: "0");
 
 	struct addrinfo *ai;
 	struct addrinfo hint = {
@@ -73,7 +85,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) {
@@ -105,12 +117,12 @@ int main(int argc, char *argv[]) {
 	char buf[102400];
 	struct timeval timeout = utcp_timeout(u);
 
-	while(dir) {
+	while(!connected || utcp_is_active(u)) {
 		size_t max = c ? utcp_get_sndbuf_free(c) : 0;
 		if(max > sizeof buf)
 			max = sizeof buf;
 
-		if((dir & 1) && max)
+		if((dir & DIR_READ) && max)
 			poll(fds, 2, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
 		else
 			poll(fds + 1, 1, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
@@ -121,10 +133,10 @@ int main(int argc, char *argv[]) {
 			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;
@@ -149,7 +161,8 @@ int main(int argc, char *argv[]) {
 			if(!connected)
 				if(!connect(s, (struct sockaddr *)&ss, sl))
 					connected = true;
-			if(drand48() >= dropin)
+			inpktno++;
+			if(inpktno >= dropto || inpktno < dropfrom || drand48() >= dropin)
 				utcp_recv(u, buf, len);
 		}