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 ea8de821610a8cb2abc8a487333221dfeca1b7ba..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.4 1994/09/01 00:14:03 paulus Exp $";
+static char rcsid[] = "$Id: fsm.c,v 1.9 1995/10/27 03:43:46 paulus Exp $";

 #endif
 
 /*
 #endif
 
 /*


@@ -28,27 +28,27 @@ static char rcsid[] = "$Id: fsm.c,v 1.4 1994/09/01 00:14:03 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];

 
 
 /*
 
 
 /*


@@ -470,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;


@@ -504,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));


@@ -511,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));


@@ -529,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;


@@ -591,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);


@@ -721,7 +729,7 @@ fsm_sconfreq(f, retransmit)
     /*
      * 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 )


@@ -762,14 +770,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));