pimd: Convert rpf_cache_refresh_delay_msec into pim_router struct

Move the rpf_cache_refresh_delay_msec into the pim_router since
it should own the data.

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

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 2d69d4155a16799c2e44bad609c31ae31a95c278..5b3d0713acb0fb51fb7c80f21ebbc799406d9c13 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -2646,7 +2646,7 @@ static void show_rpf_refresh_stats(struct vty *vty, struct pim_instance *pim,
 
        if (json) {
                json_object_int_add(json, "rpfCacheRefreshDelayMsecs",
-                                   qpim_rpf_cache_refresh_delay_msec);
+                                   router->rpf_cache_refresh_delay_msec);
                json_object_int_add(
                        json, "rpfCacheRefreshTimer",
                        pim_time_timer_remain_msec(pim->rpf_cache_refresher));
@@ -2669,7 +2669,7 @@ static void show_rpf_refresh_stats(struct vty *vty, struct pim_instance *pim,
                        "RPF Cache Refresh Last:     %s\n"
                        "Nexthop Lookups:            %lld\n"
                        "Nexthop Lookups Avoided:    %lld\n",
-                       qpim_rpf_cache_refresh_delay_msec,
+                       router->rpf_cache_refresh_delay_msec,
                        pim_time_timer_remain_msec(pim->rpf_cache_refresher),
                        (long long)pim->rpf_cache_refresh_requests,
                        (long long)pim->rpf_cache_refresh_events,

diff --git a/pimd/pim_instance.h b/pimd/pim_instance.h
index 9f36b9c3041625519707998b4324f1526f0c0313..f7b8e32af1141574c8b2356b42e29a3f71e5ad3d 100644 (file)
--- a/pimd/pim_instance.h
+++ b/pimd/pim_instance.h
@@ -51,6 +51,7 @@ struct pim_router {
 
        int t_periodic;
        struct pim_assert_metric infinite_assert_metric;
+       long rpf_cache_refresh_delay_msec;
 };
 
 /* Per VRF PIM DB */

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 0524f74e3d28fec4314bf166ff318592c5020a60..0753f99a9fa9971b5c35d4b124767f9e7778ca2d 100644 (file)
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -727,11 +727,11 @@ void sched_rpf_cache_refresh(struct pim_instance *pim)
 
        if (PIM_DEBUG_ZEBRA) {
                zlog_debug("%s: triggering %ld msec timer", __PRETTY_FUNCTION__,
-                          qpim_rpf_cache_refresh_delay_msec);
+                          router->rpf_cache_refresh_delay_msec);
        }
 
        thread_add_timer_msec(router->master, on_rpf_cache_refresh, pim,
-                             qpim_rpf_cache_refresh_delay_msec,
+                             router->rpf_cache_refresh_delay_msec,
                              &pim->rpf_cache_refresher);
 }
 

diff --git a/pimd/pimd.c b/pimd/pimd.c
index 2a37477fb9d81dd80a4a46a3df50c4af3be8bfdf..81f5888cb25b862b722b6ebbaa2bb59d6ae46c02 100644 (file)
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -51,7 +51,6 @@ DEFINE_MTYPE_STATIC(PIMD, ROUTER, "PIM Router information");
 
 struct pim_router *router = NULL;
 
-long qpim_rpf_cache_refresh_delay_msec = 50;
 int qpim_packet_process = PIM_DEFAULT_PACKET_PROCESS;
 struct pim_instance *pimg = NULL;
 
@@ -103,6 +102,7 @@ void pim_router_init(void)
        router->infinite_assert_metric.route_metric =
                PIM_ASSERT_ROUTE_METRIC_MAX;
        router->infinite_assert_metric.ip_address.s_addr = INADDR_ANY;
+       router->rpf_cache_refresh_delay_msec = 50;
 }
 
 void pim_router_terminate(void)

diff --git a/pimd/pimd.h b/pimd/pimd.h
index 2c13b5613d1344e7d487700b1d5863c1963977a4..d653c19f7e3ba035ed92c47b471328411d42970c 100644 (file)
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@ -135,7 +135,6 @@ const char *const PIM_ALL_IGMP_ROUTERS;
 extern struct pim_router *router;
 extern struct zebra_privs_t pimd_privs;
 struct in_addr qpim_all_pim_routers_addr;
-long qpim_rpf_cache_refresh_delay_msec;
 extern int qpim_packet_process;
 extern uint8_t qpim_ecmp_enable;
 extern uint8_t qpim_ecmp_rebalance_enable;