mods to get it to compile better on linux

[ppp.git] / pppd / upap.c

diff --git a/pppd/upap.c b/pppd/upap.c
index 2492596da373eeab28a04d9189f7755c2bcabfdf..c4ffb401cedc8154cd44ec0e0c767bdb5b75ae6e 100644 (file)
--- a/pppd/upap.c
+++ b/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: upap.c,v 1.8 1996/01/01 22:55:29 paulus Exp $";
+static char rcsid[] = "$Id: upap.c,v 1.11 1997/04/30 05:59:56 paulus Exp $";
 #endif
 
 /*
@@ -34,16 +34,39 @@ static char rcsid[] = "$Id: upap.c,v 1.8 1996/01/01 22:55:29 paulus Exp $";
 #include "pppd.h"
 #include "upap.h"
 
+/*
+ * Protocol entry points.
+ */
+static void upap_init __P((int));
+static void upap_lowerup __P((int));
+static void upap_lowerdown __P((int));
+static void upap_input __P((int, u_char *, int));
+static void upap_protrej __P((int));
+static int  upap_printpkt __P((u_char *, int,
+                              void (*) __P((void *, char *, ...)), void *));
+
 struct protent pap_protent = {
-    PPP_PAP, upap_init, upap_input, upap_protrej,
-    upap_lowerup, upap_lowerdown, NULL, NULL,
-    upap_printpkt, NULL, 1, "PAP", NULL, NULL
+    PPP_PAP,
+    upap_init,
+    upap_input,
+    upap_protrej,
+    upap_lowerup,
+    upap_lowerdown,
+    NULL,
+    NULL,
+    upap_printpkt,
+    NULL,
+    1,
+    "PAP",
+    NULL,
+    NULL,
+    NULL
 };
 
 upap_state upap[NUM_PPP];              /* UPAP state; one for each unit */
 
-static void upap_timeout __P((caddr_t));
-static void upap_reqtimeout __P((caddr_t));
+static void upap_timeout __P((void *));
+static void upap_reqtimeout __P((void *));
 static void upap_rauthreq __P((upap_state *, u_char *, int, int));
 static void upap_rauthack __P((upap_state *, u_char *, int, int));
 static void upap_rauthnak __P((upap_state *, u_char *, int, int));
@@ -54,7 +77,7 @@ static void upap_sresp __P((upap_state *, int, int, char *, int));
 /*
  * upap_init - Initialize a UPAP unit.
  */
-void
+static void
 upap_init(unit)
     int unit;
 {
@@ -124,7 +147,7 @@ upap_authpeer(unit)
 
     u->us_serverstate = UPAPSS_LISTEN;
     if (u->us_reqtimeout > 0)
-       TIMEOUT(upap_reqtimeout, (caddr_t) u, u->us_reqtimeout);
+       TIMEOUT(upap_reqtimeout, u, u->us_reqtimeout);
 }
 
 
@@ -133,7 +156,7 @@ upap_authpeer(unit)
  */
 static void
 upap_timeout(arg)
-    caddr_t arg;
+    void *arg;
 {
     upap_state *u = (upap_state *) arg;
 
@@ -157,7 +180,7 @@ upap_timeout(arg)
  */
 static void
 upap_reqtimeout(arg)
-    caddr_t arg;
+    void *arg;
 {
     upap_state *u = (upap_state *) arg;
 
@@ -174,7 +197,7 @@ upap_reqtimeout(arg)
  *
  * Start authenticating if pending.
  */
-void
+static void
 upap_lowerup(unit)
     int unit;
 {
@@ -191,7 +214,7 @@ upap_lowerup(unit)
     else if (u->us_serverstate == UPAPSS_PENDING) {
        u->us_serverstate = UPAPSS_LISTEN;
        if (u->us_reqtimeout > 0)
-           TIMEOUT(upap_reqtimeout, (caddr_t) u, u->us_reqtimeout);
+           TIMEOUT(upap_reqtimeout, u, u->us_reqtimeout);
     }
 }
 
@@ -201,16 +224,16 @@ upap_lowerup(unit)
  *
  * Cancel all timeouts.
  */
-void
+static void
 upap_lowerdown(unit)
     int unit;
 {
     upap_state *u = &upap[unit];
 
     if (u->us_clientstate == UPAPCS_AUTHREQ)   /* Timeout pending? */
-       UNTIMEOUT(upap_timeout, (caddr_t) u);   /* Cancel timeout */
+       UNTIMEOUT(upap_timeout, u);             /* Cancel timeout */
     if (u->us_serverstate == UPAPSS_LISTEN && u->us_reqtimeout > 0)
-       UNTIMEOUT(upap_reqtimeout, (caddr_t) u);
+       UNTIMEOUT(upap_reqtimeout, u);
 
     u->us_clientstate = UPAPCS_INITIAL;
     u->us_serverstate = UPAPSS_INITIAL;
@@ -222,7 +245,7 @@ upap_lowerdown(unit)
  *
  * This shouldn't happen.  In any case, pretend lower layer went down.
  */
-void
+static void
 upap_protrej(unit)
     int unit;
 {
@@ -243,7 +266,7 @@ upap_protrej(unit)
 /*
  * upap_input - Input UPAP packet.
  */
-void
+static void
 upap_input(unit, inpacket, l)
     int unit;
     u_char *inpacket;
@@ -260,18 +283,18 @@ upap_input(unit, inpacket, l)
      */
     inp = inpacket;
     if (l < UPAP_HEADERLEN) {
-       UPAPDEBUG((LOG_INFO, "upap_input: rcvd short header."));
+       UPAPDEBUG((LOG_INFO, "pap_input: rcvd short header."));
        return;
     }
     GETCHAR(code, inp);
     GETCHAR(id, inp);
     GETSHORT(len, inp);
     if (len < UPAP_HEADERLEN) {
-       UPAPDEBUG((LOG_INFO, "upap_input: rcvd illegal length."));
+       UPAPDEBUG((LOG_INFO, "pap_input: rcvd illegal length."));
        return;
     }
     if (len > l) {
-       UPAPDEBUG((LOG_INFO, "upap_input: rcvd short packet."));
+       UPAPDEBUG((LOG_INFO, "pap_input: rcvd short packet."));
        return;
     }
     len -= UPAP_HEADERLEN;
@@ -314,7 +337,7 @@ upap_rauthreq(u, inp, id, len)
     char *msg;
     int msglen;
 
-    UPAPDEBUG((LOG_INFO, "upap_rauth: Rcvd id %d.", id));
+    UPAPDEBUG((LOG_INFO, "pap_rauth: Rcvd id %d.", id));
 
     if (u->us_serverstate < UPAPSS_LISTEN)
        return;
@@ -336,20 +359,20 @@ upap_rauthreq(u, inp, id, len)
      * Parse user/passwd.
      */
     if (len < sizeof (u_char)) {
-       UPAPDEBUG((LOG_INFO, "upap_rauth: rcvd short packet."));
+       UPAPDEBUG((LOG_INFO, "pap_rauth: rcvd short packet."));
        return;
     }
     GETCHAR(ruserlen, inp);
     len -= sizeof (u_char) + ruserlen + sizeof (u_char);
     if (len < 0) {
-       UPAPDEBUG((LOG_INFO, "upap_rauth: rcvd short packet."));
+       UPAPDEBUG((LOG_INFO, "pap_rauth: rcvd short packet."));
        return;
     }
     ruser = (char *) inp;
     INCPTR(ruserlen, inp);
     GETCHAR(rpasswdlen, inp);
     if (len < rpasswdlen) {
-       UPAPDEBUG((LOG_INFO, "upap_rauth: rcvd short packet."));
+       UPAPDEBUG((LOG_INFO, "pap_rauth: rcvd short packet."));
        return;
     }
     rpasswd = (char *) inp;
@@ -359,19 +382,20 @@ upap_rauthreq(u, inp, id, len)
      */
     retcode = check_passwd(u->us_unit, ruser, ruserlen, rpasswd,
                           rpasswdlen, &msg, &msglen);
+    BZERO(rpasswd, rpasswdlen);
 
     upap_sresp(u, retcode, id, msg, msglen);
 
     if (retcode == UPAP_AUTHACK) {
        u->us_serverstate = UPAPSS_OPEN;
-       auth_peer_success(u->us_unit, PPP_PAP);
+       auth_peer_success(u->us_unit, PPP_PAP, ruser, ruserlen);
     } else {
        u->us_serverstate = UPAPSS_BADAUTH;
        auth_peer_fail(u->us_unit, PPP_PAP);
     }
 
     if (u->us_reqtimeout > 0)
-       UNTIMEOUT(upap_reqtimeout, (caddr_t) u);
+       UNTIMEOUT(upap_reqtimeout, u);
 }
 
 
@@ -388,7 +412,7 @@ upap_rauthack(u, inp, id, len)
     u_char msglen;
     char *msg;
 
-    UPAPDEBUG((LOG_INFO, "upap_rauthack: Rcvd id %d.", id));
+    UPAPDEBUG((LOG_INFO, "pap_rauthack: Rcvd id %d.", id));
     if (u->us_clientstate != UPAPCS_AUTHREQ) /* XXX */
        return;
 
@@ -396,13 +420,13 @@ upap_rauthack(u, inp, id, len)
      * Parse message.
      */
     if (len < sizeof (u_char)) {
-       UPAPDEBUG((LOG_INFO, "upap_rauthack: rcvd short packet."));
+       UPAPDEBUG((LOG_INFO, "pap_rauthack: rcvd short packet."));
        return;
     }
     GETCHAR(msglen, inp);
     len -= sizeof (u_char);
     if (len < msglen) {
-       UPAPDEBUG((LOG_INFO, "upap_rauthack: rcvd short packet."));
+       UPAPDEBUG((LOG_INFO, "pap_rauthack: rcvd short packet."));
        return;
     }
     msg = (char *) inp;
@@ -427,7 +451,7 @@ upap_rauthnak(u, inp, id, len)
     u_char msglen;
     char *msg;
 
-    UPAPDEBUG((LOG_INFO, "upap_rauthnak: Rcvd id %d.", id));
+    UPAPDEBUG((LOG_INFO, "pap_rauthnak: Rcvd id %d.", id));
     if (u->us_clientstate != UPAPCS_AUTHREQ) /* XXX */
        return;
 
@@ -435,13 +459,13 @@ upap_rauthnak(u, inp, id, len)
      * Parse message.
      */
     if (len < sizeof (u_char)) {
-       UPAPDEBUG((LOG_INFO, "upap_rauthnak: rcvd short packet."));
+       UPAPDEBUG((LOG_INFO, "pap_rauthnak: rcvd short packet."));
        return;
     }
     GETCHAR(msglen, inp);
     len -= sizeof (u_char);
     if (len < msglen) {
-       UPAPDEBUG((LOG_INFO, "upap_rauthnak: rcvd short packet."));
+       UPAPDEBUG((LOG_INFO, "pap_rauthnak: rcvd short packet."));
        return;
     }
     msg = (char *) inp;
@@ -481,9 +505,9 @@ upap_sauthreq(u)
 
     output(u->us_unit, outpacket_buf, outlen + PPP_HDRLEN);
 
-    UPAPDEBUG((LOG_INFO, "upap_sauth: Sent id %d.", u->us_id));
+    UPAPDEBUG((LOG_INFO, "pap_sauth: Sent id %d.", u->us_id));
 
-    TIMEOUT(upap_timeout, (caddr_t) u, u->us_timeouttime);
+    TIMEOUT(upap_timeout, u, u->us_timeouttime);
     ++u->us_transmits;
     u->us_clientstate = UPAPCS_AUTHREQ;
 }
@@ -513,17 +537,17 @@ upap_sresp(u, code, id, msg, msglen)
     BCOPY(msg, outp, msglen);
     output(u->us_unit, outpacket_buf, outlen + PPP_HDRLEN);
 
-    UPAPDEBUG((LOG_INFO, "upap_sresp: Sent code %d, id %d.", code, id));
+    UPAPDEBUG((LOG_INFO, "pap_sresp: Sent code %d, id %d.", code, id));
 }
 
 /*
  * upap_printpkt - print the contents of a PAP packet.
  */
-char *upap_codenames[] = {
+static char *upap_codenames[] = {
     "AuthReq", "AuthAck", "AuthNak"
 };
 
-int
+static int
 upap_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;
@@ -579,7 +603,7 @@ upap_printpkt(p, plen, printer, arg)
        msg = (char *) (p + 1);
        p += mlen + 1;
        len -= mlen + 1;
-       printer(arg, "msg=");
+       printer(arg, " ");
        print_string(msg, mlen, printer, arg);
        break;
     }