diff options
| author | Sai Gomathi <nsaigomathi@vmware.com> | 2021-12-03 08:05:02 +0100 |
|---|---|---|
| committer | Sai Gomathi <nsaigomathi@vmware.com> | 2021-12-03 08:12:58 +0100 |
| commit | ea7d74d702975def719a574f0b58d642abeef974 (patch) | |
| tree | bf25b70f91f5e75e0fadb3de80eeaaaf6228a798 /pimd/pim_vty.c | |
| parent | Merge pull request #10110 from idryzhov/if-yang-remove-vrf (diff) | |
| download | frr-ea7d74d702975def719a574f0b58d642abeef974.tar.xz frr-ea7d74d702975def719a574f0b58d642abeef974.zip | |
pimd: Modifying members of pim_interface to accommodate IPv6 changes
Modifying the members of pim_interface which are to be used
for both IPv4 and IPv6 to common names(for both MLD and IGMP).
Issue: #10023
Co-authored-by: Mobashshera Rasool <mrasool@vmware.com>
Signed-off-by: Sai Gomathi <nsaigomathi@vmware.com>
Diffstat (limited to 'pimd/pim_vty.c')
| -rw-r--r-- | pimd/pim_vty.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index e4dec9ee8..7ee1ff6ab 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -358,56 +358,55 @@ int pim_interface_config_write(struct vty *vty) } /* ip igmp version */ - if (pim_ifp->igmp_version - != IGMP_DEFAULT_VERSION) { + if (pim_ifp->version != IGMP_DEFAULT_VERSION) { vty_out(vty, " ip igmp version %d\n", - pim_ifp->igmp_version); + pim_ifp->version); ++writes; } /* IF ip igmp query-max-response-time */ - if (pim_ifp->igmp_query_max_response_time_dsec + if (pim_ifp->query_max_response_time_dsec != IGMP_QUERY_MAX_RESPONSE_TIME_DSEC) { vty_out(vty, " ip igmp query-max-response-time %d\n", - pim_ifp->igmp_query_max_response_time_dsec); + pim_ifp->query_max_response_time_dsec); ++writes; } /* IF ip igmp query-interval */ - if (pim_ifp->igmp_default_query_interval + if (pim_ifp->default_query_interval != IGMP_GENERAL_QUERY_INTERVAL) { vty_out(vty, " ip igmp query-interval %d\n", - pim_ifp->igmp_default_query_interval); + pim_ifp->default_query_interval); ++writes; } /* IF ip igmp last-member_query-count */ - if (pim_ifp->igmp_last_member_query_count + if (pim_ifp->last_member_query_count != IGMP_DEFAULT_ROBUSTNESS_VARIABLE) { vty_out(vty, " ip igmp last-member-query-count %d\n", - pim_ifp->igmp_last_member_query_count); + pim_ifp->last_member_query_count); ++writes; } /* IF ip igmp last-member_query-interval */ - if (pim_ifp->igmp_specific_query_max_response_time_dsec + if (pim_ifp->specific_query_max_response_time_dsec != IGMP_SPECIFIC_QUERY_MAX_RESPONSE_TIME_DSEC) { vty_out(vty, " ip igmp last-member-query-interval %d\n", - pim_ifp->igmp_specific_query_max_response_time_dsec); - ++writes; + pim_ifp->specific_query_max_response_time_dsec); + ++writes; } /* IF ip igmp join */ - if (pim_ifp->igmp_join_list) { + if (pim_ifp->join_list) { struct listnode *node; struct igmp_join *ij; for (ALL_LIST_ELEMENTS_RO( - pim_ifp->igmp_join_list, - node, ij)) { + pim_ifp->join_list, node, + ij)) { char group_str[INET_ADDRSTRLEN]; char source_str [INET_ADDRSTRLEN]; |