diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-08-19 19:25:20 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-22 02:26:07 +0100 |
| commit | f24405b1e81bf5a269936fc03187c20853e6056d (patch) | |
| tree | d3718d2c18c0873c5c18dafb31db583e5f229c3d /pimd/pim_rp.c | |
| parent | pimd: When deleting upstream double ensure route is removed (diff) | |
| download | frr-f24405b1e81bf5a269936fc03187c20853e6056d.tar.xz frr-f24405b1e81bf5a269936fc03187c20853e6056d.zip | |
pimd - Fix rpf lookup to what it was originally
I tried to be smart and skirt around rpf lookup if I knew
the incoming interface. This turns out to be not necessarily
a good thing because we can easily have asymetrical routing.
This fix removes the attempt to cache the ifp we received
the incoming packet on and just lets the lookup work like
it should.
Additionally it removes the weird hardcoding of the rpf
interface from the register stuff.
Ticket: CM-12530
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
reb
Diffstat (limited to 'pimd/pim_rp.c')
| -rw-r--r-- | pimd/pim_rp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c index 0af7a991e..84de87076 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -262,7 +262,7 @@ pim_rp_setup (void) for (ALL_LIST_ELEMENTS_RO (qpim_rp_list, node, rp_info)) { - if (pim_nexthop_lookup (&rp_info->rp.source_nexthop, rp_info->rp.rpf_addr, NULL) != 0) + if (pim_nexthop_lookup (&rp_info->rp.source_nexthop, rp_info->rp.rpf_addr) != 0) { zlog_err ("Unable to lookup nexthop for rp specified"); ret++; @@ -358,7 +358,7 @@ pim_rp_g (struct in_addr group) if (rp_info) { - pim_nexthop_lookup(&rp_info->rp.source_nexthop, rp_info->rp.rpf_addr, NULL); + pim_nexthop_lookup(&rp_info->rp.source_nexthop, rp_info->rp.rpf_addr); return (&rp_info->rp); } |