extend protocol table

[ppp.git] / pppd / upap.c

diff --git a/pppd/upap.c b/pppd/upap.c
index 61d22acbf286372abc7ef0d5bd8fc4fe57a33f10..bf5ee6a5465fb7fee08461642aec595204e2fd0f 100644 (file)
--- a/pppd/upap.c
+++ b/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: upap.c,v 1.2 1994/04/11 07:13:44 paulus Exp $";
+static char rcsid[] = "$Id: upap.c,v 1.7 1995/12/18 03:46:48 paulus Exp $";

 #endif
 
 /*
 #endif
 
 /*


@@ -26,24 +26,29 @@ static char rcsid[] = "$Id: upap.c,v 1.2 1994/04/11 07:13:44 paulus Exp $";
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

+#include <string.h>

 #include <sys/types.h>
 #include <sys/time.h>
 #include <syslog.h>
 
 #include <sys/types.h>
 #include <sys/time.h>
 #include <syslog.h>
 

-#include "ppp.h"

 #include "pppd.h"
 #include "upap.h"
 
 #include "pppd.h"
 #include "upap.h"
 

+struct protent pap_protent = {
+    PPP_PAP, upap_init, upap_input, upap_protrej,
+    upap_lowerup, upap_lowerdown, NULL, NULL,
+    upap_printpkt, NULL, 1, "PAP"
+};

 
 

-upap_state upap[NPPP];         /* UPAP state; one for each unit */
-
+upap_state upap[NUM_PPP];              /* UPAP state; one for each unit */

 
 

-static void upap_timeout __ARGS((caddr_t));
-static void upap_rauthreq __ARGS((upap_state *, u_char *, int, int));
-static void upap_rauthack __ARGS((upap_state *, u_char *, int, int));
-static void upap_rauthnak __ARGS((upap_state *, u_char *, int, int));
-static void upap_sauthreq __ARGS((upap_state *));
-static void upap_sresp __ARGS((upap_state *, int, int, char *, int));
+static void upap_timeout __P((caddr_t));
+static void upap_reqtimeout __P((caddr_t));
+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));
+static void upap_sauthreq __P((upap_state *));
+static void upap_sresp __P((upap_state *, int, int, char *, int));

 
 
 /*
 
 
 /*


@@ -65,6 +70,7 @@ upap_init(unit)
     u->us_id = 0;
     u->us_timeouttime = UPAP_DEFTIMEOUT;
     u->us_maxtransmits = 10;
     u->us_id = 0;
     u->us_timeouttime = UPAP_DEFTIMEOUT;
     u->us_maxtransmits = 10;

+    u->us_reqtimeout = UPAP_DEFREQTIME;

 }
 
 
 }
 
 


@@ -117,11 +123,13 @@ upap_authpeer(unit)
     }
 
     u->us_serverstate = UPAPSS_LISTEN;
     }
 
     u->us_serverstate = UPAPSS_LISTEN;

+    if (u->us_reqtimeout > 0)
+       TIMEOUT(upap_reqtimeout, (caddr_t) u, u->us_reqtimeout);

 }
 
 
 /*
 }
 
 
 /*

- * upap_timeout - Timeout expired.
+ * upap_timeout - Retransmission timer for sending auth-reqs expired.

  */
 static void
 upap_timeout(arg)
  */
 static void
 upap_timeout(arg)


@@ -136,7 +144,7 @@ upap_timeout(arg)
        /* give up in disgust */
        syslog(LOG_ERR, "No response to PAP authenticate-requests");
        u->us_clientstate = UPAPCS_BADAUTH;
        /* give up in disgust */
        syslog(LOG_ERR, "No response to PAP authenticate-requests");
        u->us_clientstate = UPAPCS_BADAUTH;

-       auth_withpeer_fail(u->us_unit, UPAP);
+       auth_withpeer_fail(u->us_unit, PPP_PAP);

        return;
     }
 
        return;
     }
 


@@ -144,6 +152,23 @@ upap_timeout(arg)
 }
 
 
 }
 
 

+/*
+ * upap_reqtimeout - Give up waiting for the peer to send an auth-req.
+ */
+static void
+upap_reqtimeout(arg)
+    caddr_t arg;
+{
+    upap_state *u = (upap_state *) arg;
+
+    if (u->us_serverstate != UPAPSS_LISTEN)
+       return;                 /* huh?? */
+
+    auth_peer_fail(u->us_unit, PPP_PAP);
+    u->us_serverstate = UPAPSS_BADAUTH;
+}
+
+

 /*
  * upap_lowerup - The lower layer is up.
  *
 /*
  * upap_lowerup - The lower layer is up.
  *


@@ -163,8 +188,11 @@ upap_lowerup(unit)
 
     if (u->us_serverstate == UPAPSS_INITIAL)
        u->us_serverstate = UPAPSS_CLOSED;
 
     if (u->us_serverstate == UPAPSS_INITIAL)
        u->us_serverstate = UPAPSS_CLOSED;

-    else if (u->us_serverstate == UPAPSS_PENDING)
+    else if (u->us_serverstate == UPAPSS_PENDING) {

        u->us_serverstate = UPAPSS_LISTEN;
        u->us_serverstate = UPAPSS_LISTEN;

+       if (u->us_reqtimeout > 0)
+           TIMEOUT(upap_reqtimeout, (caddr_t) u, u->us_reqtimeout);
+    }

 }
 
 
 }
 
 


@@ -179,8 +207,10 @@ upap_lowerdown(unit)
 {
     upap_state *u = &upap[unit];
 
 {
     upap_state *u = &upap[unit];
 

-    if (u->us_clientstate == UPAPCS_AUTHREQ) /* Timeout pending? */
+    if (u->us_clientstate == UPAPCS_AUTHREQ)   /* Timeout pending? */

        UNTIMEOUT(upap_timeout, (caddr_t) u);   /* Cancel timeout */
        UNTIMEOUT(upap_timeout, (caddr_t) u);   /* Cancel timeout */

+    if (u->us_serverstate == UPAPSS_LISTEN && u->us_reqtimeout > 0)
+       UNTIMEOUT(upap_reqtimeout, (caddr_t) u);

 
     u->us_clientstate = UPAPCS_INITIAL;
     u->us_serverstate = UPAPSS_INITIAL;
 
     u->us_clientstate = UPAPCS_INITIAL;
     u->us_serverstate = UPAPSS_INITIAL;


@@ -200,11 +230,11 @@ upap_protrej(unit)
 
     if (u->us_clientstate == UPAPCS_AUTHREQ) {
        syslog(LOG_ERR, "PAP authentication failed due to protocol-reject");
 
     if (u->us_clientstate == UPAPCS_AUTHREQ) {
        syslog(LOG_ERR, "PAP authentication failed due to protocol-reject");

-       auth_withpeer_fail(unit, UPAP);
+       auth_withpeer_fail(unit, PPP_PAP);

     }
     if (u->us_serverstate == UPAPSS_LISTEN) {
        syslog(LOG_ERR, "PAP authentication of peer failed (protocol-reject)");
     }
     if (u->us_serverstate == UPAPSS_LISTEN) {
        syslog(LOG_ERR, "PAP authentication of peer failed (protocol-reject)");

-       auth_peer_fail(unit, UPAP);
+       auth_peer_fail(unit, PPP_PAP);

     }
     upap_lowerdown(unit);
 }
     }
     upap_lowerdown(unit);
 }


@@ -334,11 +364,14 @@ upap_rauthreq(u, inp, id, len)
 
     if (retcode == UPAP_AUTHACK) {
        u->us_serverstate = UPAPSS_OPEN;
 
     if (retcode == UPAP_AUTHACK) {
        u->us_serverstate = UPAPSS_OPEN;

-       auth_peer_success(u->us_unit, UPAP);
+       auth_peer_success(u->us_unit, PPP_PAP);

     } else {
        u->us_serverstate = UPAPSS_BADAUTH;
     } else {
        u->us_serverstate = UPAPSS_BADAUTH;

-       auth_peer_fail(u->us_unit, UPAP);
+       auth_peer_fail(u->us_unit, PPP_PAP);

     }
     }

+
+    if (u->us_reqtimeout > 0)
+       UNTIMEOUT(upap_reqtimeout, (caddr_t) u);

 }
 
 
 }
 
 


@@ -377,7 +410,7 @@ upap_rauthack(u, inp, id, len)
 
     u->us_clientstate = UPAPCS_OPEN;
 
 
     u->us_clientstate = UPAPCS_OPEN;
 

-    auth_withpeer_success(u->us_unit, UPAP);
+    auth_withpeer_success(u->us_unit, PPP_PAP);

 }
 
 
 }
 
 


@@ -417,7 +450,7 @@ upap_rauthnak(u, inp, id, len)
     u->us_clientstate = UPAPCS_BADAUTH;
 
     syslog(LOG_ERR, "PAP authentication failed");
     u->us_clientstate = UPAPCS_BADAUTH;
 
     syslog(LOG_ERR, "PAP authentication failed");

-    auth_withpeer_fail(u->us_unit, UPAP);
+    auth_withpeer_fail(u->us_unit, PPP_PAP);

 }
 
 
 }
 
 


@@ -435,7 +468,7 @@ upap_sauthreq(u)
        u->us_userlen + u->us_passwdlen;
     outp = outpacket_buf;
     
        u->us_userlen + u->us_passwdlen;
     outp = outpacket_buf;
     

-    MAKEHEADER(outp, UPAP);
+    MAKEHEADER(outp, PPP_PAP);

 
     PUTCHAR(UPAP_AUTHREQ, outp);
     PUTCHAR(++u->us_id, outp);
 
     PUTCHAR(UPAP_AUTHREQ, outp);
     PUTCHAR(++u->us_id, outp);


@@ -446,7 +479,7 @@ upap_sauthreq(u)
     PUTCHAR(u->us_passwdlen, outp);
     BCOPY(u->us_passwd, outp, u->us_passwdlen);
 
     PUTCHAR(u->us_passwdlen, outp);
     BCOPY(u->us_passwd, outp, u->us_passwdlen);
 

-    output(u->us_unit, outpacket_buf, outlen + DLLHEADERLEN);
+    output(u->us_unit, outpacket_buf, outlen + PPP_HDRLEN);

 
     UPAPDEBUG((LOG_INFO, "upap_sauth: Sent id %d.", u->us_id));
 
 
     UPAPDEBUG((LOG_INFO, "upap_sauth: Sent id %d.", u->us_id));
 


@@ -471,14 +504,14 @@ upap_sresp(u, code, id, msg, msglen)
 
     outlen = UPAP_HEADERLEN + sizeof (u_char) + msglen;
     outp = outpacket_buf;
 
     outlen = UPAP_HEADERLEN + sizeof (u_char) + msglen;
     outp = outpacket_buf;

-    MAKEHEADER(outp, UPAP);
+    MAKEHEADER(outp, PPP_PAP);

 
     PUTCHAR(code, outp);
     PUTCHAR(id, outp);
     PUTSHORT(outlen, outp);
     PUTCHAR(msglen, outp);
     BCOPY(msg, outp, msglen);
 
     PUTCHAR(code, outp);
     PUTCHAR(id, outp);
     PUTSHORT(outlen, outp);
     PUTCHAR(msglen, outp);
     BCOPY(msg, outp, msglen);

-    output(u->us_unit, outpacket_buf, outlen + DLLHEADERLEN);
+    output(u->us_unit, outpacket_buf, outlen + PPP_HDRLEN);

 
     UPAPDEBUG((LOG_INFO, "upap_sresp: Sent code %d, id %d.", code, id));
 }
 
     UPAPDEBUG((LOG_INFO, "upap_sresp: Sent code %d, id %d.", code, id));
 }


@@ -494,7 +527,7 @@ int
 upap_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;
 upap_printpkt(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;
     void *arg;
 {
     int code, id, len;