Fix buffer resizing.

[utcp] / utcp.c

diff --git a/utcp.c b/utcp.c
index 0b36de15263b8b005c0625f866e901054432b5ba..3d0971a37ba359716533ddaeab9b03874473d510 100644 (file)
--- a/utcp.c
+++ b/utcp.c
@@ -43,6 +43,14 @@
 #undef poll
 #endif
 
+#ifndef UTCP_CLOCK
+#if defined(CLOCK_MONOTONIC_RAW) && defined(__x86_64__)
+#define UTCP_CLOCK CLOCK_MONOTONIC_RAW
+#else
+#define UTCP_CLOCK CLOCK_MONOTONIC
+#endif
+#endif
+
 static void timespec_sub(const struct timespec *a, const struct timespec *b, struct timespec *r) {
        r->tv_sec = a->tv_sec - b->tv_sec;
        r->tv_nsec = a->tv_nsec - b->tv_nsec;
@@ -90,14 +98,6 @@ static inline size_t max(size_t a, size_t b) {
 #define UTCP_DEBUG_DATALEN 20
 #endif
 
-#ifndef UTCP_CLOCK
-#if defined(CLOCK_MONOTONIC_RAW) && defined(__x86_64__)
-#define UTCP_CLOCK CLOCK_MONOTONIC_RAW
-#else
-#define UTCP_CLOCK CLOCK_MONOTONIC
-#endif
-#endif
-
 static void debug(struct utcp_connection *c, const char *format, ...) {
        struct timespec tv;
        char buf[1024];
@@ -220,7 +220,7 @@ static bool buffer_resize(struct buffer *buf, uint32_t newsize) {
                // [345.........|........012]
                uint32_t tailsize = buf->size - buf->offset;
                uint32_t newoffset = newsize - tailsize;
-               memmove(buf + newoffset, buf + buf->offset, tailsize);
+               memmove(buf->data + newoffset, buf->data + buf->offset, tailsize);
                buf->offset = newoffset;
        }
 
@@ -749,6 +749,7 @@ ssize_t utcp_send(struct utcp_connection *c, const void *data, size_t len) {
        if(!is_reliable(c)) {
                c->snd.una = c->snd.nxt = c->snd.last;
                buffer_discard(&c->sndbuf, c->sndbuf.used);
+               c->do_poll = true;
        }
 
        if(is_reliable(c) && !timespec_isset(&c->rtrx_timeout)) {
@@ -1484,6 +1485,7 @@ synack:
 
                if(data_acked) {
                        buffer_discard(&c->sndbuf, data_acked);
+                       c->do_poll = true;
                }
 
                // Also advance snd.nxt if possible
@@ -2001,8 +2003,9 @@ struct timespec utcp_timeout(struct utcp *utcp) {
                }
 
                if(c->poll) {
-                       if((c->state == ESTABLISHED || c->state == CLOSE_WAIT)) {
-                               uint32_t len =  buffer_free(&c->sndbuf);
+                       if((c->state == ESTABLISHED || c->state == CLOSE_WAIT) && c->do_poll) {
+                               c->do_poll = false;
+                               uint32_t len = buffer_free(&c->sndbuf);
 
                                if(len) {
                                        c->poll(c, len);
@@ -2205,6 +2208,8 @@ void utcp_set_sndbuf(struct utcp_connection *c, size_t size) {
        if(c->sndbuf.maxsize != size) {
                c->sndbuf.maxsize = -1;
        }
+
+       c->do_poll = buffer_free(&c->sndbuf);
 }
 
 size_t utcp_get_rcvbuf(struct utcp_connection *c) {
@@ -2272,6 +2277,7 @@ void utcp_set_recv_cb(struct utcp_connection *c, utcp_recv_t recv) {
 void utcp_set_poll_cb(struct utcp_connection *c, utcp_poll_t poll) {
        if(c) {
                c->poll = poll;
+               c->do_poll = buffer_free(&c->sndbuf);
        }
 }