ECP patches from Frank Cusack:

[ppp.git] / pppd / pppd.h

diff --git a/pppd/pppd.h b/pppd/pppd.h
index 5d287d6b4649d4a1cd46c40a0bddb65d217c0d2a..3ade18e78960ceadd1843b00e0b3d99f082b2982 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.65 2002/02/12 20:07:09 dfs Exp $
+ * $Id: pppd.h,v 1.68 2002/05/21 17:26:49 dfs Exp $
  */
 
 /*
@@ -86,6 +86,7 @@ typedef struct {
        const char *source;
        short int priority;
        short int winner;
+       void    *addr3;
 } option_t;
 
 /* Values for flags */
@@ -94,6 +95,7 @@ typedef struct {
 #define OPT_NOARG      0x200   /* option doesn't take argument */
 #define OPT_OR         0x400   /* OR in argument to value */
 #define OPT_INC                0x800   /* increment value */
+#define OPT_A2OR       0x800   /* for o_bool, OR arg to *(u_char *)addr2 */
 #define OPT_PRIV       0x1000  /* privileged option */
 #define OPT_STATIC     0x2000  /* string option goes into static array */
 #define OPT_LLIMIT     0x4000  /* check value against lower limit */
@@ -102,6 +104,7 @@ typedef struct {
 #define OPT_ZEROOK     0x10000 /* 0 value is OK even if not within limits */
 #define OPT_HIDE       0x10000 /* for o_string, print value as ?????? */
 #define OPT_A2LIST     0x10000 /* for o_special, keep list of values */
+#define OPT_A2CLRB     0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */
 #define OPT_NOINCR     0x20000 /* value mustn't be increased */
 #define OPT_ZEROINF    0x40000 /* with OPT_NOINCR, 0 == infinity */
 #define OPT_PRIO       0x80000 /* process option priorities for this option */
@@ -117,6 +120,7 @@ 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)
 
@@ -195,6 +199,7 @@ extern int  baud_rate;      /* Current link speed in bits/sec */
 extern char    *progname;      /* Name of this program */
 extern int     redirect_stderr;/* Connector's stderr should go to file */
 extern char    peer_authname[];/* Authenticated name of peer */
+extern int     auth_done[NUM_PPP]; /* Methods actually used for auth */
 extern int     privileged;     /* We were run by real-uid root */
 extern int     need_holdoff;   /* Need holdoff period after link terminates */
 extern char    **script_env;   /* Environment variables for scripts */
@@ -292,6 +297,22 @@ extern bool        ms_lanman;      /* Use LanMan password instead of NT */
                                /* Has meaning only with MS-CHAP challenges */
 #endif
 
+/* Values for auth_pending, auth_done */
+#define PAP_WITHPEER   0x1
+#define PAP_PEER       0x2
+#define CHAP_WITHPEER  0x4
+#define CHAP_PEER      0x8
+/* Values for auth_done only */
+#define CHAP_MD5_WITHPEER      0x10
+#define CHAP_MD5_PEER          0x20
+#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
+#endif
+
 extern char *current_option;   /* the name of the option being parsed */
 extern int  privileged_option; /* set iff the current option came from root */
 extern char *option_source;    /* string saying where the option came from */
@@ -458,17 +479,17 @@ void link_required __P((int));      /* we are starting to use the link */
 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((void));  /* start all the network control protos */
+void start_networks __P((int));   /* start all the network 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 */
 void auth_peer_fail __P((int, int));
                                /* peer failed to authenticate itself */
-void auth_peer_success __P((int, int, char *, int));
+void auth_peer_success __P((int, int, int, char *, int));
                                /* peer successfully authenticated itself */
 void auth_withpeer_fail __P((int, int));
                                /* we failed to authenticate ourselves */
-void auth_withpeer_success __P((int, int));
+void auth_withpeer_success __P((int, int, int));
                                /* we successfully authenticated ourselves */
 void auth_check_options __P((void));
                                /* check authentication options supplied */
@@ -539,6 +560,7 @@ int  get_idle_time __P((int, struct ppp_idle *));
 int  get_ppp_stats __P((int, struct pppd_stats *));
                                /* Return link statistics */
 void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */
+int  netif_get_mtu __P((int));      /* Get PPP interface MTU */
 int  sifvjcomp __P((int, int, int, int));
                                /* Configure VJ TCP header compression */
 int  sifup __P((int));         /* Configure i/f up for one protocol */
@@ -808,4 +830,8 @@ extern void (*snoop_send_hook) __P((unsigned char *p, int len));
 #define MAX(a, b)      ((a) > (b)? (a): (b))
 #endif
 
+#ifndef offsetof
+#define offsetof(type, member) ((size_t) &((type *)0)->member)
+#endif
+
 #endif /* __PPP_H__ */