Add a function to check for active connections.

[utcp] / test.c

diff --git a/test.c b/test.c
index 757364f0f7e63432bf387ce6ce7a2637e45a9370..0eb8462b4b60f26a17c87860384d238500748db8 100644 (file)
--- a/test.c
+++ b/test.c
@@ -13,8 +13,11 @@
 
 #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;
@@ -25,7 +28,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,14 +39,18 @@ 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)
-               return send(s, data, len, MSG_DONTWAIT);
-       else
+       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[]) {
@@ -70,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) {
@@ -100,33 +107,49 @@ int main(int argc, char *argv[]) {
        };
 
        char buf[102400];
-       int timeout = utcp_timeout(u);
+       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;
 
-       while(dir) {
-               poll(fds, 2, timeout);
+               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 = 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;