From: Donald Sharp Date: Thu, 19 Jan 2017 14:58:53 +0000 (-0500) Subject: pimd: PIM_MRT is a linux specific piece of code. X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~1 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=77b7d90beb39efe4a25e8ef6eba6f6956ad77a7c;p=matthieu%2Ffrr.git pimd: PIM_MRT is a linux specific piece of code. The PIM_MRT and registration for WRVIFWHOLECACHE is a bit of linux specific code. Until such time that this gets implemented we will have issues being able to work within the context of PIM-SM. Signed-off-by: Donald Sharp --- diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 8e97233d4b..dfd22b7022 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -16,10 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include @@ -91,6 +87,7 @@ static int pim_mroute_set(int fd, int enable) if (enable) { +#if defined linux int upcalls = IGMPMSG_WRVIFWHOLE; opt = MRT_PIM; @@ -101,6 +98,9 @@ static int pim_mroute_set(int fd, int enable) errno, safe_strerror (errno)); return -1; } +#else + zlog_warn ("PIM-SM will not work properly on this platform, until the ability to receive the WRVIFWHOLE upcall"); +#endif } return 0;