describe new options, don't describe obsolete ones

[ppp.git] / pppd / fsm.c

diff --git a/pppd/fsm.c b/pppd/fsm.c
index 902ad64cbbc2733132ef69b3571fb3de20e441f6..14e4aafad222502aae007645fcb8e36016914920 100644 (file)
--- a/pppd/fsm.c
+++ b/pppd/fsm.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: fsm.c,v 1.3 1994/05/24 11:21:10 paulus Exp $";
+static char rcsid[] = "$Id: fsm.c,v 1.11 1996/04/04 03:37:01 paulus Exp $";

 #endif
 
 /*
 #endif
 
 /*


@@ -28,27 +28,27 @@ static char rcsid[] = "$Id: fsm.c,v 1.3 1994/05/24 11:21:10 paulus Exp $";
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

+#include <string.h>

 #include <sys/types.h>
 #include <syslog.h>
 
 #include <sys/types.h>
 #include <syslog.h>
 

-#include "ppp.h"

 #include "pppd.h"
 #include "fsm.h"
 
 extern char *proto_name();
 
 #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)
 
 
 #define PROTO_NAME(f)  ((f)->callbacks->proto_name)
 

-int peer_mru[NPPP];
+int peer_mru[NUM_PPP];

 
 
 /*
 
 
 /*


@@ -67,6 +67,7 @@ fsm_init(f)
     f->maxconfreqtransmits = DEFMAXCONFREQS;
     f->maxtermtransmits = DEFMAXTERMREQS;
     f->maxnakloops = DEFMAXNAKLOOPS;
     f->maxconfreqtransmits = DEFMAXCONFREQS;
     f->maxtermtransmits = DEFMAXTERMREQS;
     f->maxnakloops = DEFMAXNAKLOOPS;

+    f->term_reason_len = 0;

 }
 
 
 }
 
 


@@ -190,9 +191,12 @@ fsm_open(f)
  * the CLOSED state.
  */
 void
  * the CLOSED state.
  */
 void

-fsm_close(f)
+fsm_close(f, reason)

     fsm *f;
     fsm *f;

+    char *reason;

 {
 {

+    f->term_reason = reason;
+    f->term_reason_len = (reason == NULL? 0: strlen(reason));

     switch( f->state ){
     case STARTING:
        f->state = INITIAL;
     switch( f->state ){
     case STARTING:
        f->state = INITIAL;


@@ -215,7 +219,8 @@ fsm_close(f)
 
        /* Init restart counter, send Terminate-Request */
        f->retransmits = f->maxtermtransmits;
 
        /* Init restart counter, send Terminate-Request */
        f->retransmits = f->maxtermtransmits;

-       fsm_sdata(f, TERMREQ, f->reqid = ++f->id, NULL, 0);
+       fsm_sdata(f, TERMREQ, f->reqid = ++f->id,
+                 (u_char *) f->term_reason, f->term_reason_len);

        TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
        --f->retransmits;
 
        TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
        --f->retransmits;
 


@@ -246,7 +251,8 @@ fsm_timeout(arg)
                (*f->callbacks->finished)(f);
        } else {
            /* Send Terminate-Request */
                (*f->callbacks->finished)(f);
        } else {
            /* Send Terminate-Request */

-           fsm_sdata(f, TERMREQ, f->reqid = ++f->id, NULL, 0);
+           fsm_sdata(f, TERMREQ, f->reqid = ++f->id,
+                     (u_char *) f->term_reason, f->term_reason_len);

            TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
            --f->retransmits;
        }
            TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
            --f->retransmits;
        }


@@ -288,7 +294,7 @@ fsm_input(f, inpacket, l)
     u_char *inpacket;
     int l;
 {
     u_char *inpacket;
     int l;
 {

-    u_char *inp, *outp;
+    u_char *inp;

     u_char code, id;
     int len;
 
     u_char code, id;
     int len;
 


@@ -371,7 +377,6 @@ fsm_rconfreq(f, id, inp, len)
     u_char *inp;
     int len;
 {
     u_char *inp;
     int len;
 {

-    u_char *outp;

     int code, reject_if_disagree;
 
     FSMDEBUG((LOG_INFO, "fsm_rconfreq(%s): Rcvd id %d.", PROTO_NAME(f), id));
     int code, reject_if_disagree;
 
     FSMDEBUG((LOG_INFO, "fsm_rconfreq(%s): Rcvd id %d.", PROTO_NAME(f), id));


@@ -446,15 +451,16 @@ fsm_rconfack(f, id, inp, len)
     FSMDEBUG((LOG_INFO, "fsm_rconfack(%s): Rcvd id %d.",
              PROTO_NAME(f), id));
 
     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;
     }
        /* Ack is bad - ignore it */
        FSMDEBUG((LOG_INFO, "%s: received bad Ack (length %d)",
                  PROTO_NAME(f), len));
        return;
     }

-    f->reqid = -1;
+    f->seen_ack = 1;

 
     switch (f->state) {
     case CLOSED:
 
     switch (f->state) {
     case CLOSED:


@@ -468,7 +474,8 @@ fsm_rconfack(f, id, inp, len)
        break;
 
     case ACKRCVD:
        break;
 
     case ACKRCVD:

-       /* Huh? an extra Ack? oh well... */
+       /* Huh? an extra valid Ack? oh well... */
+       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */

        fsm_sconfreq(f, 0);
        f->state = REQSENT;
        break;
        fsm_sconfreq(f, 0);
        f->state = REQSENT;
        break;


@@ -503,20 +510,21 @@ fsm_rconfnakrej(f, code, id, inp, len)
     int len;
 {
     int (*proc)();
     int len;
 {
     int (*proc)();

+    int ret;

 
     FSMDEBUG((LOG_INFO, "fsm_rconfnakrej(%s): Rcvd id %d.",
              PROTO_NAME(f), id));
 
 
     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;
     proc = (code == CONFNAK)? f->callbacks->nakci: f->callbacks->rejci;

-    if( !proc || !proc(f, inp, len) ){
+    if (!proc || !(ret = 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;
     }
        /* 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->reqid = -1;
+    f->seen_ack = 1;

 
     switch (f->state) {
     case CLOSED:
 
     switch (f->state) {
     case CLOSED:


@@ -528,11 +536,15 @@ fsm_rconfnakrej(f, code, id, inp, len)
     case ACKSENT:
        /* They didn't agree to what we wanted - try another request */
        UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */
     case ACKSENT:
        /* They didn't agree to what we wanted - try another request */
        UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */

-       fsm_sconfreq(f, 0);             /* Send Configure-Request */
+       if (ret < 0)
+           f->state = STOPPED;         /* kludge for stopping CCP */
+       else
+           fsm_sconfreq(f, 0);         /* Send Configure-Request */

        break;
 
     case ACKRCVD:
        /* Got a Nak/reject when we had already had an Ack?? oh well... */
        break;
 
     case ACKRCVD:
        /* Got a Nak/reject when we had already had an Ack?? oh well... */

+       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */

        fsm_sconfreq(f, 0);
        f->state = REQSENT;
        break;
        fsm_sconfreq(f, 0);
        f->state = REQSENT;
        break;


@@ -590,11 +602,13 @@ fsm_rtermack(f)
 
     switch (f->state) {
     case CLOSING:
 
     switch (f->state) {
     case CLOSING:

+       UNTIMEOUT(fsm_timeout, (caddr_t) f);

        f->state = CLOSED;
        if( f->callbacks->finished )
            (*f->callbacks->finished)(f);
        break;
     case STOPPING:
        f->state = CLOSED;
        if( f->callbacks->finished )
            (*f->callbacks->finished)(f);
        break;
     case STOPPING:

+       UNTIMEOUT(fsm_timeout, (caddr_t) f);

        f->state = STOPPED;
        if( f->callbacks->finished )
            (*f->callbacks->finished)(f);
        f->state = STOPPED;
        if( f->callbacks->finished )
            (*f->callbacks->finished)(f);


@@ -677,7 +691,8 @@ fsm_protreject(f)
 
        /* Init restart counter, send Terminate-Request */
        f->retransmits = f->maxtermtransmits;
 
        /* Init restart counter, send Terminate-Request */
        f->retransmits = f->maxtermtransmits;

-       fsm_sdata(f, TERMREQ, f->reqid = ++f->id, NULL, 0);
+       fsm_sdata(f, TERMREQ, f->reqid = ++f->id,
+                 (u_char *) f->term_reason, f->term_reason_len);

        TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
        --f->retransmits;
 
        TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
        --f->retransmits;
 


@@ -700,7 +715,7 @@ fsm_sconfreq(f, retransmit)
     int retransmit;
 {
     u_char *outp;
     int retransmit;
 {
     u_char *outp;

-    int outlen, cilen;
+    int cilen;

 
     if( f->state != REQSENT && f->state != ACKRCVD && f->state != ACKSENT ){
        /* Not currently negotiating - reset options */
 
     if( f->state != REQSENT && f->state != ACKRCVD && f->state != ACKSENT ){
        /* Not currently negotiating - reset options */


@@ -715,10 +730,12 @@ fsm_sconfreq(f, retransmit)
        f->reqid = ++f->id;
     }
 
        f->reqid = ++f->id;
     }
 

+    f->seen_ack = 0;
+

     /*
      * Make up the request packet
      */
     /*
      * Make up the request packet
      */

-    outp = outpacket_buf + DLLHEADERLEN + HEADERLEN;
+    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 )
     if( f->callbacks->cilen && f->callbacks->addci ){
        cilen = (*f->callbacks->cilen)(f);
        if( cilen > peer_mru[f->unit] - HEADERLEN )


@@ -759,14 +776,14 @@ fsm_sdata(f, code, id, data, datalen)
     outp = outpacket_buf;
     if (datalen > peer_mru[f->unit] - HEADERLEN)
        datalen = peer_mru[f->unit] - HEADERLEN;
     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);
     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));
 
     FSMDEBUG((LOG_INFO, "fsm_sdata(%s): Sent code %d, id %d.",
              PROTO_NAME(f), code, id));