Merge in 1.3 and post 1.3 fixes; some of them might be applicable to

[ppp.git] / pppd / upap.h

diff --git a/pppd/upap.h b/pppd/upap.h
index c77c198a28e83a249e92fdc69403344bf56ee4dc..ba4e153cb330169d76bedbe0b1aa33cf450d529f 100644 (file)
--- a/pppd/upap.h
+++ b/pppd/upap.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: upap.h,v 1.1 1993/11/11 03:54:25 paulus Exp $
+ * $Id: upap.h,v 1.6 1996/07/01 01:21:45 paulus Exp $
  */
 
 /*
@@ -45,9 +45,10 @@ typedef struct upap_state {
     int us_clientstate;                /* Client state */
     int us_serverstate;                /* Server state */
     u_char us_id;              /* Current id */
-    int us_timeouttime;                /* Timeout time in milliseconds */
+    int us_timeouttime;                /* Timeout (seconds) for auth-req retrans. */
     int us_transmits;          /* Number of auth-reqs sent */
     int us_maxtransmits;       /* Maximum number of auth-reqs to send */
+    int us_reqtimeout;         /* Time to wait for auth-req from peer */
 } upap_state;
 
 
@@ -75,15 +76,12 @@ typedef struct upap_state {
 /*
  * Timeouts.
  */
-#define UPAP_DEFTIMEOUT        3       /* Timeout time in seconds */
-
+#define UPAP_DEFTIMEOUT        3       /* Timeout (seconds) for retransmitting req */
+#define UPAP_DEFREQTIME        30      /* Time to wait for auth-req from peer */
 
 extern upap_state upap[];
 
-void upap_init __ARGS((int));
-void upap_authwithpeer __ARGS((int, char *, char *));
-void upap_authpeer __ARGS((int));
-void upap_lowerup __ARGS((int));
-void upap_lowerdown __ARGS((int));
-void upap_input __ARGS((int, u_char *, int));
-void upap_protrej __ARGS((int));
+void upap_authwithpeer __P((int, char *, char *));
+void upap_authpeer __P((int));
+
+extern struct protent pap_protent;