From 113f29b90d0f0b5f94c653e4e3d85967b70cd917 Mon Sep 17 00:00:00 2001 From: sarita patra Date: Thu, 17 Feb 2022 00:08:31 -0800 Subject: [PATCH] pim6d: Handling last_lookup in pim_nexthop for IPV6 Signed-off-by: sarita patra --- pimd/pim_nht.c | 3 +-- 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 78f074510b..a8ef022b78 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 d971cef24b..60041fe5ef 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 -- 2.39.5