Added packet filtering, subnet spec for allowed IP addr; select

[ppp.git] / pppd / upap.c

diff --git a/pppd/upap.c b/pppd/upap.c
index 4128866eac7f10319e63cf73f0c78054e81623bc..2492596da373eeab28a04d9189f7755c2bcabfdf 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.3 1994/09/21 06:47:37 paulus Exp $";
+static char rcsid[] = "$Id: upap.c,v 1.8 1996/01/01 22:55:29 paulus Exp $";

 #endif
 
 /*
 #endif
 
 /*


@@ -26,6 +26,7 @@ static char rcsid[] = "$Id: upap.c,v 1.3 1994/09/21 06:47:37 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>


@@ -33,11 +34,16 @@ static char rcsid[] = "$Id: upap.c,v 1.3 1994/09/21 06:47:37 paulus Exp $";
 #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", NULL, NULL
+};

 
 

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

 
 static void upap_timeout __P((caddr_t));
 
 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_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));


@@ -64,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;

 }
 
 
 }
 
 


@@ -116,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)


@@ -143,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.
  *


@@ -162,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);
+    }

 }
 
 
 }
 
 


@@ -178,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;


@@ -338,6 +369,9 @@ upap_rauthreq(u, inp, id, len)
        u->us_serverstate = UPAPSS_BADAUTH;
        auth_peer_fail(u->us_unit, PPP_PAP);
     }
        u->us_serverstate = UPAPSS_BADAUTH;
        auth_peer_fail(u->us_unit, PPP_PAP);
     }

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

 }
 
 
 }