Browse Source

pim_mroute.h has a different version of code than linux/mroute.h provides

linux/mroutes.h and pim_mroute.h both have copies of the same structures.
This is causing failures in setsockopt(..., MRT_ADD_MFC,...) because
of data structure incompatibilities between the kernel and what
pim_mroute.h was providing.  Modify the code to check for mroute.h
and include it if necessary.  I did not modify the non linux/mroute.h
path because I do not have other systems to test on easily.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp 4 years ago
parent
commit
1934e7895d
2 changed files with 9 additions and 0 deletions
  1. 5 0
      configure.ac
  2. 4 0
      pimd/pim_mroute.h

+ 5 - 0
configure.ac

@@ -950,6 +950,11 @@ dnl figure out how to specify an interface in multicast sockets API
 dnl ---------------------------------------------------------------
 AC_CHECK_MEMBERS([struct ip_mreqn.imr_ifindex], [], [], QUAGGA_INCLUDES)
 
+AC_CHECK_HEADERS([linux/mroute.h], [], [],
+[
+#if HAVE_NETINET_IN_H
+#include<netinet/in.h>
+#endif])
 AC_MSG_CHECKING([for BSD struct ip_mreq hack])
 AC_TRY_COMPILE([#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>

+ 4 - 0
pimd/pim_mroute.h

@@ -40,6 +40,9 @@
 
 #define PIM_MROUTE_MIN_TTL (1)
 
+#if defined(HAVE_LINUX_MROUTE_H)
+#include <linux/mroute.h>
+#else
 /*
   Below: from <linux/mroute.h>
 */
@@ -154,6 +157,7 @@ struct igmpmsg
   struct in_addr im_src,im_dst;
 };
 #endif
+#endif
 
 /*
   Above: from <linux/mroute.h>