validate source of RADIUS packets

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index 244d59a..5515080 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.92 2006/01/19 21:00:24 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.94 2006/01/19 21:31:25 bodea Exp $";

 
 #include <stdio.h>
 #include <string.h>
 
 #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;
 {
        uint8_t b[MAXETHER];
        uint8_t *q = NULL;

-       uint32_t magicno = 0;

        uint16_t hl;
 
        CSTAT(processlcp);
        uint16_t hl;
 
        CSTAT(processlcp);


@@ -583,6 +582,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                                if (mru >= MINMTU)
                                                {
                                                        session[s].mru = mru;
                                                if (mru >= MINMTU)
                                                {
                                                        session[s].mru = mru;

+                                                       cluster_send_session(s);

                                                        break;
                                                }
 
                                                        break;
                                                }
 


@@ -649,11 +649,8 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                        }
                                        break;
 
                                        }
                                        break;
 

-                               case 5: // Magic-Number
-                                       magicno = ntohl(*(uint32_t *)(o + 2));
-                                       break;
-

                                case 4: // Quality-Protocol
                                case 4: // Quality-Protocol

+                               case 5: // Magic-Number

                                case 7: // Protocol-Field-Compression
                                case 8: // Address-And-Control-Field-Compression
                                        break;
                                case 7: // Protocol-Field-Compression
                                case 8: // Address-And-Control-Field-Compression
                                        break;


@@ -800,6 +797,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                                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??
                                                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
                                                break;
                                        }
                                        // ConfigRej: fallthrough


@@ -807,7 +805,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);
                                        sessionshutdown(s, "Unable to negotiate LCP.", 3, 0);
                                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;
+                                       return;

                        }
                        x -= length;
                        o += length;
                        }
                        x -= length;
                        o += length;