Header file reorganization and cleaning up the public API for pppd version 2.5.0...

[ppp.git] / pppd / lcp.h

diff --git a/pppd/lcp.h b/pppd/lcp.h
index c01313d869aa59015ff95262b7ddea0f0949c53b..4cb77c8f57724739e02f296400eb801414f03995 100644 (file)
--- a/pppd/lcp.h
+++ b/pppd/lcp.h
@@ -84,6 +84,14 @@
 /* Value used as data for CI_CALLBACK option */
 #define CBCP_OPT       6       /* Use callback control protocol */
 
+/* An endpoint discriminator, used with multilink. */
+#define MAX_ENDP_LEN   20      /* maximum length of discriminator value */
+struct epdisc {
+    unsigned char      class;
+    unsigned char      length;
+    unsigned char      value[MAX_ENDP_LEN];
+};
+
 /*
  * The state of options is described by an lcp_options structure.
  */
@@ -106,11 +114,11 @@ typedef struct lcp_options {
     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 types (hashing algorithm) */
-    u_int32_t asyncmap;                /* Value of async map */
-    u_int32_t magicnumber;
+    unsigned char chap_mdtype;         /* which MD types (hashing algorithm) */
+    uint32_t asyncmap;         /* Value of async map */
+    uint32_t magicnumber;
     int  numloops;             /* Number of loops during magic number neg. */
-    u_int32_t lqr_period;      /* Reporting period for LQR 1/100ths second */
+    uint32_t lqr_period;       /* Reporting period for LQR 1/100ths second */
     struct epdisc endpoint;    /* endpoint discriminator */
 } lcp_options;
 
@@ -128,7 +136,7 @@ void lcp_open(int);
 void lcp_close(int, char *);
 void lcp_lowerup(int);
 void lcp_lowerdown(int);
-void lcp_sprotrej(int, u_char *, int); /* send protocol reject */
+void lcp_sprotrej(int, unsigned char *, int);  /* send protocol reject */
 
 extern struct protent lcp_protent;