Fix bug in retransmit().

[utcp] / utcp.c

diff --git a/utcp.c b/utcp.c
index 047f70fe795653db1b4abb2ccfb20add21ce6459..7c577018888b0fd99b7cac6f9d66e29b9a0fd91c 100644 (file)
--- a/utcp.c
+++ b/utcp.c
@@ -273,6 +273,7 @@ static void free_connection(struct utcp_connection *c) {
        memmove(cp, cp + 1, (utcp->nconnections - i - 1) * sizeof *cp);
        utcp->nconnections--;
 
+       buffer_exit(&c->rcvbuf);
        buffer_exit(&c->sndbuf);
        free(c);
 }
@@ -318,6 +319,7 @@ static struct utcp_connection *allocate_connection(struct utcp *utcp, uint16_t s
        }
 
        if(!buffer_init(&c->rcvbuf, DEFAULT_RCVBUFSIZE, DEFAULT_MAXRCVBUFSIZE)) {
+               buffer_exit(&c->sndbuf);
                free(c);
                return NULL;
        }
@@ -545,8 +547,11 @@ static void swap_ports(struct hdr *hdr) {
 }
 
 static void retransmit(struct utcp_connection *c) {
-       if(c->state == CLOSED || c->snd.nxt == c->snd.una)
+       if(c->state == CLOSED || c->snd.last == c->snd.una) {
+               debug("Retransmit() called but nothing to retransmit!\n");
+               stop_retransmit_timer(c);
                return;
+       }
 
        struct utcp *utcp = c->utcp;
 
@@ -561,13 +566,14 @@ static void retransmit(struct utcp_connection *c) {
 
        pkt->hdr.src = c->src;
        pkt->hdr.dst = c->dst;
+       pkt->hdr.wnd = c->rcv.wnd;
+       pkt->hdr.aux = 0;
 
        switch(c->state) {
                case SYN_SENT:
                        // Send our SYN again
                        pkt->hdr.seq = c->snd.iss;
                        pkt->hdr.ack = 0;
-                       pkt->hdr.wnd = c->rcv.wnd;
                        pkt->hdr.ctl = SYN;
                        print_packet(c->utcp, "rtrx", pkt, sizeof pkt->hdr);
                        utcp->send(utcp, pkt, sizeof pkt->hdr);
@@ -1259,6 +1265,8 @@ int utcp_shutdown(struct utcp_connection *c, int dir) {
        c->snd.last++;
 
        ack(c, false);
+       if(!timerisset(&c->rtrx_timeout))
+               start_retransmit_timer(c);
        return 0;
 }
 
@@ -1415,6 +1423,7 @@ void utcp_exit(struct utcp *utcp) {
        for(int i = 0; i < utcp->nconnections; i++) {
                if(!utcp->connections[i]->reapable)
                        debug("Warning, freeing unclosed connection %p\n", utcp->connections[i]);
+               buffer_exit(&utcp->connections[i]->rcvbuf);
                buffer_exit(&utcp->connections[i]->sndbuf);
                free(utcp->connections[i]);
        }