X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fpppd.h;h=b173aea31d9db5710593d330381bab02068003b9;hb=c95c6162dd3b5774ee680f9c7df60db217cae161;hp=465c1bf8617a5964c29ba68aaaa7e94e4295a043;hpb=ab4d4992050ec171e1c72d661a3457efc8e7c141;p=ppp.git diff --git a/pppd/pppd.h b/pppd/pppd.h index 465c1bf..b173aea 100644 --- a/pppd/pppd.h +++ b/pppd/pppd.h @@ -55,14 +55,14 @@ #include /* for encrypt */ #include /* for setkey */ #include -#include /* for NGROUPS_MAX */ -#include /* for MAXPATHLEN and BSD4_4, if defined */ +#include #include /* for u_int32_t, if defined */ #include /* for struct timeval */ #include +#include #include "patchlevel.h" -#ifdef INET6 +#ifdef PPP_WITH_IPV6CP #include "eui64.h" #endif @@ -75,8 +75,6 @@ #define MAXARGS 1 /* max # args to a command */ #define MAXNAMELEN 256 /* max length of hostname or name for auth */ #define MAXSECRETLEN 256 /* max length of password or secret */ -#define MAXIFNAMELEN 32 /* max length of interface name; or use IFNAMSIZ, can we - always include net/if.h? */ /* * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name. @@ -175,8 +173,8 @@ struct permitted_ip { * pppd needs. */ struct pppd_stats { - unsigned int bytes_in; - unsigned int bytes_out; + uint64_t bytes_in; + uint64_t bytes_out; unsigned int pkts_in; unsigned int pkts_out; }; @@ -329,7 +327,7 @@ extern int max_data_rate; /* max bytes/sec through charshunt */ extern int req_unit; /* interface unit number to use */ extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ -extern char req_ifname[MAXIFNAMELEN]; /* interface name to use */ +extern char req_ifname[IFNAMSIZ]; /* interface name to use */ extern bool multilink; /* enable multilink operation */ extern bool noendpoint; /* don't send or accept endpt. discrim. */ extern char *bundle_name; /* bundle name for multilink */ @@ -337,26 +335,36 @@ extern bool dump_options; /* print out option values */ extern bool dryrun; /* check everything, print options, exit */ extern int child_wait; /* # seconds to wait for children at end */ -#ifdef USE_EAPTLS +#ifdef PPP_WITH_IPV6CP +extern char path_ipv6up[]; /* pathname of ipv6-up script */ +extern char path_ipv6down[]; /* pathname of ipv6-down script */ +#endif +#if defined(PPP_WITH_EAPTLS) || defined(USE_PEAP) #define TLS_VERIFY_NONE "none" #define TLS_VERIFY_NAME "name" #define TLS_VERIFY_SUBJECT "subject" #define TLS_VERIFY_SUFFIX "suffix" -extern char *crl_dir; -extern char *crl_file; -extern char *pkcs12_file; +extern char *crl_dir; +extern char *crl_file; +extern char *ca_path; +extern char *cacert_file; + extern char *max_tls_version; extern bool tls_verify_key_usage; extern char *tls_verify_method; -#endif /* USE_EAPTLS */ +#endif /* PPP_WITH_EAPTLS || USE_PEAP */ + +#ifdef PPP_WITH_EAPTLS +extern char *pkcs12_file; +#endif /* PPP_WITH_EAPTLS */ -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */ extern int maxoctets_dir; /* Direction : 0 - in+out (default) - 1 - in + 1 - in 2 - out 3 - max(in,out) */ extern int maxoctets_timeout; /* Timeout for check of octets limit */ @@ -365,15 +373,15 @@ extern int maxoctets_timeout; /* Timeout for check of octets limit */ #define PPP_OCTETS_DIRECTION_OUT 2 #define PPP_OCTETS_DIRECTION_MAXOVERAL 3 /* same as previos, but little different on RADIUS side */ -#define PPP_OCTETS_DIRECTION_MAXSESSION 4 +#define PPP_OCTETS_DIRECTION_MAXSESSION 4 #endif -#ifdef PPP_FILTER +#ifdef PPP_WITH_FILTER extern struct bpf_program pass_filter; /* Filter for pkts to pass */ extern struct bpf_program active_filter; /* Filter for link-active pkts */ #endif -#ifdef MSLANMAN +#ifdef PPP_WITH_MSLANMAN extern bool ms_lanman; /* Use LanMan password instead of NT */ /* Has meaning only with MS-CHAP challenges */ #endif @@ -614,7 +622,7 @@ int loop_chars(unsigned char *, int); /* process chars from loopback */ int loop_frame(unsigned char *, int); /* should we bring link up? */ /* Procedures exported from multilink.c */ -#ifdef HAVE_MULTILINK +#ifdef PPP_WITH_MULTILINK void mp_check_options(void); /* Check multilink-related options */ int mp_join_bundle(void); /* join our link to an appropriate bundle */ void mp_exit_bundle(void); /* have disconnected our link from bundle */ @@ -682,7 +690,7 @@ int sifaddr(int, u_int32_t, u_int32_t, u_int32_t); /* Configure IPv4 addresses for i/f */ int cifaddr(int, u_int32_t, u_int32_t); /* Reset i/f IP addresses */ -#ifdef INET6 +#ifdef PPP_WITH_IPV6CP int sif6up(int); /* Configure i/f up for IPv6 */ int sif6down(int); /* Configure i/f down for IPv6 */ int sif6addr(int, eui64_t, eui64_t); @@ -694,7 +702,7 @@ int sifdefaultroute(int, u_int32_t, u_int32_t, bool replace_default_rt); /* Create default route through i/f */ int cifdefaultroute(int, u_int32_t, u_int32_t); /* Delete default route through i/f */ -#ifdef INET6 +#ifdef PPP_WITH_IPV6CP int sif6defaultroute(int, eui64_t, eui64_t); /* Create default IPv6 route through i/f */ int cif6defaultroute(int, eui64_t, eui64_t); @@ -712,14 +720,10 @@ void logwtmp(const char *, const char *, const char *); /* Write entry to wtmp file */ int get_host_seed(void); /* Get host-dependent random number seed */ int have_route_to(u_int32_t); /* Check if route to addr exists */ -#ifdef PPP_FILTER +#ifdef PPP_WITH_FILTER int set_filters(struct bpf_program *pass, struct bpf_program *active); /* Set filter programs in kernel */ #endif -#ifdef IPX_CHANGE -int sipxfaddr(int, unsigned long, unsigned char *); -int cipxfaddr(int); -#endif int get_if_hwaddr(u_char *addr, char *name); int get_first_ether_hwaddr(u_char *addr); int get_time(struct timeval *); @@ -774,7 +778,7 @@ extern int (*chap_check_hook)(void); extern int (*chap_passwd_hook)(char *user, char *passwd); extern void (*multilink_join_hook)(void); -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS extern int (*eaptls_passwd_hook)(char *user, char *passwd); #endif @@ -865,7 +869,7 @@ extern void (*snoop_send_hook)(unsigned char *p, int len); #define EXIT_LOOPBACK 17 #define EXIT_INIT_FAILED 18 #define EXIT_AUTH_TOPEER_FAILED 19 -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS #define EXIT_TRAFFIC_LIMIT 20 #endif #define EXIT_CNID_AUTH_FAILED 21 @@ -942,12 +946,6 @@ extern void (*snoop_send_hook)(unsigned char *p, int len); #define CHAPDEBUG(x) #endif -#ifdef DEBUGIPXCP -#define IPXCPDEBUG(x) if (debug) dbglog x -#else -#define IPXCPDEBUG(x) -#endif - #ifndef SIGTYPE #if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) #define SIGTYPE void