diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2017-10-31 00:23:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 00:23:42 -0500 |
| commit | 0eb71379e3d841d2962a98448ccf429456ba8c05 (patch) | |
| tree | 6edfc0e14182aec70a7495164e088b1a75c6da9c /pimd/pim_cmd.c | |
| parent | 6292fd1af9aec87b25fadd4729e00473bb3018b6 (diff) | |
| parent | 9993f22cb10e653d9deaac262edadc6abf277894 (diff) | |
Merge pull request #1389 from donaldsharp/pim_nexthop_lookup_crash
pimd: When doing a RPF for a route, note when we fail the lookup
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index a9239c2835..10b68ab735 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -4252,11 +4252,16 @@ DEFUN (show_ip_pim_nexthop_lookup, memset(&nexthop, 0, sizeof(nexthop)); if (pim_find_or_track_nexthop(vrf->info, &nht_p, NULL, NULL, &pnc)) - pim_ecmp_nexthop_search(vrf->info, &pnc, &nexthop, &nht_p, &grp, - 0); + result = pim_ecmp_nexthop_search(vrf->info, &pnc, &nexthop, + &nht_p, &grp, 0); else - pim_ecmp_nexthop_lookup(vrf->info, &nexthop, vif_source, &nht_p, - &grp, 0); + result = pim_ecmp_nexthop_lookup(vrf->info, &nexthop, vif_source, + &nht_p, &grp, 0); + + if (!result) { + vty_out(vty, "Nexthop Lookup failed, no usable routes returned.\n"); + return CMD_SUCCESS; + } pim_addr_dump("<grp?>", &grp, grp_str, sizeof(grp_str)); pim_addr_dump("<nexthop?>", &nexthop.mrib_nexthop_addr, |