X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Flcp.h;h=e52bdf571bae51e7939b6c90b38538ecea653e71;hp=f2e7c983e80a0ed8cc1d7b21dde9bbf283f483c5;hb=0b3acd3a1122d542e2994d7791cc9127e91778f1;hpb=84bede49f1cb5b6ad558e6ac02b447b376ee6abb diff --git a/pppd/lcp.h b/pppd/lcp.h index f2e7c98..e52bdf5 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.14 2000/03/27 06:03:00 paulus Exp $ + * $Id: lcp.h,v 1.15 2000/04/04 07:06:51 paulus 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,7 +59,7 @@ 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 */ @@ -72,9 +69,7 @@ typedef struct lcp_options { 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[];