diff options
author | sarita patra <saritap@vmware.com> | 2022-02-17 09:08:31 +0100 |
---|---|---|
committer | sarita patra <saritap@vmware.com> | 2022-03-01 03:03:12 +0100 |
commit | 113f29b90d0f0b5f94c653e4e3d85967b70cd917 (patch) | |
tree | ff9b8217df9c7b35c6abed1dde630873862a9675 | |
parent | Merge pull request #10424 from patrasar/master_pimv6_nht (diff) | |
download | frr-113f29b90d0f0b5f94c653e4e3d85967b70cd917.tar.xz frr-113f29b90d0f0b5f94c653e4e3d85967b70cd917.zip |
pim6d: Handling last_lookup in pim_nexthop for IPV6
Signed-off-by: sarita patra <saritap@vmware.com>
-rw-r--r-- | pimd/pim_nht.c | 3 | ||||
-rw-r--r-- | pimd/pim_rpf.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index 78f074510..a8ef022b7 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -1030,8 +1030,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, nexthop_tab[i].protocol_distance; nexthop->mrib_route_metric = nexthop_tab[i].route_metric; - memcpy(&(nexthop->last_lookup), &(src_addr), - sizeof(pim_addr)); + nexthop->last_lookup = src_addr; nexthop->last_lookup_time = pim_time_monotonic_usec(); nexthop->nbr = nbr; found = 1; diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c index d971cef24..60041fe5e 100644 --- a/pimd/pim_rpf.c +++ b/pimd/pim_rpf.c @@ -67,7 +67,7 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop, * 255.255.255.255 address, since * it will never work */ - if (addr.s_addr == INADDR_NONE) + if (pim_addr_is_none(addr)) return false; #endif |