X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=pppd%2Ffsm.c;h=a11922a31df12448e8b3729614ca155c9b257f8a;hb=605baf6d76e6c9b4e94e626063ab52408364dfeb;hp=23d6773307474a4277045a284a5066584904d784;hpb=0b63a24d54ba4708c88e31bdd74b0145956c1478;p=ppp.git

diff --git a/pppd/fsm.c b/pppd/fsm.c
index 23d6773..a11922a 100644
--- a/pppd/fsm.c
+++ b/pppd/fsm.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: fsm.c,v 1.1 1993/11/11 03:54:25 paulus Exp $";
+static char rcsid[] = "$Id: fsm.c,v 1.5 1994/09/21 06:47:37 paulus Exp $";
 #endif
 
 /*
@@ -29,27 +29,25 @@ static char rcsid[] = "$Id: fsm.c,v 1.1 1993/11/11 03:54:25 paulus Exp $";
 
 #include <stdio.h>
 #include <sys/types.h>
-/*#include <malloc.h>*/
 #include <syslog.h>
 
-#include "ppp.h"
 #include "pppd.h"
 #include "fsm.h"
 
 extern char *proto_name();
 
-static void fsm_timeout __ARGS((caddr_t));
-static void fsm_rconfreq __ARGS((fsm *, int, u_char *, int));
-static void fsm_rconfack __ARGS((fsm *, int, u_char *, int));
-static void fsm_rconfnakrej __ARGS((fsm *, int, int, u_char *, int));
-static void fsm_rtermreq __ARGS((fsm *, int));
-static void fsm_rtermack __ARGS((fsm *));
-static void fsm_rcoderej __ARGS((fsm *, u_char *, int));
-static void fsm_sconfreq __ARGS((fsm *, int));
+static void fsm_timeout __P((caddr_t));
+static void fsm_rconfreq __P((fsm *, int, u_char *, int));
+static void fsm_rconfack __P((fsm *, int, u_char *, int));
+static void fsm_rconfnakrej __P((fsm *, int, int, u_char *, int));
+static void fsm_rtermreq __P((fsm *, int));
+static void fsm_rtermack __P((fsm *));
+static void fsm_rcoderej __P((fsm *, u_char *, int));
+static void fsm_sconfreq __P((fsm *, int));
 
 #define PROTO_NAME(f)	((f)->callbacks->proto_name)
 
-int peer_mru[NPPP];
+int peer_mru[N_PPP];
 
 
 /*
@@ -408,6 +406,8 @@ fsm_rconfreq(f, id, inp, len)
 	code = (*f->callbacks->reqci)(f, inp, &len, reject_if_disagree);
     } else if (len)
 	code = CONFREJ;			/* Reject all CI */
+    else
+	code = CONFACK;
 
     /* send the Ack, Nak or Rej to the peer */
     fsm_sdata(f, code, id, inp, len);
@@ -445,14 +445,16 @@ fsm_rconfack(f, id, inp, len)
     FSMDEBUG((LOG_INFO, "fsm_rconfack(%s): Rcvd id %d.",
 	      PROTO_NAME(f), id));
 
-    if (id != f->reqid)		/* Expected id? */
-	return;			/* Nope, toss... */
-    if( !(f->callbacks->ackci? (*f->callbacks->ackci)(f, inp, len): (len == 0)) ){
+    if (id != f->reqid || f->seen_ack)		/* Expected id? */
+	return;					/* Nope, toss... */
+    if( !(f->callbacks->ackci? (*f->callbacks->ackci)(f, inp, len):
+	  (len == 0)) ){
 	/* Ack is bad - ignore it */
 	FSMDEBUG((LOG_INFO, "%s: received bad Ack (length %d)",
 		  PROTO_NAME(f), len));
 	return;
     }
+    f->seen_ack = 1;
 
     switch (f->state) {
     case CLOSED:
@@ -466,7 +468,7 @@ fsm_rconfack(f, id, inp, len)
 	break;
 
     case ACKRCVD:
-	/* Huh? an extra Ack? oh well... */
+	/* Huh? an extra valid Ack? oh well... */
 	fsm_sconfreq(f, 0);
 	f->state = REQSENT;
 	break;
@@ -505,15 +507,16 @@ fsm_rconfnakrej(f, code, id, inp, len)
     FSMDEBUG((LOG_INFO, "fsm_rconfnakrej(%s): Rcvd id %d.",
 	      PROTO_NAME(f), id));
 
-    if (id != f->reqid)		/* Expected id? */
-	return;			/* Nope, toss... */
+    if (id != f->reqid || f->seen_ack)	/* Expected id? */
+	return;				/* Nope, toss... */
     proc = (code == CONFNAK)? f->callbacks->nakci: f->callbacks->rejci;
-    if( !proc || !proc(f, inp, len) ){
+    if (!proc || !proc(f, inp, len)) {
 	/* Nak/reject is bad - ignore it */
 	FSMDEBUG((LOG_INFO, "%s: received bad %s (length %d)",
 		  PROTO_NAME(f), (code==CONFNAK? "Nak": "reject"), len));
 	return;
     }
+    f->seen_ack = 1;
 
     switch (f->state) {
     case CLOSED:
@@ -556,7 +559,6 @@ fsm_rtermreq(f, id)
     FSMDEBUG((LOG_INFO, "fsm_rtermreq(%s): Rcvd id %d.",
 	      PROTO_NAME(f), id));
 
-    fsm_sdata(f, TERMACK, id, NULL, 0);
     switch (f->state) {
     case ACKRCVD:
     case ACKSENT:
@@ -572,6 +574,8 @@ fsm_rtermreq(f, id)
 	TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
 	break;
     }
+
+    fsm_sdata(f, TERMACK, id, NULL, 0);
 }
 
 
@@ -711,14 +715,16 @@ fsm_sconfreq(f, retransmit)
 	f->reqid = ++f->id;
     }
 
+    f->seen_ack = 0;
+
     /*
      * Make up the request packet
      */
+    outp = outpacket_buf + PPP_HDRLEN + HEADERLEN;
     if( f->callbacks->cilen && f->callbacks->addci ){
 	cilen = (*f->callbacks->cilen)(f);
 	if( cilen > peer_mru[f->unit] - HEADERLEN )
 	    cilen = peer_mru[f->unit] - HEADERLEN;
-	outp = outpacket_buf + DLLHEADERLEN + HEADERLEN;
 	if (f->callbacks->addci)
 	    (*f->callbacks->addci)(f, outp, &cilen);
     } else
@@ -755,14 +761,14 @@ fsm_sdata(f, code, id, data, datalen)
     outp = outpacket_buf;
     if (datalen > peer_mru[f->unit] - HEADERLEN)
 	datalen = peer_mru[f->unit] - HEADERLEN;
-    if (datalen && data != outp + DLLHEADERLEN + HEADERLEN)
-	BCOPY(data, outp + DLLHEADERLEN + HEADERLEN, datalen);
+    if (datalen && data != outp + PPP_HDRLEN + HEADERLEN)
+	BCOPY(data, outp + PPP_HDRLEN + HEADERLEN, datalen);
     outlen = datalen + HEADERLEN;
     MAKEHEADER(outp, f->protocol);
     PUTCHAR(code, outp);
     PUTCHAR(id, outp);
     PUTSHORT(outlen, outp);
-    output(f->unit, outpacket_buf, outlen + DLLHEADERLEN);
+    output(f->unit, outpacket_buf, outlen + PPP_HDRLEN);
 
     FSMDEBUG((LOG_INFO, "fsm_sdata(%s): Sent code %d, id %d.",
 	      PROTO_NAME(f), code, id));