diff options
| author | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-09-02 16:56:29 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-22 02:26:08 +0100 |
| commit | ba634917bde686ae908f8b59b407d23d4c88c99f (patch) | |
| tree | 8640ba9eb1b5fe5972f09a4aa0536256b91cd69d /pimd/pim_rpf.c | |
| parent | pimd: Add pim_addr_dump to facilitate v4 and v6 address dumping (diff) | |
| download | frr-ba634917bde686ae908f8b59b407d23d4c88c99f.tar.xz frr-ba634917bde686ae908f8b59b407d23d4c88c99f.zip | |
pimd: Switch 'struct in_addr' to 'struct prefix' in pim_zlookup.h
This is setup code to allow us to receive v6 addresses from
a nexthop lookup from zebra. This will allow us to work
with unnumbered interfaces.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_rpf.c')
| -rw-r--r-- | pimd/pim_rpf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c index da5f16240..928629b0c 100644 --- a/pimd/pim_rpf.c +++ b/pimd/pim_rpf.c @@ -91,7 +91,7 @@ int pim_nexthop_lookup(struct pim_nexthop *nexthop, struct in_addr addr) if (PIM_DEBUG_ZEBRA) { char nexthop_str[100]; char addr_str[100]; - pim_inet4_dump("<nexthop?>", nexthop_tab[0].nexthop_addr, nexthop_str, sizeof(nexthop_str)); + pim_addr_dump("<nexthop?>", &nexthop_tab[0].nexthop_addr, nexthop_str, sizeof(nexthop_str)); pim_inet4_dump("<addr?>", addr, addr_str, sizeof(addr_str)); zlog_debug("%s %s: found nexthop %s for address %s: interface %s ifindex=%d metric=%d pref=%d", __FILE__, __PRETTY_FUNCTION__, @@ -103,7 +103,7 @@ int pim_nexthop_lookup(struct pim_nexthop *nexthop, struct in_addr addr) /* update nextop data */ nexthop->interface = ifp; - nexthop->mrib_nexthop_addr = nexthop_tab[0].nexthop_addr; + nexthop->mrib_nexthop_addr = nexthop_tab[0].nexthop_addr.u.prefix4; nexthop->mrib_metric_preference = nexthop_tab[0].protocol_distance; nexthop->mrib_route_metric = nexthop_tab[0].route_metric; |