From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Sat, 23 Jul 2016 07:47:15 +0000 (-0400)
Subject: pimd: start fix of inherited_olist
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~351
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4fdc8f363086445dcda388155794a56a70a79f70;p=matthieu%2Ffrr.git

pimd: start fix of inherited_olist

We were not correctly determing the inherited olist and
applying it to the s,g.

Start the work to do this.

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

diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index 312e917827..0b78d08ce9 100644
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -257,7 +257,6 @@ pim_register_recv (struct interface *ifp,
     return 0;
   }
 
-#define inherited_olist(S,G) NULL
   /*
    * Please note this is not drawn to get the correct bit/data size
    *
@@ -322,7 +321,7 @@ pim_register_recv (struct interface *ifp,
 
     if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) ||
 	((SwitchToSptDesired(&sg)) &&
-	 (inherited_olist(source, group) == NULL))) {
+	 pim_upstream_inherited_olist (upstream) == 0)) {
       pim_register_stop_send (ifp, &sg, src_addr);
       sentRegisterStop = 1;
     }
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index a2bca9f650..3cbe371549 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -849,3 +849,15 @@ pim_upstream_start_register_stop_timer (struct pim_upstream *up, int null_regist
 		   pim_upstream_register_stop_timer,
 		   up, time);
 }
+
+/*
+ * For a given upstream, determine the inherited_olist
+ * and apply it.
+ * return 1 if there are any output interfaces
+ * return 0 if there are not any output interfaces
+ */
+int
+pim_upstream_inherited_olist (struct pim_upstream *up)
+{
+  return 0;
+}
diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h
index 3bfddd7d05..0049c64992 100644
--- a/pimd/pim_upstream.h
+++ b/pimd/pim_upstream.h
@@ -156,4 +156,6 @@ void pim_upstream_send_join (struct pim_upstream *up);
 void pim_upstream_switch (struct pim_upstream *up, enum pim_upstream_state new_state);
 
 const char *pim_upstream_state2str (struct pim_upstream *up);
+
+int pim_upstream_inherited_olist (struct pim_upstream *up);
 #endif /* PIM_UPSTREAM_H */