diff options
| author | Elliott Hughes <enh@google.com> | 2013-11-12 21:08:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-12 21:08:16 +0000 |
| commit | 530e669b3111a33768ba8ddb1f80b7826d6fe446 (patch) | |
| tree | 9e1e4c620695b57555c53a5b5a7c204803fc6fc2 | |
| parent | 45a0ef392729dec6ef29bc2af79110a6de6fd971 (diff) | |
| parent | 5e0738a2d8667ec1ea629649edc4fc5ae453f4a1 (diff) | |
| download | ppp-530e669b3111a33768ba8ddb1f80b7826d6fe446.tar.gz | |
Merge "Fix pppd to build with both old and uapi headers."
| -rw-r--r-- | pppd/include/net/ppp_defs.h | 17 | ||||
| -rw-r--r-- | pppd/sys-linux.c | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pppd/include/net/ppp_defs.h b/pppd/include/net/ppp_defs.h index b06eda5..a21afdb 100644 --- a/pppd/include/net/ppp_defs.h +++ b/pppd/include/net/ppp_defs.h @@ -38,6 +38,10 @@ #ifndef _PPP_DEFS_H_ #define _PPP_DEFS_H_ +#if defined(PPP_ADDRESS) +#define USING_UAPI +#endif + /* * The basic PPP frame. */ @@ -59,9 +63,11 @@ #define PPP_MAXMRU 65000 /* Largest MRU we allow */ #define PPP_MINMRU 128 +#if !defined(USING_UAPI) #define PPP_ADDRESS(p) (((u_char *)(p))[0]) #define PPP_CONTROL(p) (((u_char *)(p))[1]) #define PPP_PROTOCOL(p) ((((u_char *)(p))[2] << 8) + ((u_char *)(p))[3]) +#endif /* * Significant octet values. @@ -124,6 +130,15 @@ typedef u_int32_t ext_accm[8]; /* * What to do with network protocol (NP) packets. */ +#if defined(USING_UAPI) +/* This stuff isn't in uapi. TODO: is there a newer pppd that doesn't use this? */ +#define ifr__name b.ifr_ifrn.ifrn_name +#define stats_ptr b.ifr_ifru.ifru_data +struct ifpppstatsreq { + struct ifreq b; + struct ppp_stats stats; +}; +#else enum NPmode { NPMODE_PASS, /* pass the packet through */ NPMODE_DROP, /* silently drop the packet */ @@ -183,6 +198,8 @@ struct ppp_idle { time_t recv_idle; /* time since last NP packet received */ }; +#endif + #ifndef __P #ifdef __STDC__ #define __P(x) x diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 0d2645a..8736534 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -111,6 +111,7 @@ #include <netinet/if_ether.h> #else #include <linux/types.h> +#include <linux/tty.h> #include <linux/if.h> #include <linux/if_arp.h> #include <linux/route.h> |