Added a fix for a situation where pppd would hang indefinately on exit.

[ppp.git] / pppd / pppd.h

diff --git a/pppd/pppd.h b/pppd/pppd.h
index 493f86ef3d73e4b21c9f037dde0c9dcb84d61e5a..d9f3eece3ba5892e3cc5194fa72a5465a673ba76 100644 (file)
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: pppd.h,v 1.74 2002/09/24 11:35:22 fcusack Exp $
+ * $Id: pppd.h,v 1.77 2002/11/02 19:48:13 carlsonj Exp $
  */
 
 /*
@@ -207,7 +207,7 @@ extern GIDSET_TYPE groups[NGROUPS_MAX];     /* groups the user is in */
 extern int     ngroups;        /* How many groups valid in groups */
 extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */
 extern int     link_stats_valid; /* set if link_stats is valid */
-extern int     link_connect_time; /* time the link was up for */
+extern unsigned        link_connect_time; /* time the link was up for */
 extern int     using_pty;      /* using pty as device (notty or pty opt.) */
 extern int     log_to_fd;      /* logging to this fd as well as syslog */
 extern bool    log_default;    /* log_to_fd is default (stdout) */
@@ -317,15 +317,18 @@ extern bool       ms_lanman;      /* Use LanMan password instead of NT */
 #define PAP_PEER       0x2
 #define CHAP_WITHPEER  0x4
 #define CHAP_PEER      0x8
+#define EAP_WITHPEER   0x10
+#define EAP_PEER       0x20
+
 /* Values for auth_done only */
-#define CHAP_MD5_WITHPEER      0x10
-#define CHAP_MD5_PEER          0x20
+#define CHAP_MD5_WITHPEER      0x40
+#define CHAP_MD5_PEER          0x80
 #ifdef CHAPMS
-#define CHAP_MS_SHIFT          6       /* LSB position for MS auths */
-#define CHAP_MS_WITHPEER       0x40
-#define CHAP_MS_PEER           0x80
-#define CHAP_MS2_WITHPEER      0x100
-#define CHAP_MS2_PEER          0x200
+#define CHAP_MS_SHIFT          8       /* LSB position for MS auths */
+#define CHAP_MS_WITHPEER       0x100
+#define CHAP_MS_PEER           0x200
+#define CHAP_MS2_WITHPEER      0x400
+#define CHAP_MS2_PEER          0x800
 #endif
 
 extern char *current_option;   /* the name of the option being parsed */
@@ -514,8 +517,11 @@ int  check_passwd __P((int, char *, int, char *, int, char **));
                                /* Check peer-supplied username/password */
 int  get_secret __P((int, char *, char *, char *, int *, int));
                                /* get "secret" for chap */
+int  get_srp_secret __P((int unit, char *client, char *server, char *secret,
+    int am_server));
 int  auth_ip_addr __P((int, u_int32_t));
                                /* check if IP address is authorized */
+int  auth_number __P((void));  /* check if remote number is authorized */
 int  bad_ip_adrs __P((u_int32_t));
                                /* check if IP address is unreasonable */
 
@@ -718,6 +724,7 @@ extern void (*snoop_send_hook) __P((unsigned char *p, int len));
 
 #define BCOPY(s, d, l)         memcpy(d, s, l)
 #define BZERO(s, n)            memset(s, 0, n)
+#define        BCMP(s1, s2, l)         memcmp(s1, s2, l)
 
 #define PRINTMSG(m, l)         { info("Remote message: %0.*v", l, m); }
 
@@ -755,6 +762,7 @@ extern void (*snoop_send_hook) __P((unsigned char *p, int len));
 #ifdef MAXOCTETS
 #define EXIT_TRAFFIC_LIMIT     20
 #endif
+#define EXIT_CNID_AUTH_FAILED  21
 
 /*
  * Debug macros.  Slightly useful for finding bugs in pppd, not particularly