proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Handling dummy upstream in "show ip pim upstream"

Browse Source 
When FRR receives IGMP/PIM (*, G) join and RP is not configured or
not reachable, then we are creating a dummy upstream with incoming
interface as NULL.
Added some null checks for the incoming interface, while displaying
the pim upstream information in the cli command "show ip pim upstream".

Signed-off-by: Sarita Patra <saritap@vmware.com>
This commit is contained in:
Sarita Patra 2019-02-22 01:47:58 -08:00
parent bbe598df21
commit d8bed89dca
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pimd/pim_cmd.c
View File

@ -2370,9 +2370,10 @@ static void pim_show_upstream(struct pim_instance *pim, struct vty *vty,
up->t_join_timer); up->t_join_timer);
/* /*
* If we have a J/P timer for the neighbor display that * If the upstream is not dummy and it has a J/P timer for the
* neighbor display that
*/ */
if (!up->t_join_timer) { if (!up->t_join_timer && up->rpf.source_nexthop.interface) {
struct pim_neighbor *nbr; struct pim_neighbor *nbr;
nbr = pim_neighbor_find( nbr = pim_neighbor_find(
@ -2412,8 +2413,10 @@ static void pim_show_upstream(struct pim_instance *pim, struct vty *vty,
json_row = json_object_new_object(); json_row = json_object_new_object();
json_object_pim_upstream_add(json_row, up); json_object_pim_upstream_add(json_row, up);
json_object_string_add( json_object_string_add(
json_row, "inboundInterface", json_row, "inboundInterface",
up->rpf.source_nexthop.interface->name); up->rpf.source_nexthop.interface
? up->rpf.source_nexthop.interface->name
: "Unknown");
/* /*
* The RPF address we use is slightly different * The RPF address we use is slightly different
@ -2463,8 +2466,10 @@ static void pim_show_upstream(struct pim_instance *pim, struct vty *vty,
} else { } else {
vty_out(vty, vty_out(vty,
"%-10s%-15s %-15s %-11s %-8s %-9s %-9s %-9s %6d\n", "%-10s%-15s %-15s %-11s %-8s %-9s %-9s %-9s %6d\n",
up->rpf.source_nexthop.interface->name, src_str, up->rpf.source_nexthop.interface
grp_str, state_str, uptime, join_timer, ? up->rpf.source_nexthop.interface->name
: "Unknown",
src_str, grp_str, state_str, uptime, join_timer,
rs_timer, ka_timer, up->ref_count); rs_timer, ka_timer, up->ref_count);
} }
} }