correct addition of single IP to pool

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index 590a52b..6af5066 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
 // 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.91 2005/12/15 14:23:03 bodea Exp $";

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -449,8 +449,7 @@ static void ppp_code_rej(sessionidt s, tunnelidt t, uint16_t proto,
 {
        uint8_t *q;
        int mru = session[s].mru;
 {
        uint8_t *q;
        int mru = session[s].mru;

-
-       if (!mru) mru = MAXMRU;
+       if (mru < MINMTU) mru = MINMTU;

        if (mru > size) mru = size;
 
        l += 4;
        if (mru > size) mru = size;
 
        l += 4;


@@ -461,7 +460,7 @@ static void ppp_code_rej(sessionidt s, tunnelidt t, uint16_t proto,
 
        *q = CodeRej;
        *(q + 1) = ++sess_local[s].lcp_ident;
 
        *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));
        memcpy(q + 4, p, l - 4);
 
        LOG(2, s, t, "Unexpected %s code %s\n", pname, ppp_code(*p));


@@ -500,7 +499,9 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        if (session[s].die) // going down...
                return;
 
        if (session[s].die) // going down...
                return;
 

-       LOG(*p == EchoReq ? 4 : 3, s, t, "LCP: recv %s\n", ppp_code(*p));
+       LOG((*p == EchoReq || *p == EchoReply) ? 4 : 3, s, t,
+               "LCP: recv %s\n", ppp_code(*p));
+

        if (config->debug > 3) dumplcp(p, l);
 
        if (*p == ConfigAck)
        if (config->debug > 3) dumplcp(p, l);
 
        if (*p == ConfigAck)


@@ -579,14 +580,14 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                case 1: // Maximum-Receive-Unit
                                        {
                                                uint16_t mru = ntohs(*(uint16_t *)(o + 2));
                                case 1: // Maximum-Receive-Unit
                                        {
                                                uint16_t mru = ntohs(*(uint16_t *)(o + 2));

-                                               if (!config->ppp_mru || mru <= config->ppp_mru)
+                                               if (mru >= MINMTU)

                                                {
                                                        session[s].mru = mru;
                                                        break;
                                                }
 
                                                LOG(3, s, t, "    Remote requesting MRU of %u.  Rejecting.\n", mru);
                                                {
                                                        session[s].mru = mru;
                                                        break;
                                                }
 
                                                LOG(3, s, t, "    Remote requesting MRU of %u.  Rejecting.\n", mru);

-                                               mru = htons(config->ppp_mru);
+                                               mru = htons(MRU);

                                                q = ppp_conf_nak(s, b, sizeof(b), PPPLCP, &response, q, p, o, (uint8_t *) &mru, sizeof(mru));
                                        }
                                        break;
                                                q = ppp_conf_nak(s, b, sizeof(b), PPPLCP, &response, q, p, o, (uint8_t *) &mru, sizeof(mru));
                                        }
                                        break;


@@ -749,13 +750,12 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                case 1: // Maximum-Receive-Unit
                                        if (*p == ConfigNak)
                                        {
                                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
                                        {
                                        }
                                        else
                                        {

-                                               session[s].mru = 0;
+                                               sess_local[s].ppp_mru = 0;

                                                LOG(3, s, t, "    Remote rejected MRU negotiation\n");
                                        }
 
                                                LOG(3, s, t, "    Remote rejected MRU negotiation\n");
                                        }
 


@@ -796,6 +796,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
                                default:
                                        LOG(2, s, t, "LCP: remote sent %s for type %u?\n", ppp_code(*p), type);
 
                                default:
                                        LOG(2, s, t, "LCP: remote sent %s for type %u?\n", ppp_code(*p), type);

+                                       sessionshutdown(s, "Unable to negotiate LCP.", 3, 0);

                                        break;
                        }
                        x -= length;
                                        break;
                        }
                        x -= length;


@@ -917,11 +918,17 @@ static void ipcp_open(sessionidt s, tunnelidt t)
 
        change_state(s, ipcp, Opened);
 
 
        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)
        {
                uint16_t r = radiusnew(s);
                if (r)

+               {

                        radiussend(r, RADIUSSTART); // send radius start
                        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
        }
 
        // start IPv6 if configured and still in passive state


@@ -1034,7 +1041,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        case 131: // secondary DNS
                                if (o[1] != 6 || o[1] > length) return;
 
                        case 131: // secondary DNS
                                if (o[1] != 6 || o[1] > length) return;
 

-                               addr = htonl(session[s].dns1);
+                               addr = htonl(session[s].dns2);

                                if (memcmp(o + 2, &addr, sizeof(addr)))
                                {
                                        q = ppp_conf_nak(s, b, sizeof(b), PPPIPCP, &response, q, p, o, (uint8_t *) &addr, sizeof(addr));
                                if (memcmp(o + 2, &addr, sizeof(addr)))
                                {
                                        q = ppp_conf_nak(s, b, sizeof(b), PPPIPCP, &response, q, p, o, (uint8_t *) &addr, sizeof(addr));


@@ -1349,6 +1356,13 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
        LOG_HEX(5, "IP", p, 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)
        ip = ntohl(*(uint32_t *)(p + 12));
 
        if (l > MAXETHER)


@@ -1372,6 +1386,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;
 
        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);
        // Add on the tun header
        p -= 4;
        *(uint32_t *) p = htonl(PKTIP);


@@ -1736,9 +1758,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 {
        if (size < 12) // Need more space than this!!
        {
 {
        if (size < 12) // Need more space than this!!
        {

-               static int backtrace_count = 0;

                LOG(0, s, t, "makeppp buffer too small for L2TP header (size=%d)\n", size);
                LOG(0, s, t, "makeppp buffer too small for L2TP header (size=%d)\n", size);

-               log_backtrace(backtrace_count, 5)

                return NULL;
        }
 
                return NULL;
        }
 


@@ -1746,12 +1766,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;
        *(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;
        }
        {
                *(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
        {
                *b++ = mtype;
        else
        {


@@ -1761,9 +1781,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 
        if (l + 12 > size)
        {
 
        if (l + 12 > size)
        {

-               static int backtrace_count = 0;

                LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%d)\n", size, l + 12);
                LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%d)\n", size, l + 12);

-               log_backtrace(backtrace_count, 5)

                return NULL;
        }
 
                return NULL;
        }
 


@@ -1819,10 +1837,10 @@ void sendlcp(sessionidt s, tunnelidt t)
 
        l += 2; //Save space for length
 
 
        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)
        {
                *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)
        }
 
        if (authtype)


@@ -1838,6 +1856,7 @@ void sendlcp(sessionidt s, tunnelidt t)
        if (config->debug > 3) dumplcp(q, l - q);
 
        tunnelsend(b, (l - b), t);
        if (config->debug > 3) dumplcp(q, l - q);
 
        tunnelsend(b, (l - b), t);

+       restart_timer(s, lcp);

 }
 
 // Send CCP request for no compression
 }
 
 // Send CCP request for no compression


@@ -1856,4 +1875,35 @@ void sendccp(sessionidt s, tunnelidt t)
 
        LOG_HEX(5, "PPPCCP", q, 4);
        tunnelsend(b, (q - b) + 4 , t);
 
        LOG_HEX(5, "PPPCCP", q, 4);
        tunnelsend(b, (q - b) + 4 , t);

+       restart_timer(s, ccp);
+}
+
+// Reject unknown/unconfigured protocols
+void protoreject(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l, uint16_t proto)
+{
+
+       uint8_t buf[MAXETHER];
+       uint8_t *q;
+       int mru = session[s].mru;
+       if (mru < MINMTU) mru = MINMTU;
+       if (mru > sizeof(buf)) mru = sizeof(buf);
+
+       l += 6;
+       if (l > mru) l = mru;
+
+       q = makeppp(buf, sizeof(buf), 0, 0, s, t, PPPLCP);
+       if (!q) return;
+
+       *q = ProtocolRej;
+       *(q + 1) = ++sess_local[s].lcp_ident;
+       *(uint16_t *)(q + 2) = htons(l);
+       *(uint16_t *)(q + 4) = htons(proto);
+       memcpy(q + 6, p, l - 6);
+
+       if (proto == PPPIPV6CP)
+               LOG(3, s, t, "LCP: send ProtocolRej (IPV6CP: not configured)\n");
+       else
+               LOG(2, s, t, "LCP: sent ProtocolRej (0x%04X: unsupported)\n", proto);
+
+       tunnelsend(buf, l + (q - buf), t);

 }
 }