X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fipcp.h;h=89bb7bb903dc6bd4a3dedd1dccd48073278a8f04;hp=470c9ef0068515d336ff6551a9f485455f1d47a5;hb=c062322f9e8757b85a3c2281a3190d8af14bcd9b;hpb=586ce656095e105fa68f7c42df6a4d05a8a93bd4

diff --git a/pppd/ipcp.h b/pppd/ipcp.h
index 470c9ef..89bb7bb 100644
--- a/pppd/ipcp.h
+++ b/pppd/ipcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipcp.h,v 1.10 1997/03/04 03:39:20 paulus Exp $
+ * $Id: ipcp.h,v 1.13 1999/03/02 05:35:09 paulus Exp $
  */
 
 /*
@@ -26,10 +26,10 @@
 #define CI_COMPRESSTYPE	2	/* Compression Type */
 #define	CI_ADDR		3
 
-#define CI_MS_WINS1	128	/* Primary WINS value */
 #define CI_MS_DNS1	129	/* Primary DNS value */
-#define CI_MS_WINS2	130	/* Secondary WINS value */
+#define CI_MS_WINS1	130	/* Primary WINS value */
 #define CI_MS_DNS2	131	/* Secondary DNS value */
+#define CI_MS_WINS2	132	/* Secondary WINS value */
 
 #define MAX_STATES 16		/* from slcompress.h */
 
@@ -43,17 +43,20 @@
 				/* compression option*/ 
 
 typedef struct ipcp_options {
-    int neg_addr : 1;		/* Negotiate IP Address? */
-    int old_addrs : 1;		/* Use old (IP-Addresses) option? */
-    int req_addr : 1;		/* Ask peer to send IP address? */
-    int default_route : 1;	/* Assign default route through interface? */
-    int proxy_arp : 1;		/* Make proxy ARP entry for peer? */
-    int neg_vj : 1;		/* Van Jacobson Compression? */
-    int old_vj : 1;		/* use old (short) form of VJ option? */
-    int accept_local : 1;	/* accept peer's value for ouraddr */
-    int accept_remote : 1;	/* accept peer's value for hisaddr */
-    u_short vj_protocol;	/* protocol value to use in VJ option */
-    u_char maxslotindex, cflag;	/* values for RFC1332 VJ compression neg. */
+    bool neg_addr;		/* Negotiate IP Address? */
+    bool old_addrs;		/* Use old (IP-Addresses) option? */
+    bool req_addr;		/* Ask peer to send IP address? */
+    bool default_route;		/* Assign default route through interface? */
+    bool proxy_arp;		/* Make proxy ARP entry for peer? */
+    bool neg_vj;		/* Van Jacobson Compression? */
+    bool old_vj;		/* use old (short) form of VJ option? */
+    bool accept_local;		/* accept peer's value for ouraddr */
+    bool accept_remote;		/* accept peer's value for hisaddr */
+    bool req_dns1;		/* Ask peer to send primary DNS address? */
+    bool req_dns2;		/* Ask peer to send secondary DNS address? */
+    int  vj_protocol;		/* protocol value to use in VJ option */
+    int  maxslotindex;		/* values for RFC1332 VJ compression neg. */
+    bool cflag;
     u_int32_t ouraddr, hisaddr;	/* Addresses in NETWORK BYTE ORDER */
     u_int32_t dnsaddr[2];	/* Primary and secondary MS DNS entries */
     u_int32_t winsaddr[2];	/* Primary and secondary MS WINS entries */