Re: [netsniff-ng] [PATCH v2] pcap_io.h: fix if_arp.h musl libc/kernel headers conflict

[Tobias Klauser]

On 2017-04-16 at 13:34:00 +0200, Baruch Siach  wrote:
> Use libc provided arp definitions to avoid build failure with musl libc:
> 
> In file included from pcap_io.h:19:0,
>  from trafgen.c:59:
> .../usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/if_arp.h:113:8: 
> error: redefinition of ‘struct arpreq’
>  struct arpreq {
> ^
> In file included from 
> .../usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/if_ether.h:111:0,
>  from 
> .../usr/x86_64-buildroot-linux-musl/sysroot/usr/include/net/ethernet.h:10,
>  from trafgen.c:23:
> .../usr/x86_64-buildroot-linux-musl/sysroot/usr/include/net/if_arp.h:99:8: 
> note: originally defined here
>  struct arpreq {
> ^
> 
> Add a local definition of the ARPHRD_CAN macro that glibc does not provide.
> 
> Signed-off-by: Baruch Siach 

Before I saw your patch, I already applied a simiar patch fixing up some
additional includes in commit b25a51fa5915 ("all: use  headers
instead of  where possible"). Sorry about that!

-- 
You received this message because you are subscribed to the Google Groups 
"netsniff-ng" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to netsniff-ng+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[netsniff-ng] [PATCH v2] pcap_io.h: fix if_arp.h musl libc/kernel headers conflict

[Baruch Siach]

Use libc provided arp definitions to avoid build failure with musl libc:

In file included from pcap_io.h:19:0,
 from trafgen.c:59:
.../usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/if_arp.h:113:8: 
error: redefinition of ‘struct arpreq’
 struct arpreq {
^
In file included from 
.../usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/if_ether.h:111:0,
 from 
.../usr/x86_64-buildroot-linux-musl/sysroot/usr/include/net/ethernet.h:10,
 from trafgen.c:23:
.../usr/x86_64-buildroot-linux-musl/sysroot/usr/include/net/if_arp.h:99:8: 
note: originally defined here
 struct arpreq {
^

Add a local definition of the ARPHRD_CAN macro that glibc does not provide.

Signed-off-by: Baruch Siach 
---
v2: add ARPHRD_CAN to fix build with glibc
---
 built_in.h | 4 
 pcap_io.h  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/built_in.h b/built_in.h
index d10579abd689..fa8af60d6029 100644
--- a/built_in.h
+++ b/built_in.h
@@ -382,6 +382,10 @@ static inline u64 cpu_to_le64(u64 val)
 # define PACKET_QDISC_BYPASS 20
 #endif
 
+#ifndef ARPHRD_CAN
+# define ARPHRD_CAN280
+#endif
+
 #ifndef ARPHRD_IEEE802154_MONITOR
 # define ARPHRD_IEEE802154_MONITOR 805
 #endif
diff --git a/pcap_io.h b/pcap_io.h
index 3d70b217ada6..088858e89ccd 100644
--- a/pcap_io.h
+++ b/pcap_io.h
@@ -16,7 +16,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include "built_in.h"
 #include "die.h"
-- 
2.11.0

-- 
You received this message because you are subscribed to the Google Groups 
"netsniff-ng" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to netsniff-ng+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.