From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 29 Sep 2015 16:42:08 +0000 (-0700)
Subject: pimd: Fix test_igmp_join code to handle thread_master * changes
X-Git-Tag: frr-2.0-rc1~836
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8044778111745532ee86d285deafe5e8a4144b9b;p=mirror%2Ffrr.git

pimd: Fix test_igmp_join code to handle thread_master * changes

Fixup of pimd to be cognizant of thread_master pointer changes

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/Makefile.am b/pimd/Makefile.am
index 3a6fb34ea8..e839f9e213 100644
--- a/pimd/Makefile.am
+++ b/pimd/Makefile.am
@@ -71,6 +71,7 @@ test_igmpv3_join_SOURCES = \
 	test_igmpv3_join.c pim_igmp_join.c
 
 pimd_LDADD = ../lib/libzebra.la @LIBCAP@
+test_igmpv3_join_LDADD = ../lib/libzebra.la
 
 examplesdir = $(exampledir)
 dist_examples_DATA = pimd.conf.sample
diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c
index fe64fbc005..6f1e34de88 100644
--- a/pimd/test_igmpv3_join.c
+++ b/pimd/test_igmpv3_join.c
@@ -30,8 +30,10 @@
 #include <net/if.h>
 #include <arpa/inet.h>
 
+#include "thread.h"
 #include "pim_igmp_join.h"
 
+struct thread_master *master;
 const char *prog_name = 0;
 
 static int iface_solve_index(const char *ifname)