X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test.c;h=922099a9009dc83c386417a84fa2c2b8ac848628;hb=2ae2f9bbb7502589f279c329815d55ec526baffd;hp=cda5f176d80e74407b8d3598e4336a8292d25aa3;hpb=2c9dfa2823b30638bc2f7166c15008b722ddebbe;p=utcp

diff --git a/test.c b/test.c
index cda5f17..922099a 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,12 @@ 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;
+		return len;
 }
 
 int main(int argc, char *argv[]) {
@@ -82,11 +82,14 @@ 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_connection_timeout(u, 10);
+	utcp_set_mtu(u, 1300);
+	utcp_set_user_timeout(u, 10);
 
 	if(!server)
 		c = utcp_connect(u, 1, do_recv, NULL);
@@ -96,11 +99,11 @@ 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);
+		poll(fds, 2, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
 
 		if(fds[0].revents) {
 			int len = read(0, buf, sizeof buf);
@@ -120,7 +123,7 @@ int main(int argc, char *argv[]) {
 
 		if(fds[1].revents) {
 			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)
 				break;