pimd: SwitchToSptDesired now uses struct prefix *sg.

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

diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index 608b1bf300454083af16679dbe2cd88a35ae9fe6..c1a78b722fbbae04335443f838193e5116f9cee5 100644 (file)
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -331,14 +331,14 @@ pim_register_recv (struct interface *ifp,
       }
 
     if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) ||
-       ((SwitchToSptDesired(source, group)) &&
+       ((SwitchToSptDesired(&sg)) &&
         (inherited_olist(source, group) == NULL))) {
       pim_register_stop_send (ifp, source, group, src_addr);
       sentRegisterStop = 1;
     }
 
     if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) ||
-       (SwitchToSptDesired(source, group))) {
+       (SwitchToSptDesired(&sg))) {
       if (sentRegisterStop) {
        pim_upstream_keep_alive_timer_start (upstream, PIM_RP_KEEPALIVE_PERIOD);
       } else {

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 85f45566a49547ba92bf57629e526321f4556c4f..4931c6c66711df2c2f821ba07d9f52b2aed8d1e6 100644 (file)
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -749,7 +749,7 @@ pim_upstream_keep_alive_timer_start (struct pim_upstream *up,
  *  received for the source and group.
  */
 int
-pim_upstream_switch_to_spt_desired (struct in_addr source, struct in_addr group)
+pim_upstream_switch_to_spt_desired (struct prefix *sg)
 {
   return 0;
 }

diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h
index 7783cc4bc913346be35eb7dc65302b17b0367b0a..3bfddd7d052f0edea6001a77695b8305b91d5e0d 100644 (file)
--- a/pimd/pim_upstream.h
+++ b/pimd/pim_upstream.h
@@ -146,8 +146,8 @@ void pim_upstream_update_my_assert_metric(struct pim_upstream *up);
 
 void pim_upstream_keep_alive_timer_start (struct pim_upstream *up, uint32_t time);
 
-int pim_upstream_switch_to_spt_desired (struct in_addr source, struct in_addr group);
-#define SwitchToSptDesired(S,G) pim_upstream_switch_to_spt_desired ((S), (G))
+int pim_upstream_switch_to_spt_desired (struct prefix *sg);
+#define SwitchToSptDesired(sg) pim_upstream_switch_to_spt_desired (sg)
 
 void pim_upstream_start_register_stop_timer (struct pim_upstream *up, int null_register);