pimd: Move packet_process variable to pim_router

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

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 01f46d42bf0e2dd6a7fa19e3adb215b768a3e14e..49a9b33af3f8918c9676921971147b416a90b77a 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -5339,7 +5339,7 @@ DEFUN (ip_pim_packets,
        "Number of packets\n")
 {
        PIM_DECLVAR_CONTEXT(vrf, pim);
-       qpim_packet_process = atoi(argv[3]->arg);
+       router->packet_process = atoi(argv[3]->arg);
        return CMD_SUCCESS;
 }
 
@@ -5353,7 +5353,7 @@ DEFUN (no_ip_pim_packets,
        "Number of packets\n")
 {
        PIM_DECLVAR_CONTEXT(vrf, pim);
-       qpim_packet_process = PIM_DEFAULT_PACKET_PROCESS;
+       router->packet_process = PIM_DEFAULT_PACKET_PROCESS;
        return CMD_SUCCESS;
 }
 

diff --git a/pimd/pim_instance.h b/pimd/pim_instance.h
index 2bfa76ad6cdce42946828e31bde8f850b1a2bde4..59078c750250f41113f47e238623b0c2cd7b17b3 100644 (file)
--- a/pimd/pim_instance.h
+++ b/pimd/pim_instance.h
@@ -53,6 +53,7 @@ struct pim_router {
        struct pim_assert_metric infinite_assert_metric;
        long rpf_cache_refresh_delay_msec;
        int32_t register_suppress_time;
+       int packet_process;
 };
 
 /* Per VRF PIM DB */

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index d94e5c48b3ad57ebe710a9234785ff02d0f4a346..dd9e21cae8782a030f8e498376b4f918d91e8278 100644 (file)
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -708,7 +708,7 @@ static int mroute_read(struct thread *t)
                result = pim_mroute_msg(pim, buf, rd, ifindex);
 
                count++;
-               if (count % qpim_packet_process == 0)
+               if (count % router->packet_process == 0)
                        cont = 0;
        }
 /* Keep reading */

diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index bfd98e63f922e8f4e1d4b9339e09ffd3fbd3cc17..71b0d479281be1de3b66cd138f32d8a1d562d8cd 100644 (file)
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -346,7 +346,7 @@ static int pim_sock_read(struct thread *t)
                }
 
                count++;
-               if (count % qpim_packet_process == 0)
+               if (count % router->packet_process == 0)
                        cont = 0;
        }
 

diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index ff3ada774a89ba60f993269298db82f1cdbcd530..56227956f50abddd78de84c9910ac130d3f5cd2c 100644 (file)
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -193,9 +193,9 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
                        pim->rp_keep_alive_time);
                ++writes;
        }
-       if (qpim_packet_process != PIM_DEFAULT_PACKET_PROCESS) {
+       if (router->packet_process != PIM_DEFAULT_PACKET_PROCESS) {
                vty_out(vty, "%sip pim packets %d\n", spaces,
-                       qpim_packet_process);
+                       router->packet_process);
                ++writes;
        }
        if (ssm->plist_name) {

diff --git a/pimd/pimd.c b/pimd/pimd.c
index ee198776a3cd6dc25b0967d0cbf204e1f3129c7a..8b21923b1143e33f855e1be912f10be53a663711 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;
 
-int qpim_packet_process = PIM_DEFAULT_PACKET_PROCESS;
 struct pim_instance *pimg = NULL;
 
 int32_t qpim_register_probe_time = PIM_REGISTER_PROBE_TIME_DEFAULT;
@@ -103,6 +102,7 @@ void pim_router_init(void)
        router->infinite_assert_metric.ip_address.s_addr = INADDR_ANY;
        router->rpf_cache_refresh_delay_msec = 50;
        router->register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT;
+       router->packet_process = PIM_DEFAULT_PACKET_PROCESS;
 }
 
 void pim_router_terminate(void)

diff --git a/pimd/pimd.h b/pimd/pimd.h
index 61dba8bcaeaf2512862087d9b1e9cd1e2675be94..b68725157d74b4b06f3868b927780f30ed53e83f 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;
-extern int qpim_packet_process;
 extern uint8_t qpim_ecmp_enable;
 extern uint8_t qpim_ecmp_rebalance_enable;