use 'struct in6_pktinfo' from linux/ipv6.h

Getting the definition of the structure is system-dependent :(
For now, use Linux header unconditionally.

Signed-off-by: Eugene Crosser <evgenii.cherkashin@profitbricks.com>

diff --git a/src/Makefile b/src/Makefile
index c115768a2540ed8a62b22bb0393b5ca004efe1e2..adda87352ad9e7c09f8734b92cd6345d12df2ffb 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,5 @@
-CFLAGS = -pthread -Wall -I../include
+# -D_GNU_SOURCE needed for `struct in6_pktinfo` to be defined in linux/ipv6.h
+CFLAGS = -pthread -Wall -I../include -D_GNU_SOURCE

 ARFLAGS = rcsv
 
 LIB = libpsmb.a
 ARFLAGS = rcsv
 
 LIB = libpsmb.a

diff --git a/src/psmb_socket.c b/src/psmb_socket.c
index 41564a0279abacebdeb870c8319035e40bf23ac0..a68b1ebd995144e23f2cf7cff432cba50b8eecd7 100644 (file)
--- a/src/psmb_socket.c
+++ b/src/psmb_socket.c
@@ -12,11 +12,14 @@
 #include "psmb_priv.h"
 #include "hash64.h"
 
 #include "psmb_priv.h"
 #include "hash64.h"
 

-/* #include <linux/ipv6.h> // should give us this definition */
+#include <linux/ipv6.h> /* contains definition of `struct in6_pktinfo`, */
+                       /* but only if _GNU_SOURCE is defined. Arrgh!   */
+/* The structure itself *should* be like this:

 struct in6_pktinfo {
        struct in6_addr ipi6_addr;
        int             ipi6_ifindex;
 };
 struct in6_pktinfo {
        struct in6_addr ipi6_addr;
        int             ipi6_ifindex;
 };

+*/

 
 static void dummy_log(void *log_priv, int priority, const char *format, ...) {}
 
 
 static void dummy_log(void *log_priv, int priority, const char *format, ...) {}