Fix free_connection() moving the wrong memory.

[utcp] / selftest.c

diff --git a/selftest.c b/selftest.c
index dae05bf37b9d6809451cd5b761e0cd67fa84eca2..f6e4c8c4ce5abfa488964fca5776282fe46d58c3 100644 (file)
--- a/selftest.c
+++ b/selftest.c
@@ -10,7 +10,7 @@ struct utcp *a;
 struct utcp *b;
 struct utcp_connection *c;
 
-int do_recv(struct utcp_connection *x, void *data, size_t len) {
+ssize_t do_recv(struct utcp_connection *x, const void *data, size_t len) {
        if(!len) {
                if(errno)
                        fprintf(stderr, "%p Error: %s\n", x->utcp, strerror(errno));
@@ -24,11 +24,9 @@ int do_recv(struct utcp_connection *x, void *data, size_t len) {
        }
 
        if(x == c)
-               write(0, data, len);
+               return write(0, data, len);
        else
-               utcp_send(x, data, len);
-
-       return 0;
+               return utcp_send(x, data, len);
 }
 
 bool do_pre_accept(struct utcp *utcp, uint16_t port) {
@@ -43,7 +41,7 @@ void do_accept(struct utcp_connection *c, uint16_t port) {
        utcp_accept(c, do_recv, 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) {
        static int count = 0;
        if(++count > 1000) {
                fprintf(stderr, "Too many packets!\n");
@@ -56,7 +54,6 @@ int do_send(struct utcp *utcp, void *data, size_t len) {
                return utcp_recv(a, data, len);
 }
 
-
 int main(int argc, char *argv[]) {
        srand(time(NULL));
 
@@ -82,10 +79,41 @@ int main(int argc, char *argv[]) {
        fprintf(stderr, "\nTesting connection with data transfer\n\n");
 
        c = utcp_connect(b, 7, do_recv, NULL);
-       utcp_send(c, "Hello world!\n", 13);
-       utcp_send(c, "This is a test.\n", 16);
+       ssize_t len = utcp_send(c, "Hello world!\n", 13);
+
+       if(len != 13) {
+               if(len < 0)
+                       fprintf(stderr, "Error: %s\n", strerror(errno));
+               else
+                       fprintf(stderr, "Short write %zd!\n", len);
+       }
+       len = utcp_send(c, "This is a test.\n", 16);
+
+       if(len != 16) {
+               if(len < 0)
+                       fprintf(stderr, "Error: %s\n", strerror(errno));
+               else
+                       fprintf(stderr, "Short write %zd!\n", len);
+       }
+
+       fprintf(stderr, "closing...\n");
+       utcp_close(c);
+
+       fprintf(stderr, "\nTesting connection with huge data transfer\n\n");
+
+       c = utcp_connect(b, 7, do_recv, NULL);
+       utcp_set_sndbuf(c, 10240);
+       char buf[20480] = "buf";
+
+       len = utcp_send(c, buf, sizeof buf);
+       if(len != 10240)
+               fprintf(stderr, "Error: utcp_send() returned %zd, expected 10240\n", len);
+
        fprintf(stderr, "closing...\n");
        utcp_close(c);
 
+       utcp_exit(a);
+       utcp_exit(b);
+
        return 0;
 }