lib: copy_nexthops() only copies the first nexthop

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Before the fix NHT had each path resolving via swp1

cel-redxp-10# show ip route 20.0.11.253
Routing entry for 20.0.11.0/24
  Known via "bgp", distance 20, metric 0, best
  Last update 00:00:20 ago
  * 169.254.0.1, via swp1
  * 169.254.0.17, via swp2

cel-redxp-10#

cel-redxp-10# show ip nht
[snip]
20.0.11.253
 resolved via bgp
 via 169.254.0.1, swp1
 via 169.254.0.1, swp1
 Client list: pim(fd 19)

After the fix

cel-redxp-10# show ip nht
[snip]
20.0.11.253
 resolved via bgp
 via 169.254.0.1, swp1
 via 169.254.0.17, swp2
 Client list: pim(fd 19)

diff --git a/lib/nexthop.c b/lib/nexthop.c
index 9b0c2d73f4700967cbc0201ad9a9428dc5f1521a..7180be33dd852ab0bdccdcddefbc9e53c0fd446b 100644 (file)
--- a/lib/nexthop.c
+++ b/lib/nexthop.c
@@ -133,17 +133,17 @@ void copy_nexthops(struct nexthop **tnh, struct nexthop *nh,
 
        for (nh1 = nh; nh1; nh1 = nh1->next) {
                nexthop = nexthop_new();
-               nexthop->ifindex = nh->ifindex;
-               nexthop->type = nh->type;
-               nexthop->flags = nh->flags;
-               memcpy(&nexthop->gate, &nh->gate, sizeof(nh->gate));
-               memcpy(&nexthop->src, &nh->src, sizeof(nh->src));
-               memcpy(&nexthop->rmap_src, &nh->rmap_src, sizeof(nh->rmap_src));
+               nexthop->ifindex = nh1->ifindex;
+               nexthop->type = nh1->type;
+               nexthop->flags = nh1->flags;
+               memcpy(&nexthop->gate, &nh1->gate, sizeof(nh1->gate));
+               memcpy(&nexthop->src, &nh1->src, sizeof(nh1->src));
+               memcpy(&nexthop->rmap_src, &nh1->rmap_src, sizeof(nh1->rmap_src));
                nexthop->rparent = rparent;
-               if (nh->nh_label)
-                       nexthop_add_labels(nexthop, nh->nh_label_type,
-                                          nh->nh_label->num_labels,
-                                          &nh->nh_label->label[0]);
+               if (nh1->nh_label)
+                       nexthop_add_labels(nexthop, nh1->nh_label_type,
+                                          nh1->nh_label->num_labels,
+                                          &nh1->nh_label->label[0]);
                nexthop_add(tnh, nexthop);
 
                if (CHECK_FLAG(nh1->flags, NEXTHOP_FLAG_RECURSIVE))