Update DFS's legal name and email address to correct values. (#381)

[ppp.git] / pppd / pppd.h

diff --git a/pppd/pppd.h b/pppd/pppd.h
index d7b431d1faed210d7ead40584303de36490e793a..d4bc043500a1781966d1fe35fb0e580ca52f7fd1 100644 (file)
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -53,7 +53,11 @@
 #include <stdarg.h>
 #include <stdint.h>
 #include <sys/types.h>         /* for u_int32_t, if defined */
+#if defined(SOL2)
 #include <net/ppp_defs.h>
+#else
+#include <linux/ppp_defs.h>
+#endif
 
 #ifdef PPP_WITH_IPV6CP
 #if defined(SOL2)
@@ -354,6 +358,7 @@ extern bool multilink;      /* enable multilink operation */
 extern bool    noendpoint;     /* don't send or accept endpt. discrim. */
 extern char    *bundle_name;   /* bundle name for multilink */
 extern bool    dump_options;   /* print out option values */
+extern bool    show_options;   /* show all option names and descriptions */
 extern bool    dryrun;         /* check everything, print options, exit */
 extern int     child_wait;     /* # seconds to wait for children at end */
 
@@ -382,7 +387,6 @@ extern char *tls_verify_method;
 extern char *pkcs12_file;
 #endif /* PPP_WITH_EAPTLS */
 
-#ifdef PPP_WITH_MAXOCTETS
 extern unsigned int maxoctets;      /* Maximum octetes per session (in bytes) */
 extern int       maxoctets_dir;      /* Direction :
                                      0 - in+out (default)
@@ -396,7 +400,6 @@ extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
 #define PPP_OCTETS_DIRECTION_MAXOVERAL  3
 /* same as previos, but little different on RADIUS side */
 #define PPP_OCTETS_DIRECTION_MAXSESSION 4
-#endif
 
 #ifdef PPP_WITH_FILTER
 extern struct  bpf_program pass_filter;   /* Filter for pkts to pass */
@@ -774,7 +777,8 @@ int  override_value(char *, int, const char *);
                                /* override value if permitted by priority */
 void print_options(printer_func, void *);
                                /* print out values of all options */
-
+void showopts(void);
+                /* show all option names and description */
 int parse_dotted_ip(char *, u_int32_t *);
 
 /*
@@ -891,9 +895,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 PPP_WITH_MAXOCTETS
 #define EXIT_TRAFFIC_LIMIT     20
-#endif
 #define EXIT_CNID_AUTH_FAILED  21
 
 /*