X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fipcp.h;h=0924321da48944d89ace4d3dca708ed419dc7f53;hp=e12514643e015b75a048ce4fafd1db69cfd5fcc5;hb=4e3c66a04c0b86108858081d434bc45983471990;hpb=e1746e5f6bc21a42ed4c0b35dc5271026d580a81 diff --git a/pppd/ipcp.h b/pppd/ipcp.h index e125146..0924321 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.6 1995/12/18 03:45:58 paulus Exp $ + * $Id: ipcp.h,v 1.12 1998/11/07 06:59:27 paulus Exp $ */ /* @@ -27,7 +27,9 @@ #define CI_ADDR 3 #define CI_MS_DNS1 129 /* Primary DNS 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 */ @@ -41,21 +43,21 @@ /* 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 */ + 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 */ -#ifdef USE_MS_DNS - u_int32_t dnsaddr[2]; /* Primary and secondary DNS entries */ -#endif + u_int32_t dnsaddr[2]; /* Primary and secondary MS DNS entries */ + u_int32_t winsaddr[2]; /* Primary and secondary MS WINS entries */ } ipcp_options; extern fsm ipcp_fsm[]; @@ -64,13 +66,6 @@ extern ipcp_options ipcp_gotoptions[]; extern ipcp_options ipcp_allowoptions[]; extern ipcp_options ipcp_hisoptions[]; -void ipcp_init __P((int)); -void ipcp_open __P((int)); -void ipcp_close __P((int, char *)); -void ipcp_lowerup __P((int)); -void ipcp_lowerdown __P((int)); -void ipcp_input __P((int, u_char *, int)); -void ipcp_protrej __P((int)); -int ipcp_printpkt __P((u_char *, int, void (*)(), void *)); +char *ip_ntoa __P((u_int32_t)); extern struct protent ipcp_protent;