Distinguish between MTU and MSS.

[utcp] / utcp.c

diff --git a/utcp.c b/utcp.c
index 7c30246cb066d1edccaa1fd5a48a7ec0a0fcedde..72bb41d021f003e49897d24b92bcfda0456846cb 100644 (file)
--- a/utcp.c
+++ b/utcp.c
@@ -128,7 +128,7 @@ static void print_packet(struct utcp_connection *c, const char *dir, const void
 }
 
 static void debug_cwnd(struct utcp_connection *c) {
-       debug(c, "snd.cwnd %u snd.ssthresh %u\n", c->snd.cwnd, c->snd.ssthresh);
+       debug(c, "snd.cwnd %u snd.ssthresh %u\n", c->snd.cwnd, ~c->snd.ssthresh ? c->snd.ssthresh : 0);
 }
 #else
 #define debug(...) do {} while(0)
@@ -401,12 +401,8 @@ static struct utcp_connection *allocate_connection(struct utcp *utcp, uint16_t s
        c->snd.una = c->snd.iss;
        c->snd.nxt = c->snd.iss + 1;
        c->snd.last = c->snd.nxt;
-       c->snd.cwnd = (utcp->mtu > 2190 ? 2 : utcp->mtu > 1095 ? 3 : 4) * utcp->mtu;
-#if UTCP_DEBUG
-       c->snd.ssthresh = c->sndbuf.maxsize;
-#else
+       c->snd.cwnd = (utcp->mss > 2190 ? 2 : utcp->mss > 1095 ? 3 : 4) * utcp->mss;
        c->snd.ssthresh = ~0;
-#endif
        debug_cwnd(c);
        c->utcp = utcp;
 
@@ -539,8 +535,8 @@ static void ack(struct utcp_connection *c, bool sendatleastone) {
        } else if(cwndleft < left) {
                left = cwndleft;
 
-               if(!sendatleastone || cwndleft > c->utcp->mtu) {
-                       left -= left % c->utcp->mtu;
+               if(!sendatleastone || cwndleft > c->utcp->mss) {
+                       left -= left % c->utcp->mss;
                }
        }
 
@@ -555,7 +551,7 @@ static void ack(struct utcp_connection *c, bool sendatleastone) {
                uint8_t data[];
        } *pkt;
 
-       pkt = malloc(sizeof(pkt->hdr) + c->utcp->mtu);
+       pkt = malloc(c->utcp->mtu);
 
        if(!pkt) {
                return;
@@ -569,7 +565,7 @@ static void ack(struct utcp_connection *c, bool sendatleastone) {
        pkt->hdr.aux = 0;
 
        do {
-               uint32_t seglen = left > c->utcp->mtu ? c->utcp->mtu : left;
+               uint32_t seglen = left > c->utcp->mss ? c->utcp->mss : left;
                pkt->hdr.seq = c->snd.nxt;
 
                buffer_copy(&c->sndbuf, pkt->data, seqdiff(c->snd.nxt, c->snd.una), seglen);
@@ -714,7 +710,7 @@ static void fast_retransmit(struct utcp_connection *c) {
                uint8_t data[];
        } *pkt;
 
-       pkt = malloc(sizeof(pkt->hdr) + c->utcp->mtu);
+       pkt = malloc(c->utcp->mtu);
 
        if(!pkt) {
                return;
@@ -735,7 +731,7 @@ static void fast_retransmit(struct utcp_connection *c) {
                pkt->hdr.seq = c->snd.una;
                pkt->hdr.ack = c->rcv.nxt;
                pkt->hdr.ctl = ACK;
-               uint32_t len = min(seqdiff(c->snd.last, c->snd.una), utcp->mtu);
+               uint32_t len = min(seqdiff(c->snd.last, c->snd.una), utcp->mss);
 
                if(fin_wanted(c, c->snd.una + len)) {
                        len--;
@@ -768,7 +764,7 @@ static void retransmit(struct utcp_connection *c) {
                uint8_t data[];
        } *pkt;
 
-       pkt = malloc(sizeof(pkt->hdr) + c->utcp->mtu);
+       pkt = malloc(c->utcp->mtu);
 
        if(!pkt) {
                return;
@@ -812,27 +808,24 @@ static void retransmit(struct utcp_connection *c) {
                pkt->hdr.seq = c->snd.una;
                pkt->hdr.ack = c->rcv.nxt;
                pkt->hdr.ctl = ACK;
-               uint32_t len = seqdiff(c->snd.last, c->snd.una);
-
-               if(len > utcp->mtu) {
-                       len = utcp->mtu;
-               }
+               uint32_t len = min(seqdiff(c->snd.last, c->snd.una), utcp->mss);
 
                if(fin_wanted(c, c->snd.una + len)) {
                        len--;
                        pkt->hdr.ctl |= FIN;
                }
 
-               c->snd.nxt = c->snd.una + len;
-
                // RFC 5681 slow start after timeout
-               c->snd.ssthresh = max(c->snd.cwnd / 2, utcp->mtu * 2); // eq. 4
-               c->snd.cwnd = utcp->mtu;
+               uint32_t flightsize = seqdiff(c->snd.nxt, c->snd.una);
+               c->snd.ssthresh = max(flightsize / 2, utcp->mss * 2); // eq. 4
+               c->snd.cwnd = utcp->mss;
                debug_cwnd(c);
 
                buffer_copy(&c->sndbuf, pkt->data, 0, len);
                print_packet(c, "rtrx", pkt, sizeof(pkt->hdr) + len);
                utcp->send(utcp, pkt, sizeof(pkt->hdr) + len);
+
+               c->snd.nxt = c->snd.una + len;
                break;
 
        case CLOSED:
@@ -855,6 +848,7 @@ static void retransmit(struct utcp_connection *c) {
        }
 
        c->rtt_start.tv_sec = 0; // invalidate RTT timer
+       c->dupack = 0; // cancel any ongoing fast recovery
 
 cleanup:
        free(pkt);
@@ -1431,9 +1425,9 @@ synack:
 
                // Increase the congestion window according to RFC 5681
                if(c->snd.cwnd < c->snd.ssthresh) {
-                       c->snd.cwnd += min(advanced, utcp->mtu); // eq. 2
+                       c->snd.cwnd += min(advanced, utcp->mss); // eq. 2
                } else {
-                       c->snd.cwnd += max(1, (utcp->mtu * utcp->mtu) / c->snd.cwnd); // eq. 3
+                       c->snd.cwnd += max(1, (utcp->mss * utcp->mss) / c->snd.cwnd); // eq. 3
                }
 
                if(c->snd.cwnd > c->sndbuf.maxsize) {
@@ -1464,15 +1458,16 @@ synack:
                        break;
                }
        } else {
-               if(!len && is_reliable(c)) {
+               if(!len && is_reliable(c) && c->snd.una != c->snd.last) {
                        c->dupack++;
                        debug(c, "duplicate ACK %d\n", c->dupack);
 
                        if(c->dupack == 3) {
                                // RFC 5681 fast recovery
                                debug(c, "fast recovery started\n", c->dupack);
-                               c->snd.ssthresh = max(c->snd.cwnd / 2, utcp->mtu * 2); // eq. 4
-                               c->snd.cwnd = min(c->snd.ssthresh + 3 * utcp->mtu, c->sndbuf.maxsize);
+                               uint32_t flightsize = seqdiff(c->snd.nxt, c->snd.una);
+                               c->snd.ssthresh = max(flightsize / 2, utcp->mss * 2); // eq. 4
+                               c->snd.cwnd = min(c->snd.ssthresh + 3 * utcp->mss, c->sndbuf.maxsize);
 
                                if(c->snd.cwnd > c->sndbuf.maxsize) {
                                        c->snd.cwnd = c->sndbuf.maxsize;
@@ -1482,7 +1477,7 @@ synack:
 
                                fast_retransmit(c);
                        } else if(c->dupack > 3) {
-                               c->snd.cwnd += utcp->mtu;
+                               c->snd.cwnd += utcp->mss;
 
                                if(c->snd.cwnd > c->sndbuf.maxsize) {
                                        c->snd.cwnd = c->sndbuf.maxsize;
@@ -1490,6 +1485,11 @@ synack:
 
                                debug_cwnd(c);
                        }
+
+                       // We got an ACK which indicates the other side did get one of our packets.
+                       // Reset the retransmission timer to avoid going to slow start,
+                       // but don't touch the connection timeout.
+                       start_retransmit_timer(c);
                }
        }
 
@@ -1979,6 +1979,7 @@ 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->mss = DEFAULT_MTU - sizeof(struct hdr);
        utcp->timeout = DEFAULT_USER_TIMEOUT; // sec
        utcp->rto = START_RTO; // usec
 
@@ -2020,6 +2021,7 @@ void utcp_set_mtu(struct utcp *utcp, uint16_t mtu) {
        // TODO: handle overhead of the header
        if(utcp) {
                utcp->mtu = mtu;
+               utcp->mss = mtu - sizeof(struct hdr);
        }
 }