Provide a way for CCP to go from req-sent to stopped state.

[ppp.git] / pppd / fsm.c

diff --git a/pppd/fsm.c b/pppd/fsm.c
index a11922a31df12448e8b3729614ca155c9b257f8a..4ac0cb6b8dddb878956631b246f5ef03c607551f 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.5 1994/09/21 06:47:37 paulus Exp $";
+static char rcsid[] = "$Id: fsm.c,v 1.9 1995/10/27 03:43:46 paulus Exp $";

 #endif
 
 /*
 #endif
 
 /*


@@ -28,6 +28,7 @@ static char rcsid[] = "$Id: fsm.c,v 1.5 1994/09/21 06:47:37 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>
 


@@ -47,7 +48,7 @@ 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[N_PPP];
+int peer_mru[NUM_PPP];

 
 
 /*
 
 
 /*


@@ -469,6 +470,7 @@ fsm_rconfack(f, id, inp, len)
 
     case ACKRCVD:
        /* Huh? an extra valid Ack? oh well... */
 
     case ACKRCVD:
        /* 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,6 +505,7 @@ 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));


@@ -510,7 +513,7 @@ fsm_rconfnakrej(f, code, id, inp, len)
     if (id != f->reqid || f->seen_ack) /* Expected id? */
        return;                         /* Nope, toss... */
     proc = (code == CONFNAK)? f->callbacks->nakci: f->callbacks->rejci;
     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 || !(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));
        /* Nak/reject is bad - ignore it */
        FSMDEBUG((LOG_INFO, "%s: received bad %s (length %d)",
                  PROTO_NAME(f), (code==CONFNAK? "Nak": "reject"), len));


@@ -528,11 +531,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 +597,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);