Large patch from Frank Cusack <fcusack@fcusack.com> to add proper

[ppp.git] / pppd / lcp.h

diff --git a/pppd/lcp.h b/pppd/lcp.h
index f2e7c983e80a0ed8cc1d7b21dde9bbf283f483c5..95260bb387d02a9f8cde10b6ac40a96a1e24111f 100644 (file)
--- 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.14 2000/03/27 06:03:00 paulus Exp $
+ * $Id: lcp.h,v 1.17 2002/03/01 14:39:18 dfs Exp $
  */
 
 /*
@@ -43,9 +43,6 @@
 #define DISCREQ                11      /* Discard Request */
 #define CBCP_OPT       6       /* Use callback control protocol */
 
-/* maximum length of endpoint discriminator value */
-#define MAX_ENDP_LEN   20
-
 /*
  * The state of options is described by an lcp_options structure.
  */
@@ -62,19 +59,17 @@ typedef struct lcp_options {
     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_multilink;                /* negotiate multilink (MRRU) */
+    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_char chap_mdtype;                /* which MD types (hashing algorithm) */
     u_int32_t asyncmap;                /* Value of async map */
     u_int32_t magicnumber;
     int  numloops;             /* Number of loops during magic number neg. */
     u_int32_t lqr_period;      /* Reporting period for LQR 1/100ths second */
-    int  endp_class;           /* endpoint discriminator class */
-    int  endp_len;             /* endpoint discriminator length */
-    u_char endpoint[MAX_ENDP_LEN];     /* endpoint discriminator value */
+    struct epdisc endpoint;    /* endpoint discriminator */
 } lcp_options;
 
 extern fsm lcp_fsm[];
@@ -82,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 */