diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-06-05 12:15:44 -0700 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-05-25 20:38:32 -0400 |
| commit | a724477d97709001bce8b004632d9e1e5adb36be (patch) | |
| tree | 0ec439a1f94b6072a12754663c704b001d0a3525 /pimd/pim_mroute.h | |
| parent | 60b40924ea6af9a88e82d8fdf5647c9663a9d66d (diff) | |
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>
Diffstat (limited to 'pimd/pim_mroute.h')
| -rw-r--r-- | pimd/pim_mroute.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pimd/pim_mroute.h b/pimd/pim_mroute.h index 350b1e373e..125d1901bf 100644 --- a/pimd/pim_mroute.h +++ b/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> |