X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Flcp.c;h=af48e9c58a628961042928da73df28f70aef9694;hp=672ecb911bacfd78e04301b2df23053290999dc5;hb=f5a366071d9ac967f7ecd05a5cd5418762451723;hpb=fad042b01eacb55e5513eed944ae2a6f2bb38468

diff --git a/pppd/lcp.c b/pppd/lcp.c
index 672ecb9..af48e9c 100644
--- a/pppd/lcp.c
+++ b/pppd/lcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: lcp.c,v 1.17 1995/04/24 05:58:06 paulus Exp $";
+static char rcsid[] = "$Id: lcp.c,v 1.19 1995/05/19 03:25:16 paulus Exp $";
 #endif
 
 /*
@@ -45,7 +45,7 @@ static char rcsid[] = "$Id: lcp.c,v 1.17 1995/04/24 05:58:06 paulus Exp $";
 
 #ifdef _linux_		/* Needs ppp ioctls */
 #include <net/if.h>
-#include <net/if_ppp.h>
+#include <linux/if_ppp.h>
 #endif
 
 /* global vars */
@@ -113,7 +113,7 @@ static fsm_callbacks lcp_callbacks = {	/* LCP callback routines */
     "LCP"			/* String name of protocol */
 };
 
-int lcp_warnloops = DEFWARNLOOPS; /* Warn about a loopback this often */
+int lcp_loopbackfail = DEFLOOPBACKFAIL;
 
 /*
  * Length of each type of configuration option (in octets)
@@ -862,7 +862,6 @@ lcp_nakci(f, p, len)
      */
     NAKCILONG(CI_MAGICNUMBER, neg_magicnumber,
 	      try.magicnumber = magic();
-	      ++try.numloops;
 	      looped_back = 1;
 	      );
 
@@ -940,9 +939,14 @@ lcp_nakci(f, p, len)
      * OK, the Nak is good.  Now we can update state.
      */
     if (f->state != OPENED) {
+	if (looped_back) {
+	    if (++try.numloops >= lcp_loopbackfail) {
+		syslog(LOG_NOTICE, "Serial line is looped back.");
+		lcp_close(f->unit);
+	    }
+	} else
+	    try.numloops = 0;
 	*go = try;
-	if (looped_back && try.numloops % lcp_warnloops == 0)
-	    syslog(LOG_WARNING, "Serial line appears to be looped back.");
     }
 
     return 1;
@@ -1368,9 +1372,10 @@ endswitch:
 	    continue;			/* Don't send this one */
 
 	if (orc == CONFNAK) {		/* Nak this CI? */
-	    if (reject_if_disagree)	/* Getting fed up with sending NAKs? */
+	    if (reject_if_disagree	/* Getting fed up with sending NAKs? */
+		&& citype != CI_MAGICNUMBER) {
 		orc = CONFREJ;		/* Get tough if so */
-	    else {
+	    } else {
 		if (rc == CONFREJ)	/* Rejecting prior CI? */
 		    continue;		/* Don't send this one */
 		rc = CONFNAK;