aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bennett <mbennett@google.com>2019-06-19 09:35:46 -0700
committerRob Landley <rob@landley.net>2019-06-19 16:58:22 -0500
commitd0ff0d42782817f6a1115dd2d1b58e9c6b519d51 (patch)
treea5c9e16a454a9f8d64a6f7ead1194843baf2788d
parent1b7a19c72bac5e370488b387bdbffbc1ce78ba03 (diff)
downloadtoybox-d0ff0d42782817f6a1115dd2d1b58e9c6b519d51.tar.gz
Avoid a double-definition (iphdr) from netinet/in.h and linux/ip_tunnel.h by locally defining the single constant definition ip.c uses (IP_DF) if not already defined.
-rw-r--r--toys/pending/ip.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/toys/pending/ip.c b/toys/pending/ip.c
index 66dd06fe..c4bb5d6c 100644
--- a/toys/pending/ip.c
+++ b/toys/pending/ip.c
@@ -34,9 +34,12 @@ config IP
#include <net/if_arp.h>
#include <ifaddrs.h>
#include <fnmatch.h>
-#include <netinet/ip.h>
#include <linux/if_tunnel.h>
+#ifndef IP_DF
+#define IP_DF 0x4000 /* don't fragment flag. */
+#endif
+
GLOBALS(
char stats, singleline, flush, *filter_dev, gbuf[8192];
int sockfd, connected, from_ok, route_cmd;