This commit was generated by cvs2svn to track changes on a CVS vendor

[unix-history] / libexec / pppd / upap.h

diff --git a/libexec/pppd/upap.h b/libexec/pppd/upap.h
index f25b948..c77c198 100644 (file)
--- a/libexec/pppd/upap.h
+++ b/libexec/pppd/upap.h
@@ -15,6 +15,8 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * 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 $

  */
 
 /*
  */
 
 /*


@@ -26,9 +28,9 @@
 /*
  * UPAP codes.
  */
 /*
  * UPAP codes.
  */

-#define UPAP_AUTH      1       /* Authenticate */
-#define UPAP_AUTHACK   2       /* Authenticate Ack */
-#define UPAP_AUTHNAK   3       /* Authenticate Nak */
+#define UPAP_AUTHREQ   1       /* Authenticate-Request */
+#define UPAP_AUTHACK   2       /* Authenticate-Ack */
+#define UPAP_AUTHNAK   3       /* Authenticate-Nak */

 
 
 /*
 
 
 /*


@@ -42,35 +44,32 @@ typedef struct upap_state {
     int us_passwdlen;          /* Password length */
     int us_clientstate;                /* Client state */
     int us_serverstate;                /* Server state */
     int us_passwdlen;          /* Password length */
     int us_clientstate;                /* Client state */
     int us_serverstate;                /* Server state */

-    int us_flags;              /* Flags */

     u_char us_id;              /* Current id */
     int us_timeouttime;                /* Timeout time in milliseconds */
     u_char us_id;              /* Current id */
     int us_timeouttime;                /* Timeout time in milliseconds */

-    int us_retransmits;                /* Number of retransmissions */
+    int us_transmits;          /* Number of auth-reqs sent */
+    int us_maxtransmits;       /* Maximum number of auth-reqs to send */

 } upap_state;
 
 
 /*
  * Client states.
  */
 } upap_state;
 
 
 /*
  * Client states.
  */

-#define UPAPCS_CLOSED  1       /* Connection down */
-#define UPAPCS_AUTHSENT        2       /* We've sent an Authenticate */
-#define UPAPCS_OPEN    3       /* We've received an Ack */
+#define UPAPCS_INITIAL 0       /* Connection down */
+#define UPAPCS_CLOSED  1       /* Connection up, haven't requested auth */
+#define UPAPCS_PENDING 2       /* Connection down, have requested auth */
+#define UPAPCS_AUTHREQ 3       /* We've sent an Authenticate-Request */
+#define UPAPCS_OPEN    4       /* We've received an Ack */
+#define UPAPCS_BADAUTH 5       /* We've received a Nak */

 
 /*
  * Server states.
  */
 
 /*
  * Server states.
  */

-#define UPAPSS_CLOSED  1       /* Connection down */
-#define UPAPSS_LISTEN  2       /* Listening for an Authenticate */
-#define UPAPSS_OPEN    3       /* We've sent an Ack */
-
-/*
- * Flags.
- */
-#define UPAPF_LOWERUP  1       /* The lower level is UP */
-#define UPAPF_AWPPENDING 2     /* Auth with peer pending */
-#define UPAPF_APPENDING        4       /* Auth peer pending */
-#define UPAPF_UPVALID  8       /* User/passwd values valid */
-#define UPAPF_UPPENDING        0x10    /* User/passwd values pending */
+#define UPAPSS_INITIAL 0       /* Connection down */
+#define UPAPSS_CLOSED  1       /* Connection up, haven't requested auth */
+#define UPAPSS_PENDING 2       /* Connection down, have requested auth */
+#define UPAPSS_LISTEN  3       /* Listening for an Authenticate */
+#define UPAPSS_OPEN    4       /* We've sent an Ack */
+#define UPAPSS_BADAUTH 5       /* We've sent a Nak */

 
 
 /*
 
 
 /*


@@ -82,7 +81,7 @@ typedef struct upap_state {
 extern upap_state upap[];
 
 void upap_init __ARGS((int));
 extern upap_state upap[];
 
 void upap_init __ARGS((int));

-void upap_authwithpeer __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_authpeer __ARGS((int));
 void upap_lowerup __ARGS((int));
 void upap_lowerdown __ARGS((int));