pim6d: Handling last_lookup in pim_nexthop for IPV6

Signed-off-by: sarita patra <saritap@vmware.com>

diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index 78f074510b9825d347e00571a9f8be95b7b6b4e7..a8ef022b78b9c20b31c9f309b8c375884f7551ed 100644 (file)
--- 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 d971cef24bfc25f63dbffee9e20e1c5eaee0299e..60041fe5ef3e6c8d7e6a7a0db27d961a42eefc71 100644 (file)
--- 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