X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test.c;h=a37f85618db6c2b3eef6200711635fab0d3d1fc1;hb=88d085b7252643ceec0c9ac646b6d6f680157617;hp=956d1efd8d8fc5cee726b19b41ef55ba6a623888;hpb=c93ef1391476090d5afacb899632df5476f964ed;p=utcp

diff --git a/test.c b/test.c
index 956d1ef..a37f856 100644
--- a/test.c
+++ b/test.c
@@ -13,35 +13,49 @@
 
 #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;
+double dropin;
+double dropout;
 
-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)
+		if(errno) {
 			fprintf(stderr, "Error: %s\n", strerror(errno));
-		else {
-			dir &= ~2;
+			dir = 0;
+		} else {
+			dir &= ~DIR_WRITE;
 			fprintf(stderr, "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);
+	if(drand48() < dropout)
+		return len;
+
+	ssize_t result = send(s, data, len, MSG_DONTWAIT);
+	if(result <= 0)
+		fprintf(stderr, "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 +63,9 @@ int main(int argc, char *argv[]) {
 	bool server = argc == 2;
 	bool connected = false;
 
+	dropin = atof(getenv("DROPIN") ?: "0");
+	dropout = atof(getenv("DROPOUT") ?: "0");
+
 	struct addrinfo *ai;
 	struct addrinfo hint = {
 		.ai_flags = server ? AI_PASSIVE : 0,
@@ -60,7 +77,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 +89,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,42 +106,58 @@ 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;
-		}
+		size_t max = c ? utcp_get_sndbuf_free(c) : 0;
+		if(max > sizeof buf)
+			max = sizeof buf;
+
+		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);
 
 		if(fds[0].revents) {
-			int len = read(0, buf, sizeof buf);
+			fds[0].revents = 0;
+			fprintf(stderr, "0");
+			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)
+					fprintf(stderr, "PANIEK: %zd != %zd\n", sent, len);
+			}
 		}
 
 		if(fds[1].revents) {
+			fds[1].revents = 0;
+			fprintf(stderr, "1");
 			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) {
+				fprintf(stderr, "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);
+			if(drand48() >= dropin)
+				utcp_recv(u, buf, len);
 		}
+
+		timeout = utcp_timeout(u);
 	};
 
 	utcp_close(c);