X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/e68cca06cfa3fe30e85ed4b5135e2671db30f81b..079ae2ec840c74790bfe3826cbc979eb6075b09b:/ppp.c?ds=inline

diff --git a/ppp.c b/ppp.c
index 349f388..95c5f2c 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.90 2005/12/15 14:18:16 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.93 2006/01/19 21:06:39 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);
@@ -649,11 +648,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;
@@ -794,9 +790,20 @@ 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??
+						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;