X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fpppd.h;h=35cf85bf2ca51ef7fca09689c3a5078de14b2276;hb=857e121025571b1c1173c2e70053bde804a46a0d;hp=2d1cd17c5124e275d7378d3f5b23b5160d1c8299;hpb=59a3d197fdf9d15d0d78a794257f23b1faafaf36;p=ppp.git

diff --git a/pppd/pppd.h b/pppd/pppd.h
index 2d1cd17..35cf85b 100644
--- 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.70 2002/07/15 11:04:18 kad Exp $
+ * $Id: pppd.h,v 1.76 2002/10/27 12:30:54 fcusack Exp $
  */
 
 /*
@@ -79,7 +79,7 @@ typedef struct {
 	enum opt_type type;
 	void	*addr;
 	char	*description;
-	int	flags;
+	unsigned int flags;
 	void	*addr2;
 	int	upper_limit;
 	int	lower_limit;
@@ -120,7 +120,6 @@ typedef struct {
 #define OPT_A2PRINTER	0x10000000 /* *addr2 is a fn for printing option */
 #define OPT_A2STRVAL	0x20000000 /* *addr2 points to current string value */
 #define OPT_NOPRINT	0x40000000 /* don't print this option at all */
-#define OPT_A3OR  	0x80000000 /* addr3 -> third location to rcv | value */
 
 #define OPT_VAL(x)	((x) & OPT_VALUE)
 
@@ -208,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) */
@@ -295,12 +294,12 @@ extern int       maxoctets_dir;      /* Direction :
 				      2 - out
 				      3 - max(in,out) */
 extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
-#define PPP_OCTETS_DIRECTION_SUM 	0
-#define PPP_OCTETS_DIRECTION_IN  	1
-#define PPP_OCTETS_DIRECTION_OUT 	2
-#define PPP_OCTETS_DIRECTION_MAX 	3
+#define PPP_OCTETS_DIRECTION_SUM        0
+#define PPP_OCTETS_DIRECTION_IN         1
+#define PPP_OCTETS_DIRECTION_OUT        2
+#define PPP_OCTETS_DIRECTION_MAXOVERAL  3
 /* same as previos, but little different on RADIUS side */
-#define PPP_OCTETS_DIRECTION_MAX2 	4	
+#define PPP_OCTETS_DIRECTION_MAXSESSION 4	
 #endif
 
 #ifdef PPP_FILTER
@@ -496,6 +495,7 @@ void link_terminated __P((int));  /* we are finished with the link */
 void link_down __P((int));	  /* the LCP layer has left the Opened state */
 void link_established __P((int)); /* the link is up; authenticate now */
 void start_networks __P((int));   /* start all the network control protos */
+void continue_networks __P((int)); /* start network [ip, etc] control protos */
 void np_up __P((int, int));	  /* a network protocol has come up */
 void np_down __P((int, int));	  /* a network protocol has gone down */
 void np_finished __P((int, int)); /* a network protocol no longer needs link */
@@ -516,6 +516,7 @@ int  get_secret __P((int, char *, char *, char *, int *, int));
 				/* get "secret" for chap */
 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 */
 
@@ -755,6 +756,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