Fix memory and resource leaks.

diff --git a/selftest.c b/selftest.c
index c0ecd3a600bffc05b335e1032454ed10ae9c75ab..2c299437388e3d6cef3700860f7f3397bd6a70ea 100644 (file)
--- a/selftest.c
+++ b/selftest.c
@@ -114,6 +114,8 @@ int main(int argc, char *argv[]) {
        fprintf(stderr, "closing...\n");
        utcp_close(c);
 
        fprintf(stderr, "closing...\n");
        utcp_close(c);
 

+       utcp_exit(a);
+       utcp_exit(b);

 
        return 0;
 }
 
        return 0;
 }

diff --git a/test.c b/test.c
index 38240db8fb2c04eec2012ca46e9584ce67b3f8cf..d362845b9a48e6d3570b1cfd130782bb7e0b5896 100644 (file)
--- a/test.c
+++ b/test.c
@@ -82,6 +82,8 @@ int main(int argc, char *argv[]) {
                connected = true;
        }
 
                connected = true;
        }
 

+       freeaddrinfo(ai);
+

        struct utcp *u = utcp_init(server ? do_accept : NULL, NULL, do_send, &s);
        if(!u)
                return 1;
        struct utcp *u = utcp_init(server ? do_accept : NULL, NULL, do_send, &s);
        if(!u)
                return 1;


@@ -120,7 +122,7 @@ int main(int argc, char *argv[]) {
 
                if(fds[1].revents) {
                        struct sockaddr_storage ss;
 
                if(fds[1].revents) {
                        struct sockaddr_storage ss;

-                       socklen_t sl;
+                       socklen_t sl = sizeof ss;

                        int len = recvfrom(s, buf, sizeof buf, MSG_DONTWAIT, (struct sockaddr *)&ss, &sl);
                        if(len <= 0)
                                break;
                        int len = recvfrom(s, buf, sizeof buf, MSG_DONTWAIT, (struct sockaddr *)&ss, &sl);
                        if(len <= 0)
                                break;

diff --git a/utcp.c b/utcp.c
index 730f12b98e8102a42d85c2d6f1fb55971728beec..1fae32cd2eaf44430f93311a0787034c58e2861d 100644 (file)
--- a/utcp.c
+++ b/utcp.c
@@ -127,6 +127,7 @@ static void free_connection(struct utcp_connection *c) {
        memmove(cp + i, cp + i + 1, (utcp->nconnections - i - 1) * sizeof *cp);
        utcp->nconnections--;
 
        memmove(cp + i, cp + i + 1, (utcp->nconnections - i - 1) * sizeof *cp);
        utcp->nconnections--;
 

+       free(c->sndbuf);

        free(c);
 }
 
        free(c);
 }
 


@@ -206,8 +207,9 @@ struct utcp_connection *utcp_connect(struct utcp *utcp, uint16_t dst, utcp_recv_
        hdr.dst = c->dst;
        hdr.seq = c->snd.iss;
        hdr.ack = 0;
        hdr.dst = c->dst;
        hdr.seq = c->snd.iss;
        hdr.ack = 0;

-       hdr.ctl = SYN;

        hdr.wnd = c->rcv.wnd;
        hdr.wnd = c->rcv.wnd;

+       hdr.ctl = SYN;
+       hdr.aux = 0;

 
        set_state(c, SYN_SENT);
 
 
        set_state(c, SYN_SENT);
 


@@ -260,6 +262,7 @@ static void ack(struct utcp_connection *c, bool sendatleastone) {
        pkt.hdr.ack = c->rcv.nxt;
        pkt.hdr.wnd = c->snd.wnd;
        pkt.hdr.ctl = ACK;
        pkt.hdr.ack = c->rcv.nxt;
        pkt.hdr.wnd = c->snd.wnd;
        pkt.hdr.ctl = ACK;

+       pkt.hdr.aux = 0;

 
        do {
                uint32_t seglen = left > c->utcp->mtu ? c->utcp->mtu : left;
 
        do {
                uint32_t seglen = left > c->utcp->mtu ? c->utcp->mtu : left;


@@ -757,6 +760,7 @@ int utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 
                // FIN counts as one sequence number
                c->rcv.nxt++;
 
                // FIN counts as one sequence number
                c->rcv.nxt++;

+               len++;

 
                // Inform the application that the peer closed the connection.
                if(c->recv) {
 
                // Inform the application that the peer closed the connection.
                if(c->recv) {


@@ -1037,8 +1041,13 @@ struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_
 void utcp_exit(struct utcp *utcp) {
        if(!utcp)
                return;
 void utcp_exit(struct utcp *utcp) {
        if(!utcp)
                return;

-       for(int i = 0; i < utcp->nconnections; i++)
-               free_connection(utcp->connections[i]);
+       for(int i = 0; i < utcp->nconnections; i++) {
+               if(!utcp->connections[i]->reapable)
+                       debug("Warning, freeing unclosed connection %p\n", utcp->connections[i]);
+               free(utcp->connections[i]->sndbuf);
+               free(utcp->connections[i]);
+       }
+       free(utcp->connections);

        free(utcp);
 }
 
        free(utcp);
 }