X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test.c;h=fcf0c794883e1f4e6fe06d6700c9a158e629f1f6;hb=8a88641dabba117eebcee8270e483fb30e24fe76;hp=38240db8fb2c04eec2012ca46e9584ce67b3f8cf;hpb=4368d8c9956242f0bdc00d43ebf32a72332522c1;p=utcp

diff --git a/test.c b/test.c
index 38240db..fcf0c79 100644
--- a/test.c
+++ b/test.c
@@ -19,7 +19,7 @@ bool running = true;
 double dropin;
 double dropout;
 
-int do_recv(struct utcp_connection *c, const 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));
@@ -28,7 +28,7 @@ int do_recv(struct utcp_connection *c, const void *data, size_t len) {
 			dir &= ~2;
 			fprintf(stderr, "Connection closed by peer\n");
 		}
-		return 0;
+		return -1;
 	}
 	return write(1, data, len);
 }
@@ -38,12 +38,15 @@ void do_accept(struct utcp_connection *nc, uint16_t port) {
 	c = nc;
 }
 
-int do_send(struct utcp *utcp, const void *data, size_t len) {
+ssize_t do_send(struct utcp *utcp, const void *data, size_t len) {
 	int s = *(int *)utcp->priv;
-	if(drand48() >= dropout)
-		return send(s, data, len, MSG_DONTWAIT);
-	else
-		return 0;
+	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[]) {
@@ -82,10 +85,13 @@ 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)
@@ -96,14 +102,23 @@ int main(int argc, char *argv[]) {
 		{.fd = s, .events = POLLIN | POLLERR | POLLHUP},
 	};
 
-	char buf[1024];
-	int timeout = utcp_timeout(u);
+	char buf[102400];
+	struct timeval timeout = utcp_timeout(u);
 
 	while(dir) {
-		poll(fds, 2, timeout);
+		size_t max = utcp_get_sndbuf_free(c);
+		if(max > sizeof buf)
+			max = sizeof buf;
+
+		if((dir & 1) && 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;
@@ -114,16 +129,23 @@ int main(int argc, char *argv[]) {
 				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;