pimd: Modifying member of pim_instance to accomodate IPv6 changes

Modifying igmp_watermark_limit of struct pim_instance
to gm_watermark_limit which is to be used for both IGMP and MLD.

Signed-off-by: Sai Gomathi N <nsaigomathi@vmware.com>

diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c
index 4f0758cf6a4fc1afe9938ab5fbcc1b2782b7d3e2..a3275259047aafb1e965d9e0b4eb969e12814852 100644 (file)
--- a/pimd/pim6_cmd.c
+++ b/pimd/pim6_cmd.c
@@ -687,7 +687,7 @@ DEFPY (ipv6_mld_group_watermark,
 {
        PIM_DECLVAR_CONTEXT_VRF(vrf, pim);
 
-       /* TBD Depends on MLD data structure changes */
+       /* TBD Depends on MLD data structure changes */
        (void)pim;
 
        return CMD_SUCCESS;

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 817ebcc256e0c06a06552f029ed58276e2f93b1a..91cc3aa79b2aa7cdfc4029ec121129eb21aefd56 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1135,12 +1135,12 @@ static void igmp_show_groups(struct pim_instance *pim, struct vty *vty, bool uj)
                json = json_object_new_object();
                json_object_int_add(json, "totalGroups", pim->igmp_group_count);
                json_object_int_add(json, "watermarkLimit",
-                                   pim->igmp_watermark_limit);
+                                   pim->gm_watermark_limit);
        } else {
                vty_out(vty, "Total IGMP groups: %u\n", pim->igmp_group_count);
                vty_out(vty, "Watermark warn limit(%s): %u\n",
-                       pim->igmp_watermark_limit ? "Set" : "Not Set",
-                       pim->igmp_watermark_limit);
+                       pim->gm_watermark_limit ? "Set" : "Not Set",
+                       pim->gm_watermark_limit);
                vty_out(vty,
                        "Interface        Group           Mode Timer    Srcs V Uptime  \n");
        }
@@ -3334,7 +3334,7 @@ DEFPY (ip_igmp_group_watermark,
        "Group count to generate watermark warning\n")
 {
        PIM_DECLVAR_CONTEXT_VRF(vrf, pim);
-       pim->igmp_watermark_limit = limit;
+       pim->gm_watermark_limit = limit;
 
        return CMD_SUCCESS;
 }
@@ -3349,7 +3349,7 @@ DEFPY (no_ip_igmp_group_watermark,
        IGNORED_IN_NO_STR)
 {
        PIM_DECLVAR_CONTEXT_VRF(vrf, pim);
-       pim->igmp_watermark_limit = 0;
+       pim->gm_watermark_limit = 0;
 
        return CMD_SUCCESS;
 }

diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 849216af62ccc6bde8da540f3216a8b05d32753c..6ffeeb96571886e69d5e3b7b3550fd36df0ca8f7 100644 (file)
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -1009,8 +1009,8 @@ static void igmp_group_count_incr(struct pim_interface *pim_ifp)
        uint32_t group_count = listcount(pim_ifp->gm_group_list);
 
        ++pim_ifp->pim->igmp_group_count;
-       if (pim_ifp->pim->igmp_group_count
-           == pim_ifp->pim->igmp_watermark_limit) {
+       if (pim_ifp->pim->igmp_group_count ==
+           pim_ifp->pim->gm_watermark_limit) {
                zlog_warn(
                        "IGMP group count reached watermark limit: %u(vrf: %s)",
                        pim_ifp->pim->igmp_group_count,

diff --git a/pimd/pim_instance.h b/pimd/pim_instance.h
index 23b9df4aff13a75d9dc13f317ff714d9695439ed..684785dd13e174784b6b951fae3f02504bed0c5c 100644 (file)
--- a/pimd/pim_instance.h
+++ b/pimd/pim_instance.h
@@ -173,7 +173,7 @@ struct pim_instance {
        struct thread *t_gm_recv;
 
        unsigned int igmp_group_count;
-       unsigned int igmp_watermark_limit;
+       unsigned int gm_watermark_limit;
        unsigned int keep_alive_time;
        unsigned int rp_keep_alive_time;
 

diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 4dd13987335e35d03a47752bc4325e66e287ce84..b00c25a482284fe52e72478ac8a737abf3bdb3ef 100644 (file)
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -260,9 +260,9 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
                ++writes;
        }
 
-       if (pim->igmp_watermark_limit != 0) {
+       if (pim->gm_watermark_limit != 0) {
                vty_out(vty, "%sip igmp watermark-warn %u\n", spaces,
-                       pim->igmp_watermark_limit);
+                       pim->gm_watermark_limit);
                ++writes;
        }