Fix the rcsid's for non-ansi compilers

[ppp.git] / pppd / fsm.c

diff --git a/pppd/fsm.c b/pppd/fsm.c
index a24c7c9116e23cb749a1b64e95ef2f42b49a8b65..b5b8148f9a2c5af079212f45193dc98d85963f53 100644 (file)
--- a/pppd/fsm.c
+++ b/pppd/fsm.c
@@ -17,9 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: fsm.c,v 1.10 1995/12/18 03:44:42 paulus Exp $";
-#endif
+#define RCSID  "$Id: fsm.c,v 1.17 1999/08/13 06:46:12 paulus Exp $"
 
 /*
  * TODO:
@@ -30,18 +28,17 @@ static char rcsid[] = "$Id: fsm.c,v 1.10 1995/12/18 03:44:42 paulus Exp $";
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <syslog.h>
 
 #include "pppd.h"
 #include "fsm.h"
 
-extern char *proto_name();
+static const char rcsid[] = RCSID;
 
-static void fsm_timeout __P((caddr_t));
+static void fsm_timeout __P((void *));
 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_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));
@@ -94,8 +91,7 @@ fsm_lowerup(f)
        break;
 
     default:
-       FSMDEBUG((LOG_INFO, "%s: Up event in state %d!",
-                 PROTO_NAME(f), f->state));
+       FSMDEBUG(("%s: Up event in state %d!", PROTO_NAME(f), f->state));
     }
 }
 
@@ -122,7 +118,7 @@ fsm_lowerdown(f)
 
     case CLOSING:
        f->state = INITIAL;
-       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */
+       UNTIMEOUT(fsm_timeout, f);      /* Cancel timeout */
        break;
 
     case STOPPING:
@@ -130,7 +126,7 @@ fsm_lowerdown(f)
     case ACKRCVD:
     case ACKSENT:
        f->state = STARTING;
-       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */
+       UNTIMEOUT(fsm_timeout, f);      /* Cancel timeout */
        break;
 
     case OPENED:
@@ -140,8 +136,7 @@ fsm_lowerdown(f)
        break;
 
     default:
-       FSMDEBUG((LOG_INFO, "%s: Down event in state %d!",
-                 PROTO_NAME(f), f->state));
+       FSMDEBUG(("%s: Down event in state %d!", PROTO_NAME(f), f->state));
     }
 }
 
@@ -213,7 +208,7 @@ fsm_close(f, reason)
     case ACKSENT:
     case OPENED:
        if( f->state != OPENED )
-           UNTIMEOUT(fsm_timeout, (caddr_t) f);        /* Cancel timeout */
+           UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
        else if( f->callbacks->down )
            (*f->callbacks->down)(f);   /* Inform upper layers we're down */
 
@@ -221,7 +216,7 @@ fsm_close(f, reason)
        f->retransmits = f->maxtermtransmits;
        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);
+       TIMEOUT(fsm_timeout, f, f->timeouttime);
        --f->retransmits;
 
        f->state = CLOSING;
@@ -235,7 +230,7 @@ fsm_close(f, reason)
  */
 static void
 fsm_timeout(arg)
-    caddr_t arg;
+    void *arg;
 {
     fsm *f = (fsm *) arg;
 
@@ -253,7 +248,7 @@ fsm_timeout(arg)
            /* Send Terminate-Request */
            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);
+           TIMEOUT(fsm_timeout, f, f->timeouttime);
            --f->retransmits;
        }
        break;
@@ -262,8 +257,7 @@ fsm_timeout(arg)
     case ACKRCVD:
     case ACKSENT:
        if (f->retransmits <= 0) {
-           syslog(LOG_WARNING, "%s: timeout sending Config-Requests",
-                  PROTO_NAME(f));
+           warn("%s: timeout sending Config-Requests\n", PROTO_NAME(f));
            f->state = STOPPED;
            if( (f->flags & OPT_PASSIVE) == 0 && f->callbacks->finished )
                (*f->callbacks->finished)(f);
@@ -279,8 +273,7 @@ fsm_timeout(arg)
        break;
 
     default:
-       FSMDEBUG((LOG_INFO, "%s: Timeout event in state %d!",
-                 PROTO_NAME(f), f->state));
+       FSMDEBUG(("%s: Timeout event in state %d!", PROTO_NAME(f), f->state));
     }
 }
 
@@ -294,7 +287,7 @@ fsm_input(f, inpacket, l)
     u_char *inpacket;
     int l;
 {
-    u_char *inp, *outp;
+    u_char *inp;
     u_char code, id;
     int len;
 
@@ -304,27 +297,24 @@ fsm_input(f, inpacket, l)
      */
     inp = inpacket;
     if (l < HEADERLEN) {
-       FSMDEBUG((LOG_WARNING, "fsm_input(%x): Rcvd short header.",
-                 f->protocol));
+       FSMDEBUG(("fsm_input(%x): Rcvd short header.", f->protocol));
        return;
     }
     GETCHAR(code, inp);
     GETCHAR(id, inp);
     GETSHORT(len, inp);
     if (len < HEADERLEN) {
-       FSMDEBUG((LOG_INFO, "fsm_input(%x): Rcvd illegal length.",
-                 f->protocol));
+       FSMDEBUG(("fsm_input(%x): Rcvd illegal length.", f->protocol));
        return;
     }
     if (len > l) {
-       FSMDEBUG((LOG_INFO, "fsm_input(%x): Rcvd short packet.",
-                 f->protocol));
+       FSMDEBUG(("fsm_input(%x): Rcvd short packet.", f->protocol));
        return;
     }
     len -= HEADERLEN;          /* subtract header length */
 
     if( f->state == INITIAL || f->state == STARTING ){
-       FSMDEBUG((LOG_INFO, "fsm_input(%x): Rcvd packet in state %d.",
+       FSMDEBUG(("fsm_input(%x): Rcvd packet in state %d.",
                  f->protocol, f->state));
        return;
     }
@@ -347,7 +337,7 @@ fsm_input(f, inpacket, l)
        break;
     
     case TERMREQ:
-       fsm_rtermreq(f, id);
+       fsm_rtermreq(f, id, inp, len);
        break;
     
     case TERMACK:
@@ -377,10 +367,8 @@ 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));
     switch( f->state ){
     case CLOSED:
        /* Go away, we're closed */
@@ -421,7 +409,7 @@ fsm_rconfreq(f, id, inp, len)
 
     if (code == CONFACK) {
        if (f->state == ACKRCVD) {
-           UNTIMEOUT(fsm_timeout, (caddr_t) f);        /* Cancel timeout */
+           UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
            f->state = OPENED;
            if (f->callbacks->up)
                (*f->callbacks->up)(f); /* Inform upper layers */
@@ -449,16 +437,12 @@ fsm_rconfack(f, id, inp, len)
     u_char *inp;
     int len;
 {
-    FSMDEBUG((LOG_INFO, "fsm_rconfack(%s): Rcvd id %d.",
-             PROTO_NAME(f), id));
-
     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));
+       error("Received bad configure-ack: %P", inp, len);
        return;
     }
     f->seen_ack = 1;
@@ -476,13 +460,13 @@ fsm_rconfack(f, id, inp, len)
 
     case ACKRCVD:
        /* Huh? an extra valid Ack? oh well... */
-       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */
+       UNTIMEOUT(fsm_timeout, f);      /* Cancel timeout */
        fsm_sconfreq(f, 0);
        f->state = REQSENT;
        break;
 
     case ACKSENT:
-       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */
+       UNTIMEOUT(fsm_timeout, f);      /* Cancel timeout */
        f->state = OPENED;
        f->retransmits = f->maxconfreqtransmits;
        if (f->callbacks->up)
@@ -510,19 +494,15 @@ fsm_rconfnakrej(f, code, id, inp, len)
     u_char *inp;
     int len;
 {
-    int (*proc)();
+    int (*proc) __P((fsm *, u_char *, int));
     int ret;
 
-    FSMDEBUG((LOG_INFO, "fsm_rconfnakrej(%s): Rcvd id %d.",
-             PROTO_NAME(f), id));
-
     if (id != f->reqid || f->seen_ack) /* Expected id? */
        return;                         /* Nope, toss... */
     proc = (code == CONFNAK)? f->callbacks->nakci: f->callbacks->rejci;
     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));
+       error("Received bad configure-nak/rej: %P", inp, len);
        return;
     }
     f->seen_ack = 1;
@@ -536,7 +516,7 @@ fsm_rconfnakrej(f, code, id, inp, len)
     case REQSENT:
     case ACKSENT:
        /* They didn't agree to what we wanted - try another request */
-       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */
+       UNTIMEOUT(fsm_timeout, f);      /* Cancel timeout */
        if (ret < 0)
            f->state = STOPPED;         /* kludge for stopping CCP */
        else
@@ -545,7 +525,7 @@ fsm_rconfnakrej(f, code, id, inp, len)
 
     case ACKRCVD:
        /* Got a Nak/reject when we had already had an Ack?? oh well... */
-       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */
+       UNTIMEOUT(fsm_timeout, f);      /* Cancel timeout */
        fsm_sconfreq(f, 0);
        f->state = REQSENT;
        break;
@@ -565,13 +545,12 @@ 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;
 {
-    FSMDEBUG((LOG_INFO, "fsm_rtermreq(%s): Rcvd id %d.",
-             PROTO_NAME(f), id));
-
     switch (f->state) {
     case ACKRCVD:
     case ACKSENT:
@@ -579,12 +558,15 @@ fsm_rtermreq(f, id)
        break;
 
     case OPENED:
-       syslog(LOG_INFO, "%s terminated at peer's request", PROTO_NAME(f));
+       if (len > 0) {
+           info("%s terminated by peer (%0.*v)", PROTO_NAME(f), len, p);
+       } else
+           info("%s terminated by peer", PROTO_NAME(f));
        if (f->callbacks->down)
            (*f->callbacks->down)(f);   /* Inform upper layers */
        f->retransmits = 0;
        f->state = STOPPING;
-       TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
+       TIMEOUT(fsm_timeout, f, f->timeouttime);
        break;
     }
 
@@ -599,17 +581,15 @@ static void
 fsm_rtermack(f)
     fsm *f;
 {
-    FSMDEBUG((LOG_INFO, "fsm_rtermack(%s).", PROTO_NAME(f)));
-
     switch (f->state) {
     case CLOSING:
-       UNTIMEOUT(fsm_timeout, (caddr_t) f);
+       UNTIMEOUT(fsm_timeout, f);
        f->state = CLOSED;
        if( f->callbacks->finished )
            (*f->callbacks->finished)(f);
        break;
     case STOPPING:
-       UNTIMEOUT(fsm_timeout, (caddr_t) f);
+       UNTIMEOUT(fsm_timeout, f);
        f->state = STOPPED;
        if( f->callbacks->finished )
            (*f->callbacks->finished)(f);
@@ -639,16 +619,13 @@ fsm_rcoderej(f, inp, len)
 {
     u_char code, id;
 
-    FSMDEBUG((LOG_INFO, "fsm_rcoderej(%s).", PROTO_NAME(f)));
-
     if (len < HEADERLEN) {
-       FSMDEBUG((LOG_INFO, "fsm_rcoderej: Rcvd short Code-Reject packet!"));
+       FSMDEBUG(("fsm_rcoderej: Rcvd short Code-Reject packet!"));
        return;
     }
     GETCHAR(code, inp);
     GETCHAR(id, inp);
-    syslog(LOG_WARNING, "%s: Rcvd Code-Reject for code %d, id %d",
-          PROTO_NAME(f), code, id);
+    warn("%s: Rcvd Code-Reject for code %d, id %d", PROTO_NAME(f), code, id);
 
     if( f->state == ACKRCVD )
        f->state = REQSENT;
@@ -666,7 +643,7 @@ fsm_protreject(f)
 {
     switch( f->state ){
     case CLOSING:
-       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */
+       UNTIMEOUT(fsm_timeout, f);      /* Cancel timeout */
        /* fall through */
     case CLOSED:
        f->state = CLOSED;
@@ -678,7 +655,7 @@ fsm_protreject(f)
     case REQSENT:
     case ACKRCVD:
     case ACKSENT:
-       UNTIMEOUT(fsm_timeout, (caddr_t) f);    /* Cancel timeout */
+       UNTIMEOUT(fsm_timeout, f);      /* Cancel timeout */
        /* fall through */
     case STOPPED:
        f->state = STOPPED;
@@ -694,14 +671,14 @@ fsm_protreject(f)
        f->retransmits = f->maxtermtransmits;
        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);
+       TIMEOUT(fsm_timeout, f, f->timeouttime);
        --f->retransmits;
 
        f->state = STOPPING;
        break;
 
     default:
-       FSMDEBUG((LOG_INFO, "%s: Protocol-reject event in state %d!",
+       FSMDEBUG(("%s: Protocol-reject event in state %d!",
                  PROTO_NAME(f), f->state));
     }
 }
@@ -716,7 +693,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 */
@@ -751,10 +728,7 @@ fsm_sconfreq(f, retransmit)
 
     /* start the retransmit timer */
     --f->retransmits;
-    TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
-
-    FSMDEBUG((LOG_INFO, "%s: sending Configure-Request, id %d",
-             PROTO_NAME(f), f->reqid));
+    TIMEOUT(fsm_timeout, f, f->timeouttime);
 }
 
 
@@ -785,7 +759,4 @@ fsm_sdata(f, code, id, data, datalen)
     PUTCHAR(id, outp);
     PUTSHORT(outlen, outp);
     output(f->unit, outpacket_buf, outlen + PPP_HDRLEN);
-
-    FSMDEBUG((LOG_INFO, "fsm_sdata(%s): Sent code %d, id %d.",
-             PROTO_NAME(f), code, id));
 }