mod for Ultrix

[ppp.git] / pppd / fsm.c

diff --git a/pppd/fsm.c b/pppd/fsm.c
index 23d6773307474a4277045a284a5066584904d784..7f63e9fcd37d5d7093752c575bfe0d554cf45e10 100644 (file)
--- 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.12 1996/07/01 01:13:11 paulus Exp $";
 #endif
 
 /*
@@ -28,28 +28,27 @@ static char rcsid[] = "$Id: fsm.c,v 1.1 1993/11/11 03:54:25 paulus Exp $";
  */
 
 #include <stdio.h>
+#include <string.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, u_char *, 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[NUM_PPP];
 
 
 /*
@@ -68,6 +67,7 @@ fsm_init(f)
     f->maxconfreqtransmits = DEFMAXCONFREQS;
     f->maxtermtransmits = DEFMAXTERMREQS;
     f->maxnakloops = DEFMAXNAKLOOPS;
+    f->term_reason_len = 0;
 }
 
 
@@ -191,9 +191,12 @@ fsm_open(f)
  * the CLOSED state.
  */
 void
-fsm_close(f)
+fsm_close(f, reason)
     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;
@@ -216,7 +219,8 @@ fsm_close(f)
 
        /* 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;
 
@@ -247,7 +251,8 @@ fsm_timeout(arg)
                (*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;
        }
@@ -289,7 +294,7 @@ fsm_input(f, inpacket, l)
     u_char *inpacket;
     int l;
 {
-    u_char *inp, *outp;
+    u_char *inp;
     u_char code, id;
     int len;
 
@@ -342,7 +347,7 @@ fsm_input(f, inpacket, l)
        break;
     
     case TERMREQ:
-       fsm_rtermreq(f, id);
+       fsm_rtermreq(f, id, inp, len);
        break;
     
     case TERMACK:
@@ -372,7 +377,6 @@ fsm_rconfreq(f, id, inp, 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));
@@ -408,6 +412,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 +451,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 +474,8 @@ fsm_rconfack(f, id, inp, len)
        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;
@@ -501,19 +510,21 @@ fsm_rconfnakrej(f, code, id, inp, len)
     int len;
 {
     int (*proc)();
+    int ret;
 
     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 || !(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;
     }
+    f->seen_ack = 1;
 
     switch (f->state) {
     case CLOSED:
@@ -525,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 */
-       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... */
+       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */
        fsm_sconfreq(f, 0);
        f->state = REQSENT;
        break;
@@ -549,14 +564,17 @@ fsm_rconfnakrej(f, code, id, inp, len)
  * fsm_rtermreq - Receive Terminate-Req.
  */
 static void
-fsm_rtermreq(f, id)
+fsm_rtermreq(f, id, p, len)
     fsm *f;
     int id;
+    u_char *p;
+    int len;
 {
+    char str[80];
+
     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:
@@ -564,7 +582,11 @@ fsm_rtermreq(f, id)
        break;
 
     case OPENED:
-       syslog(LOG_INFO, "%s terminated at peer's request", PROTO_NAME(f));
+       if (len > 0) {
+           fmtmsg(str, sizeof(str), "%0.*v", len, p);
+           syslog(LOG_INFO, "%s terminated by peer (%s)", PROTO_NAME(f), str);
+       } else
+           syslog(LOG_INFO, "%s terminated by peer", PROTO_NAME(f));
        if (f->callbacks->down)
            (*f->callbacks->down)(f);   /* Inform upper layers */
        f->retransmits = 0;
@@ -572,6 +594,8 @@ fsm_rtermreq(f, id)
        TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
        break;
     }
+
+    fsm_sdata(f, TERMACK, id, NULL, 0);
 }
 
 
@@ -586,11 +610,13 @@ fsm_rtermack(f)
 
     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:
+       UNTIMEOUT(fsm_timeout, (caddr_t) f);
        f->state = STOPPED;
        if( f->callbacks->finished )
            (*f->callbacks->finished)(f);
@@ -673,7 +699,8 @@ fsm_protreject(f)
 
        /* 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;
 
@@ -696,7 +723,7 @@ fsm_sconfreq(f, retransmit)
     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 */
@@ -711,14 +738,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 +784,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));