use strlcpy, strlcat, slprintf everywhere

[ppp.git] / pppd / fsm.c

diff --git a/pppd/fsm.c b/pppd/fsm.c
index 7f63e9fcd37d5d7093752c575bfe0d554cf45e10..879a1c107b595666b48884eca3a2de9b6587aa8f 100644 (file)
--- a/pppd/fsm.c
+++ b/pppd/fsm.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: fsm.c,v 1.12 1996/07/01 01:13:11 paulus Exp $";
+static char rcsid[] = "$Id: fsm.c,v 1.14 1999/03/12 06:07:16 paulus Exp $";
 #endif
 
 /*
@@ -35,9 +35,7 @@ static char rcsid[] = "$Id: fsm.c,v 1.12 1996/07/01 01:13:11 paulus Exp $";
 #include "pppd.h"
 #include "fsm.h"
 
-extern char *proto_name();
-
-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));
@@ -122,7 +120,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 +128,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:
@@ -213,7 +211,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 +219,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 +233,7 @@ fsm_close(f, reason)
  */
 static void
 fsm_timeout(arg)
-    caddr_t arg;
+    void *arg;
 {
     fsm *f = (fsm *) arg;
 
@@ -253,7 +251,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 +260,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);
@@ -420,7 +417,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 */
@@ -456,6 +453,7 @@ fsm_rconfack(f, id, inp, len)
     if( !(f->callbacks->ackci? (*f->callbacks->ackci)(f, inp, len):
          (len == 0)) ){
        /* Ack is bad - ignore it */
+       log_packet(inp, len, "Received bad configure-ack: ", LOG_ERR);
        FSMDEBUG((LOG_INFO, "%s: received bad Ack (length %d)",
                  PROTO_NAME(f), len));
        return;
@@ -475,13 +473,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)
@@ -509,7 +507,7 @@ 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.",
@@ -520,6 +518,7 @@ fsm_rconfnakrej(f, code, id, inp, len)
     proc = (code == CONFNAK)? f->callbacks->nakci: f->callbacks->rejci;
     if (!proc || !(ret = proc(f, inp, len))) {
        /* Nak/reject is bad - ignore it */
+       log_packet(inp, len, "Received bad configure-nak/rej: ", LOG_ERR);
        FSMDEBUG((LOG_INFO, "%s: received bad %s (length %d)",
                  PROTO_NAME(f), (code==CONFNAK? "Nak": "reject"), len));
        return;
@@ -535,7 +534,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
@@ -544,7 +543,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;
@@ -570,8 +569,6 @@ fsm_rtermreq(f, id, p, len)
     u_char *p;
     int len;
 {
-    char str[80];
-
     FSMDEBUG((LOG_INFO, "fsm_rtermreq(%s): Rcvd id %d.",
              PROTO_NAME(f), id));
 
@@ -583,15 +580,14 @@ fsm_rtermreq(f, id, p, len)
 
     case OPENED:
        if (len > 0) {
-           fmtmsg(str, sizeof(str), "%0.*v", len, p);
-           syslog(LOG_INFO, "%s terminated by peer (%s)", PROTO_NAME(f), str);
+           info("%s terminated by peer (%0.*v)", PROTO_NAME(f), len, p);
        } else
-           syslog(LOG_INFO, "%s terminated by peer", PROTO_NAME(f));
+           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;
     }
 
@@ -610,13 +606,13 @@ fsm_rtermack(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);
@@ -654,8 +650,7 @@ fsm_rcoderej(f, inp, len)
     }
     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;
@@ -673,7 +668,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;
@@ -685,7 +680,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;
@@ -701,7 +696,7 @@ 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;
@@ -758,7 +753,7 @@ fsm_sconfreq(f, retransmit)
 
     /* start the retransmit timer */
     --f->retransmits;
-    TIMEOUT(fsm_timeout, (caddr_t) f, f->timeouttime);
+    TIMEOUT(fsm_timeout, f, f->timeouttime);
 
     FSMDEBUG((LOG_INFO, "%s: sending Configure-Request, id %d",
              PROTO_NAME(f), f->reqid));