Fix buffer resizing logic in buffer_put_at().

[utcp] / utcp.c

diff --git a/utcp.c b/utcp.c
index 1627be77cbce59467e7aae4936cd4a730ff73ce7..13f46584484bef5fd71ae74a77792671c1fb7637 100644 (file)
--- a/utcp.c
+++ b/utcp.c
@@ -49,7 +49,7 @@
        (r)->tv_sec = (a)->tv_sec - (b)->tv_sec;\
        (r)->tv_usec = (a)->tv_usec - (b)->tv_usec;\
        if((r)->tv_usec < 0)\
-               (r)->tv_sec--, (r)->tv_usec += 1000000;\
+               (r)->tv_sec--, (r)->tv_usec += USEC_PER_SEC;\
 } while (0)
 #endif
 
@@ -173,7 +173,7 @@ static ssize_t buffer_put_at(struct buffer *buf, size_t offset, const void *data
                } else {
                        do {
                                newsize *= 2;
-                       } while(newsize < buf->used + len);
+                       } while(newsize < required);
                }
                if(newsize > buf->maxsize)
                        newsize = buf->maxsize;
@@ -857,8 +857,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
        // In case this is for a CLOSED connection, ignore the packet.
        // TODO: make it so incoming packets can never match a CLOSED connection.
 
-       if(c->state == CLOSED)
+       if(c->state == CLOSED) {
+               debug("Got packet for closed connection\n");
                return 0;
+       }
 
        // It is for an existing connection.
 
@@ -1294,7 +1296,7 @@ int utcp_shutdown(struct utcp_connection *c, int dir) {
 }
 
 int utcp_close(struct utcp_connection *c) {
-       if(utcp_shutdown(c, SHUT_RDWR))
+       if(utcp_shutdown(c, SHUT_RDWR) && errno != ENOTCONN)
                return -1;
        c->recv = NULL;
        c->poll = NULL;
@@ -1434,8 +1436,8 @@ struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_
        utcp->send = send;
        utcp->priv = priv;
        utcp->mtu = DEFAULT_MTU;
-       utcp->timeout = DEFAULT_USER_TIMEOUT; // s
-       utcp->rto = START_RTO; // us
+       utcp->timeout = DEFAULT_USER_TIMEOUT; // sec
+       utcp->rto = START_RTO; // usec
 
        return utcp;
 }