N_PPP ->NUM_PPP

[ppp.git] / pppd / chap.c

diff --git a/pppd/chap.c b/pppd/chap.c
index 043dad9d00987cf5e61b93528940ed16cb5160a6..a0400b9348c44aaf7823865ab120532a11f88e9f 100644 (file)
--- a/pppd/chap.c
+++ b/pppd/chap.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: chap.c,v 1.2 1994/04/11 07:13:44 paulus Exp $";
+static char rcsid[] = "$Id: chap.c,v 1.6 1994/10/24 04:31:11 paulus Exp $";
 #endif
 
 /*
@@ -27,30 +27,30 @@ static char rcsid[] = "$Id: chap.c,v 1.2 1994/04/11 07:13:44 paulus Exp $";
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <syslog.h>
 
-#include "ppp.h"
 #include "pppd.h"
 #include "chap.h"
 #include "md5.h"
 
-chap_state chap[NPPP];         /* CHAP state; one for each unit */
+chap_state chap[NUM_PPP];              /* CHAP state; one for each unit */
 
-static void ChapChallengeTimeout __ARGS((caddr_t));
-static void ChapResponseTimeout __ARGS((caddr_t));
-static void ChapReceiveChallenge __ARGS((chap_state *, u_char *, int, int));
-static void ChapReceiveResponse __ARGS((chap_state *, u_char *, int, int));
-static void ChapReceiveSuccess __ARGS((chap_state *, u_char *, int, int));
-static void ChapReceiveFailure __ARGS((chap_state *, u_char *, int, int));
-static void ChapSendStatus __ARGS((chap_state *, int));
-static void ChapSendChallenge __ARGS((chap_state *));
-static void ChapSendResponse __ARGS((chap_state *));
-static void ChapGenChallenge __ARGS((chap_state *));
+static void ChapChallengeTimeout __P((caddr_t));
+static void ChapResponseTimeout __P((caddr_t));
+static void ChapReceiveChallenge __P((chap_state *, u_char *, int, int));
+static void ChapReceiveResponse __P((chap_state *, u_char *, int, int));
+static void ChapReceiveSuccess __P((chap_state *, u_char *, int, int));
+static void ChapReceiveFailure __P((chap_state *, u_char *, int, int));
+static void ChapSendStatus __P((chap_state *, int));
+static void ChapSendChallenge __P((chap_state *));
+static void ChapSendResponse __P((chap_state *));
+static void ChapGenChallenge __P((chap_state *));
 
-extern double drand48 __ARGS((void));
-extern void srand48 __ARGS((long));
+extern double drand48 __P((void));
+extern void srand48 __P((long));
 
 /*
  * ChapInit - Initialize a CHAP unit.
@@ -148,7 +148,7 @@ ChapChallengeTimeout(arg)
        /* give up on peer */
        syslog(LOG_ERR, "Peer failed to respond to CHAP challenge");
        cstate->serverstate = CHAPSS_BADAUTH;
-       auth_peer_fail(cstate->unit, CHAP);
+       auth_peer_fail(cstate->unit, PPP_CHAP);
        return;
     }
 
@@ -258,10 +258,10 @@ ChapProtocolReject(unit)
 
     if (cstate->serverstate != CHAPSS_INITIAL &&
        cstate->serverstate != CHAPSS_CLOSED)
-       auth_peer_fail(unit, CHAP);
+       auth_peer_fail(unit, PPP_CHAP);
     if (cstate->clientstate != CHAPCS_INITIAL &&
        cstate->clientstate != CHAPCS_CLOSED)
-       auth_withpeer_fail(unit, CHAP);
+       auth_withpeer_fail(unit, PPP_CHAP);
     ChapLowerDown(unit);               /* shutdown chap */
 }
 
@@ -521,7 +521,7 @@ ChapReceiveResponse(cstate, inp, id, len)
        old_state = cstate->serverstate;
        cstate->serverstate = CHAPSS_OPEN;
        if (old_state == CHAPSS_INITIAL_CHAL) {
-           auth_peer_success(cstate->unit, CHAP);
+           auth_peer_success(cstate->unit, PPP_CHAP);
        }
        if (cstate->chal_interval != 0)
            TIMEOUT(ChapRechallenge, (caddr_t) cstate, cstate->chal_interval);
@@ -529,7 +529,7 @@ ChapReceiveResponse(cstate, inp, id, len)
     } else {
        syslog(LOG_ERR, "CHAP peer authentication failed");
        cstate->serverstate = CHAPSS_BADAUTH;
-       auth_peer_fail(cstate->unit, CHAP);
+       auth_peer_fail(cstate->unit, PPP_CHAP);
     }
 }
 
@@ -557,6 +557,8 @@ ChapReceiveSuccess(cstate, inp, id, len)
        return;
     }
 
+    UNTIMEOUT(ChapResponseTimeout, (caddr_t) cstate);
+
     /*
      * Print message.
      */
@@ -565,7 +567,7 @@ ChapReceiveSuccess(cstate, inp, id, len)
 
     cstate->clientstate = CHAPCS_OPEN;
 
-    auth_withpeer_success(cstate->unit, CHAP);
+    auth_withpeer_success(cstate->unit, PPP_CHAP);
 }
 
 
@@ -591,6 +593,8 @@ ChapReceiveFailure(cstate, inp, id, len)
        return;
     }
 
+    UNTIMEOUT(ChapResponseTimeout, (caddr_t) cstate);
+
     /*
      * Print message.
      */
@@ -598,7 +602,7 @@ ChapReceiveFailure(cstate, inp, id, len)
        PRINTMSG(inp, len);
 
     syslog(LOG_ERR, "CHAP authentication failed");
-    auth_withpeer_fail(cstate->unit, CHAP);
+    auth_withpeer_fail(cstate->unit, PPP_CHAP);
 }
 
 
@@ -618,7 +622,7 @@ ChapSendChallenge(cstate)
     outlen = CHAP_HEADERLEN + sizeof (u_char) + chal_len + name_len;
     outp = outpacket_buf;
 
-    MAKEHEADER(outp, CHAP);            /* paste in a CHAP header */
+    MAKEHEADER(outp, PPP_CHAP);                /* paste in a CHAP header */
 
     PUTCHAR(CHAP_CHALLENGE, outp);
     PUTCHAR(cstate->chal_id, outp);
@@ -630,7 +634,7 @@ ChapSendChallenge(cstate)
 
     BCOPY(cstate->chal_name, outp, name_len);  /* append hostname */
 
-    output(cstate->unit, outpacket_buf, outlen + DLLHEADERLEN);
+    output(cstate->unit, outpacket_buf, outlen + PPP_HDRLEN);
   
     CHAPDEBUG((LOG_INFO, "ChapSendChallenge: Sent id %d.", cstate->chal_id));
 
@@ -660,13 +664,13 @@ ChapSendStatus(cstate, code)
     outlen = CHAP_HEADERLEN + msglen;
     outp = outpacket_buf;
 
-    MAKEHEADER(outp, CHAP);    /* paste in a header */
+    MAKEHEADER(outp, PPP_CHAP);        /* paste in a header */
   
     PUTCHAR(code, outp);
     PUTCHAR(cstate->chal_id, outp);
     PUTSHORT(outlen, outp);
     BCOPY(msg, outp, msglen);
-    output(cstate->unit, outpacket_buf, outlen + DLLHEADERLEN);
+    output(cstate->unit, outpacket_buf, outlen + PPP_HDRLEN);
   
     CHAPDEBUG((LOG_INFO, "ChapSendStatus: Sent code %d, id %d.", code,
               cstate->chal_id));
@@ -718,7 +722,7 @@ ChapSendResponse(cstate)
     outlen = CHAP_HEADERLEN + sizeof (u_char) + md_len + name_len;
     outp = outpacket_buf;
 
-    MAKEHEADER(outp, CHAP);
+    MAKEHEADER(outp, PPP_CHAP);
 
     PUTCHAR(CHAP_RESPONSE, outp);      /* we are a response */
     PUTCHAR(cstate->resp_id, outp);    /* copy id from challenge packet */
@@ -731,7 +735,7 @@ ChapSendResponse(cstate)
     BCOPY(cstate->resp_name, outp, name_len); /* append our name */
 
     /* send the packet */
-    output(cstate->unit, outpacket_buf, outlen + DLLHEADERLEN);
+    output(cstate->unit, outpacket_buf, outlen + PPP_HDRLEN);
 
     cstate->clientstate = CHAPCS_RESPONSE;
     TIMEOUT(ChapResponseTimeout, (caddr_t) cstate, cstate->timeouttime);
@@ -749,7 +753,7 @@ int
 ChapPrintPkt(p, plen, printer, arg)
     u_char *p;
     int plen;
-    void (*printer) __ARGS((void *, char *, ...));
+    void (*printer) __P((void *, char *, ...));
     void *arg;
 {
     int code, id, len;