Merge pull request #354 from pali/register-with-name

[ppp.git] / pppd / pppd.h

diff --git a/pppd/pppd.h b/pppd/pppd.h
index d7b431d1faed210d7ead40584303de36490e793a..bd9faf0f993396742e87862d076b86e9be672b5b 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)
@@ -382,7 +386,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 +399,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 */
@@ -891,9 +893,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
 
 /*