Include "system.h" in the UTCP sources.

[meshlink] / src / utcp.c

diff --git a/src/utcp.c b/src/utcp.c
index 47acf221318bca518eca4d88bdd7ba04b0982071..1c0890c6743b4a71b4da052bdb7ee800958b71ad 100644 (file)
--- a/src/utcp.c
+++ b/src/utcp.c
@@ -17,16 +17,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#define _GNU_SOURCE
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
+#include "system.h"
 #include <time.h>
 
 #include "utcp_priv.h"
@@ -268,7 +259,7 @@ static ssize_t buffer_put_at(struct buffer *buf, size_t offset, const void *data
 
        uint32_t realoffset = buf->offset + offset;
 
-       if(buf->size - buf->offset < offset) {
+       if(buf->size - buf->offset <= offset) {
                // The offset wrapped
                realoffset -= buf->size;
        }
@@ -305,7 +296,7 @@ static ssize_t buffer_copy(struct buffer *buf, void *data, size_t offset, size_t
 
        uint32_t realoffset = buf->offset + offset;
 
-       if(buf->size - buf->offset < offset) {
+       if(buf->size - buf->offset <= offset) {
                // The offset wrapped
                realoffset -= buf->size;
        }
@@ -322,7 +313,11 @@ static ssize_t buffer_copy(struct buffer *buf, void *data, size_t offset, size_t
 }
 
 // Copy data from the buffer without removing it.
-static ssize_t buffer_call(struct buffer *buf, utcp_recv_t cb, void *arg, size_t offset, size_t len) {
+static ssize_t buffer_call(struct utcp_connection *c, struct buffer *buf, size_t offset, size_t len) {
+       if(!c->recv) {
+               return len;
+       }
+
        // Ensure we don't copy more than is actually stored in the buffer
        if(offset >= buf->used) {
                return 0;
@@ -334,20 +329,25 @@ static ssize_t buffer_call(struct buffer *buf, utcp_recv_t cb, void *arg, size_t
 
        uint32_t realoffset = buf->offset + offset;
 
-       if(buf->size - buf->offset < offset) {
+       if(buf->size - buf->offset <= offset) {
                // The offset wrapped
                realoffset -= buf->size;
        }
 
        if(buf->size - realoffset < len) {
                // The data is wrapped
-               ssize_t rx1 = cb(arg, buf->data + realoffset, buf->size - realoffset);
+               ssize_t rx1 = c->recv(c, buf->data + realoffset, buf->size - realoffset);
 
                if(rx1 < buf->size - realoffset) {
                        return rx1;
                }
 
-               ssize_t rx2 = cb(arg, buf->data, len - (buf->size - realoffset));
+               // The channel might have been closed by the previous callback
+               if(!c->recv) {
+                       return len;
+               }
+
+               ssize_t rx2 = c->recv(c, buf->data, len - (buf->size - realoffset));
 
                if(rx2 < 0) {
                        return rx2;
@@ -355,7 +355,7 @@ static ssize_t buffer_call(struct buffer *buf, utcp_recv_t cb, void *arg, size_t
                        return rx1 + rx2;
                }
        } else {
-               return cb(arg, buf->data + realoffset, len);
+               return c->recv(c, buf->data + realoffset, len);
        }
 }
 
@@ -365,7 +365,7 @@ static ssize_t buffer_discard(struct buffer *buf, size_t len) {
                len = buf->used;
        }
 
-       if(buf->size - buf->offset < len) {
+       if(buf->size - buf->offset <= len) {
                buf->offset -= buf->size;
        }
 
@@ -414,7 +414,6 @@ static int compare(const void *va, const void *vb) {
        const struct utcp_connection *b = *(struct utcp_connection **)vb;
 
        assert(a && b);
-       assert(a->src && b->src);
 
        int c = (int)a->src - (int)b->src;
 
@@ -1110,13 +1109,11 @@ static void handle_in_order(struct utcp_connection *c, const void *data, size_t
                        len = c->sacks[0].offset + c->sacks[0].len;
                        size_t remainder = len - offset;
 
-                       if(c->recv) {
-                               ssize_t rxd = buffer_call(&c->rcvbuf, c->recv, c, offset, remainder);
+                       ssize_t rxd = buffer_call(c, &c->rcvbuf, offset, remainder);
 
-                               if(rxd != (ssize_t)remainder) {
-                                       // TODO: handle the application not accepting all data.
-                                       abort();
-                               }
+                       if(rxd != (ssize_t)remainder) {
+                               // TODO: handle the application not accepting all data.
+                               abort();
                        }
                }
        }
@@ -1161,8 +1158,8 @@ static void handle_unreliable(struct utcp_connection *c, const struct hdr *hdr,
        }
 
        // Send the packet if it's the final fragment
-       if(!(hdr->ctl & MF) && c->recv) {
-               buffer_call(&c->rcvbuf, c->recv, c, 0, hdr->wnd + len);
+       if(!(hdr->ctl & MF)) {
+               buffer_call(c, &c->rcvbuf, 0, hdr->wnd + len);
        }
 
        c->rcv.nxt = hdr->seq + len;
@@ -2045,6 +2042,11 @@ void utcp_abort_all_connections(struct utcp *utcp) {
 }
 
 int utcp_close(struct utcp_connection *c) {
+       if(c->rcvbuf.used) {
+               fprintf(stderr, "UTCP channel closed with stuff in receive buffer\n");
+               return reset_connection(c) ? 0 : -1;
+       }
+
        if(utcp_shutdown(c, SHUT_RDWR) && errno != ENOTCONN) {
                return -1;
        }
@@ -2455,8 +2457,8 @@ void utcp_offline(struct utcp *utcp, bool offline) {
        }
 }
 
-void utcp_set_retransmit_cb(struct utcp *utcp, utcp_retransmit_t retransmit) {
-       utcp->retransmit = retransmit;
+void utcp_set_retransmit_cb(struct utcp *utcp, utcp_retransmit_t cb) {
+       utcp->retransmit = cb;
 }
 
 void utcp_set_clock_granularity(long granularity) {