X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Flcp.h;h=5122b7bb2fed9179b072167de8fdc2c99eb95461;hp=bd50f3dde67d1226684f916fbe676bc0bd79ecb3;hb=561ca44f6fd1eb282cb5998dd5ecf8a8aa34f77a;hpb=0943e83e5acfcd6f1e7f67b2c3ca634f816e2ae3

diff --git a/pppd/lcp.h b/pppd/lcp.h
index bd50f3d..5122b7b 100644
--- a/pppd/lcp.h
+++ b/pppd/lcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lcp.h,v 1.10 1996/07/01 01:15:37 paulus Exp $
+ * $Id: lcp.h,v 1.16 2001/03/08 05:11:14 paulus Exp $
  */
 
 /*
@@ -29,6 +29,10 @@
 #define CI_MAGICNUMBER	5	/* Magic Number */
 #define CI_PCOMPRESSION	7	/* Protocol Field Compression */
 #define CI_ACCOMPRESSION 8	/* Address/Control Field Compression */
+#define CI_CALLBACK	13	/* callback */
+#define CI_MRRU		17	/* max reconstructed receive unit; multilink */
+#define CI_SSNHF	18	/* short sequence numbers for multilink */
+#define CI_EPDISC	19	/* endpoint discriminator */
 
 /*
  * LCP-specific packet types.
@@ -37,28 +41,35 @@
 #define ECHOREQ		9	/* Echo Request */
 #define ECHOREP		10	/* Echo Reply */
 #define DISCREQ		11	/* Discard Request */
+#define CBCP_OPT	6	/* Use callback control protocol */
 
 /*
  * The state of options is described by an lcp_options structure.
  */
 typedef struct lcp_options {
-    int passive : 1;		/* Don't die if we don't get a response */
-    int silent : 1;		/* Wait for the other end to start first */
-    int restart : 1;		/* Restart vs. exit after close */
-    int neg_mru : 1;		/* Negotiate the MRU? */
-    int neg_asyncmap : 1;	/* Negotiate the async map? */
-    int neg_upap : 1;		/* Ask for UPAP authentication? */
-    int neg_chap : 1;		/* Ask for CHAP authentication? */
-    int neg_magicnumber : 1;	/* Ask for magic number? */
-    int neg_pcompression : 1;	/* HDLC Protocol Field Compression? */
-    int neg_accompression : 1;	/* HDLC Address/Control Field Compression? */
-    int neg_lqr : 1;		/* Negotiate use of Link Quality Reports */
-    u_short mru;		/* Value of MRU */
+    bool passive;		/* Don't die if we don't get a response */
+    bool silent;		/* Wait for the other end to start first */
+    bool restart;		/* Restart vs. exit after close */
+    bool neg_mru;		/* Negotiate the MRU? */
+    bool neg_asyncmap;		/* Negotiate the async map? */
+    bool neg_upap;		/* Ask for UPAP authentication? */
+    bool neg_chap;		/* Ask for CHAP authentication? */
+    bool neg_magicnumber;	/* Ask for magic number? */
+    bool neg_pcompression;	/* HDLC Protocol Field Compression? */
+    bool neg_accompression;	/* HDLC Address/Control Field Compression? */
+    bool neg_lqr;		/* Negotiate use of Link Quality Reports */
+    bool neg_cbcp;		/* Negotiate use of CBCP */
+    bool neg_mrru;		/* negotiate multilink MRRU */
+    bool neg_ssnhf;		/* negotiate short sequence numbers */
+    bool neg_endpoint;		/* negotiate endpoint discriminator */
+    int  mru;			/* Value of MRU */
+    int	 mrru;			/* Value of MRRU, and multilink enable */
     u_char chap_mdtype;		/* which MD type (hashing algorithm) */
     u_int32_t asyncmap;		/* Value of async map */
     u_int32_t magicnumber;
-    int numloops;		/* Number of loops during magic number neg. */
+    int  numloops;		/* Number of loops during magic number neg. */
     u_int32_t lqr_period;	/* Reporting period for LQR 1/100ths second */
+    struct epdisc endpoint;	/* endpoint discriminator */
 } lcp_options;
 
 extern fsm lcp_fsm[];
@@ -66,7 +77,6 @@ extern lcp_options lcp_wantoptions[];
 extern lcp_options lcp_gotoptions[];
 extern lcp_options lcp_allowoptions[];
 extern lcp_options lcp_hisoptions[];
-extern u_int32_t xmit_accm[][8];
 
 #define DEFMRU	1500		/* Try for this */
 #define MINMRU	128		/* No MRUs below this */
@@ -82,4 +92,4 @@ extern struct protent lcp_protent;
 
 /* Default number of times we receive our magic number from the peer
    before deciding the link is looped-back. */
-#define DEFLOOPBACKFAIL	5
+#define DEFLOOPBACKFAIL	10