avoid endless loop in processipcp, processipv6cp

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index 9c98a3c..b306f28 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.89 2005-12-14 02:19:15 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.95 2006-02-17 14:35:54 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -475,7 +475,6 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
        uint8_t b[MAXETHER];
        uint8_t *q = NULL;
-       uint32_t magicno = 0;
        uint16_t hl;
 
        CSTAT(processlcp);
@@ -499,7 +498,9 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        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)
@@ -581,6 +582,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                                if (mru >= MINMTU)
                                                {
                                                        session[s].mru = mru;
+                                                       cluster_send_session(s);
                                                        break;
                                                }
 
@@ -647,11 +649,8 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                        }
                                        break;
 
-                               case 5: // Magic-Number
-                                       magicno = ntohl(*(uint32_t *)(o + 2));
-                                       break;
-
                                case 4: // Quality-Protocol
+                               case 5: // Magic-Number
                                case 7: // Protocol-Field-Compression
                                case 8: // Address-And-Control-Field-Compression
                                        break;
@@ -792,9 +791,21 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
                                        break;
 
+                               case 5: // Magic-Number
+                                       if (*p == ConfigNak)
+                                       {
+                                               session[s].magic = ntohl(*(uint32_t *)(o + 2));
+                                               LOG(3, s, t, "    Remote requested magic-no %x\n", session[s].magic);
+                                               if (!session[s].magic) session[s].magic = time_now; // Netgear DG814 sends zero??
+                                               cluster_send_session(s);
+                                               break;
+                                       }
+                                       // ConfigRej: fallthrough
+
                                default:
                                        LOG(2, s, t, "LCP: remote sent %s for type %u?\n", ppp_code(*p), type);
-                                       break;
+                                       sessionshutdown(s, "Unable to negotiate LCP.", 3, 0);
+                                       return;
                        }
                        x -= length;
                        o += length;
@@ -1003,11 +1014,13 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
                while (length > 2)
                {
+                       if (!o[1] || o[1] > length) return;
+
                        switch (*o)
                        {
                        case 3: // ip address
                                gotip++; // seen address
-                               if (o[1] != 6 || o[1] > length) return;
+                               if (o[1] != 6) return;
 
                                addr = htonl(session[s].ip);
                                if (memcmp(o + 2, &addr, (sizeof addr)))
@@ -1024,7 +1037,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                break;
 
                        case 129: // primary DNS
-                               if (o[1] != 6 || o[1] > length) return;
+                               if (o[1] != 6) return;
 
                                addr = htonl(session[s].dns1);
                                if (memcmp(o + 2, &addr, (sizeof addr)))
@@ -1036,7 +1049,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                break;
 
                        case 131: // secondary DNS
-                               if (o[1] != 6 || o[1] > length) return;
+                               if (o[1] != 6) return;
 
                                addr = htonl(session[s].dns2);
                                if (memcmp(o + 2, &addr, sizeof(addr)))
@@ -1228,11 +1241,13 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
                while (length > 2)
                {
+                       if (!o[1] || o[1] > length) return;
+
                        switch (*o)
                        {
                        case 1: // interface identifier
                                gotip++; // seen address
-                               if (o[1] != 10 || o[1] > length) return;
+                               if (o[1] != 10) return;
 
                                *(uint32_t *) ident = htonl(session[s].ip);
                                *(uint32_t *) (ident + 4) = 0;