From f9bd39e509bc60a791714ad784e7a435460b509c Mon Sep 17 00:00:00 2001 From: bodea Date: Fri, 16 Sep 2005 05:54:53 +0000 Subject: [PATCH 1/1] set mss, adjust checksum --- l2tpns.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/l2tpns.c b/l2tpns.c index bdedb12..c9013b2 100644 --- a/l2tpns.c +++ b/l2tpns.c @@ -4,7 +4,7 @@ // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // vim: sw=8 ts=8 -char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.135 2005/09/16 05:35:31 bodea Exp $"; +char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.136 2005/09/16 05:54:53 bodea Exp $"; #include #include @@ -990,6 +990,8 @@ void adjust_tcp_mss(sessionidt s, tunnelidt t, uint8_t *buf, int len, uint8_t *t uint8_t *mss = 0; uint8_t *opts; uint8_t *data; + uint16_t orig; + uint32_t sum; if ((tcp[13] & 0x3f) & ~(TCP_FLAG_SYN|TCP_FLAG_ACK)) // only want SYN and SYN,ACK return; @@ -1017,15 +1019,23 @@ void adjust_tcp_mss(sessionidt s, tunnelidt t, uint8_t *buf, int len, uint8_t *t } if (!mss) return; // not found - if (ntohs(*(uint16_t *) mss) <= MSS) return; // mss OK + orig = ntohs(*(uint16_t *) mss); - LOG(5, s, t, "TCP: %s:%u -> %s:%u SYN%s, adjusted mss from %u to %u\n", - fmtaddr(*(in_addr_t *)(buf + 12), 0), ntohs(*(uint16_t *)tcp), - fmtaddr(*(in_addr_t *)(buf + 16), 1), ntohs(*(uint16_t *)(tcp + 2)), - (tcp[13] & TCP_FLAG_ACK) ? ",ACK" : "", - ntohs(*(uint16_t *) mss), MSS); + if (orig <= MSS) return; // mss OK - // FIXME + LOG(5, s, t, "TCP: %s:%u -> %s:%u SYN%s, adjusted mss from %u to %u\n", + fmtaddr(*(in_addr_t *) (buf + 12), 0), ntohs(*(uint16_t *) tcp), + fmtaddr(*(in_addr_t *) (buf + 16), 1), ntohs(*(uint16_t *) (tcp + 2)), + (tcp[13] & TCP_FLAG_ACK) ? ",ACK" : "", orig, MSS); + + // set mss + *(int16_t *) mss = MSS; + + // adjust checksum (see rfc1141) + sum = orig + (~MSS & 0xffff); + sum += ntohs(*(uint16_t *) (tcp + 16)); + sum = (sum & 0xffff) + (sum >> 16); + *(uint16_t *) (tcp + 16) = htons(sum); } // process outgoing (to tunnel) IP -- 2.20.1