Give up waiting for a PAP auth-req from the peer after 30 seconds.

1 files changed, 33 insertions, 4 deletions

diff --git a/pppd/upap.c b/pppd/upap.c
index afbc180..aed4a7b 100644
--- a/pppd/upap.c
+++ b/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: upap.c,v 1.5 1994/10/24 04:31:11 paulus Exp $";
+static char rcsid[] = "$Id: upap.c,v 1.6 1995/06/12 12:02:24 paulus Exp $";
 #endif
 
 /*
@@ -39,6 +39,7 @@ 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_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));
@@ -65,6 +66,7 @@ upap_init(unit)
     u->us_id = 0;
     u->us_timeouttime = UPAP_DEFTIMEOUT;
     u->us_maxtransmits = 10;
+    u->us_reqtimeout = UPAP_DEFREQTIME;
 }
 
 
@@ -117,11 +119,13 @@ upap_authpeer(unit)
     }
 
     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)
@@ -145,6 +149,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.
  *
  * Start authenticating if pending.
@@ -163,8 +184,11 @@ upap_lowerup(unit)
 
     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;
+	if (u->us_reqtimeout > 0)
+	    TIMEOUT(upap_reqtimeout, (caddr_t) u, u->us_reqtimeout);
+    }
 }
 
 
@@ -179,8 +203,10 @@ upap_lowerdown(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 */
+    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;
@@ -339,6 +365,9 @@ upap_rauthreq(u, inp, id, len)
 	u->us_serverstate = UPAPSS_BADAUTH;
 	auth_peer_fail(u->us_unit, PPP_PAP);
     }
+
+    if (u->us_reqtimeout > 0)
+	UNTIMEOUT(upap_reqtimeout, (caddr_t) u);
 }