diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-07-13 16:54:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 16:54:39 +0200 |
| commit | 1004137bf3ac8c71fdddba6c1a4dc1f37646ac40 (patch) | |
| tree | 3c9cfe531630c2d79e58f5be34e431cbf83e8cd2 /pimd/pim_cmd_common.c | |
| parent | c9aa57dcf18f38d809c99d9b45b6cd7639daf9fc (diff) | |
| parent | db79e6ba84a13b2e15f8a192f7e848cbaa175483 (diff) | |
Merge pull request #11598 from patrasar/pim_get_instance
Diffstat (limited to 'pimd/pim_cmd_common.c')
| -rw-r--r-- | pimd/pim_cmd_common.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index c30017fc12..f2974edae2 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -1672,7 +1672,7 @@ int pim_show_join_cmd_helper(const char *vrf, struct vty *vty, pim_addr s_or_g, vty_out(vty, "%% Vrf specified: %s does not exist\n", vrf); return CMD_WARNING; } - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -1773,7 +1773,7 @@ int pim_show_jp_agg_list_cmd_helper(const char *vrf, struct vty *vty) vty_out(vty, "%% Vrf specified: %s does not exist\n", vrf); return CMD_WARNING; } - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4098,7 +4098,7 @@ int pim_show_rpf_helper(const char *vrf, struct vty *vty, bool json) if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4154,7 +4154,7 @@ int pim_show_rp_helper(const char *vrf, struct vty *vty, const char *group_str, if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4225,7 +4225,7 @@ int pim_show_secondary_helper(const char *vrf, struct vty *vty) if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4248,7 +4248,7 @@ int pim_show_statistics_helper(const char *vrf, struct vty *vty, if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4277,7 +4277,7 @@ int pim_show_upstream_helper(const char *vrf, struct vty *vty, pim_addr s_or_g, vty_out(vty, "%% Vrf specified: %s does not exist\n", vrf); return CMD_WARNING; } - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4341,7 +4341,7 @@ int pim_show_upstream_join_desired_helper(const char *vrf, struct vty *vty, if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4363,7 +4363,7 @@ int pim_show_upstream_rpf_helper(const char *vrf, struct vty *vty, bool uj) if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4387,7 +4387,7 @@ int pim_show_state_helper(const char *vrf, struct vty *vty, if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4441,7 +4441,7 @@ int pim_show_multicast_helper(const char *vrf, struct vty *vty) if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4476,7 +4476,7 @@ int pim_show_multicast_count_helper(const char *vrf, struct vty *vty, bool json) if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4533,7 +4533,7 @@ int pim_show_mroute_helper(const char *vrf, struct vty *vty, pim_addr s_or_g, if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4596,7 +4596,7 @@ int pim_show_mroute_count_helper(const char *vrf, struct vty *vty, bool json) if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4652,7 +4652,7 @@ int pim_show_mroute_summary_helper(const char *vrf, struct vty *vty, bool json) if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); @@ -4888,7 +4888,7 @@ int pim_show_interface_traffic_helper(const char *vrf, const char *if_name, if (!v) return CMD_WARNING; - pim = pim_get_pim_instance(v->vrf_id); + pim = v->info; if (!pim) { vty_out(vty, "%% Unable to find pim instance\n"); |