layer 4 info implies !frag

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index 590a52b..d2411a6 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.81 2005/09/15 09:34:49 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.85 2005/11/04 14:41:50 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -449,8 +449,6 @@ static void ppp_code_rej(sessionidt s, tunnelidt t, uint16_t proto,
 {
        uint8_t *q;
        int mru = session[s].mru;
-
-       if (!mru) mru = MAXMRU;
        if (mru > size) mru = size;
 
        l += 4;
@@ -461,7 +459,7 @@ static void ppp_code_rej(sessionidt s, tunnelidt t, uint16_t proto,
 
        *q = CodeRej;
        *(q + 1) = ++sess_local[s].lcp_ident;
-       *(uint16_t *)(q + 2) = l;
+       *(uint16_t *)(q + 2) = htons(l);
        memcpy(q + 4, p, l - 4);
 
        LOG(2, s, t, "Unexpected %s code %s\n", pname, ppp_code(*p));
@@ -577,18 +575,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        switch (type)
                        {
                                case 1: // Maximum-Receive-Unit
-                                       {
-                                               uint16_t mru = ntohs(*(uint16_t *)(o + 2));
-                                               if (!config->ppp_mru || mru <= config->ppp_mru)
-                                               {
-                                                       session[s].mru = mru;
-                                                       break;
-                                               }
-
-                                               LOG(3, s, t, "    Remote requesting MRU of %u.  Rejecting.\n", mru);
-                                               mru = htons(config->ppp_mru);
-                                               q = ppp_conf_nak(s, b, sizeof(b), PPPLCP, &response, q, p, o, (uint8_t *) &mru, sizeof(mru));
-                                       }
+                                       session[s].mru = ntohs(*(uint16_t *)(o + 2));
                                        break;
 
                                case 2: // Async-Control-Character-Map
@@ -749,13 +736,12 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                case 1: // Maximum-Receive-Unit
                                        if (*p == ConfigNak)
                                        {
-                                               session[s].mru = 0;
-                                               LOG(3, s, t, "    Remote requested MRU of %u; removing option\n",
-                                                       ntohs(*(uint16_t *)(o + 2)));
+                                               sess_local[s].ppp_mru = ntohs(*(uint16_t *)(o + 2));
+                                               LOG(3, s, t, "    Remote requested MRU of %u\n", sess_local[s].ppp_mru);
                                        }
                                        else
                                        {
-                                               session[s].mru = 0;
+                                               sess_local[s].ppp_mru = 0;
                                                LOG(3, s, t, "    Remote rejected MRU negotiation\n");
                                        }
 
@@ -917,11 +903,17 @@ static void ipcp_open(sessionidt s, tunnelidt t)
 
        change_state(s, ipcp, Opened);
 
-       if (!session[s].walled_garden)
+       if (!(session[s].walled_garden || session[s].flags & SESSION_STARTED))
        {
                uint16_t r = radiusnew(s);
                if (r)
+               {
                        radiussend(r, RADIUSSTART); // send radius start
+
+                       // don't send further Start records if IPCP is restarted
+                       session[s].flags |= SESSION_STARTED;
+                       cluster_send_session(s);
+               }
        }
 
        // start IPv6 if configured and still in passive state
@@ -1349,6 +1341,13 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
        LOG_HEX(5, "IP", p, l);
 
+       if (l < 20)
+       {
+               LOG(1, s, t, "IP packet too short %d\n", l);
+               STAT(tunnel_rx_errors);
+               return ;
+       }
+
        ip = ntohl(*(uint32_t *)(p + 12));
 
        if (l > MAXETHER)
@@ -1372,6 +1371,14 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        if (session[s].filter_in && !ip_filter(p, l, session[s].filter_in - 1))
                return;
 
+       // adjust MSS on SYN and SYN,ACK packets with options
+       if ((ntohs(*(uint16_t *) (p + 6)) & 0x1fff) == 0 && p[9] == IPPROTO_TCP) // first tcp fragment
+       {
+               int ihl = (p[0] & 0xf) * 4; // length of IP header
+               if (l >= ihl + 20 && (p[ihl + 13] & TCP_FLAG_SYN) && ((p[ihl + 12] >> 4) > 5))
+                       adjust_tcp_mss(s, t, p, l, p + ihl);
+       }
+
        // Add on the tun header
        p -= 4;
        *(uint32_t *) p = htonl(PKTIP);
@@ -1746,12 +1753,12 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
        *(uint16_t *) (b + 2) = htons(tunnel[t].far); // tunnel
        *(uint16_t *) (b + 4) = htons(session[s].far); // session
        b += 6;
-       if (mtype == PPPLCP || !(session[s].l2tp_flags & SESSIONACFC))
+       if (mtype == PPPLCP || !(session[s].flags & SESSION_ACFC))
        {
                *(uint16_t *) b = htons(0xFF03); // HDLC header
                b += 2;
        }
-       if (mtype < 0x100 && session[s].l2tp_flags & SESSIONPFC)
+       if (mtype < 0x100 && session[s].flags & SESSION_PFC)
                *b++ = mtype;
        else
        {
@@ -1819,10 +1826,10 @@ void sendlcp(sessionidt s, tunnelidt t)
 
        l += 2; //Save space for length
 
-       if (session[s].mru)
+       if (sess_local[s].ppp_mru)
        {
                *l++ = 1; *l++ = 4; // Maximum-Receive-Unit (length 4)
-               *(uint16_t *) l = htons(session[s].mru); l += 2;
+               *(uint16_t *) l = htons(sess_local[s].ppp_mru); l += 2;
        }
 
        if (authtype)
@@ -1838,6 +1845,7 @@ void sendlcp(sessionidt s, tunnelidt t)
        if (config->debug > 3) dumplcp(q, l - q);
 
        tunnelsend(b, (l - b), t);
+       restart_timer(s, lcp);
 }
 
 // Send CCP request for no compression
@@ -1856,4 +1864,5 @@ void sendccp(sessionidt s, tunnelidt t)
 
        LOG_HEX(5, "PPPCCP", q, 4);
        tunnelsend(b, (q - b) + 4 , t);
+       restart_timer(s, ccp);
 }