X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fpppd.h;h=e54a526e57f36eb2ac8b1b89088f1b681688f607;hb=4a54e34cf5629f9fed61f0b7d69ee3ba4d874bc6;hp=ba62ca5a7fc91c33d643573bd346e5c0514fea50;hpb=812e8e5c87da4fd84ae7bc5b6a18c85106188eb3;p=ppp.git diff --git a/pppd/pppd.h b/pppd/pppd.h index ba62ca5..e54a526 100644 --- a/pppd/pppd.h +++ b/pppd/pppd.h @@ -55,6 +55,7 @@ #include /* for encrypt */ #include /* for setkey */ #include +#include #include /* for NGROUPS_MAX */ #include /* for MAXPATHLEN and BSD4_4, if defined */ #include /* for u_int32_t, if defined */ @@ -174,8 +175,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; }; @@ -336,26 +337,37 @@ 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 INET6 +extern char path_ipv6up[MAXPATHLEN]; /* pathname of ipv6-up script */ +extern char path_ipv6down[MAXPATHLEN]; /* pathname of ipv6-down script */ +#endif + +#if defined(USE_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 || USE_PEAP */ + +#ifdef USE_EAPTLS +extern char *pkcs12_file; #endif /* USE_EAPTLS */ #ifdef 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 */ @@ -364,7 +376,7 @@ 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 @@ -715,10 +727,6 @@ int have_route_to(u_int32_t); /* Check if route to addr exists */ 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 *); @@ -941,12 +949,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