From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 1 Mar 2018 00:10:02 +0000 (-0500)
Subject: bgpd: Cleanup api_nh in bgpd a bit
X-Git-Tag: frr-5.0-dev~194^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1374aec98ff77fb02b7a7dba88d6a10fd8058196;p=matthieu%2Ffrr.git

bgpd: Cleanup api_nh in bgpd a bit

The api_nh was being figured 2 times, also refactor
the vrf_id placement as well.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>:
---

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index daa7ccbf42..029b3d4d36 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1054,6 +1054,9 @@ void bgp_zebra_announce(struct bgp_node *rn, struct prefix *p,
 		else
 			continue;
 
+		api_nh = &api.nexthops[valid_nh_count];
+		api_nh->vrf_id = bgp->vrf_id;
+
 		if (nh_family == AF_INET) {
 			struct in_addr *nexthop;
 
@@ -1078,9 +1081,7 @@ void bgp_zebra_announce(struct bgp_node *rn, struct prefix *p,
 
 			nexthop = &mpinfo_cp->attr->nexthop;
 
-			api_nh = &api.nexthops[valid_nh_count];
 			api_nh->gate.ipv4 = *nexthop;
-			api_nh->vrf_id = bgp->vrf_id;
 			/* EVPN type-2 routes are
 			   programmed as onlink on l3-vni SVI
 			 */
@@ -1135,7 +1136,6 @@ void bgp_zebra_announce(struct bgp_node *rn, struct prefix *p,
 			if (ifindex == 0)
 				continue;
 
-			api_nh = &api.nexthops[valid_nh_count];
 			api_nh->gate.ipv6 = *nexthop;
 			api_nh->ifindex = ifindex;
 			api_nh->type = NEXTHOP_TYPE_IPV6_IFINDEX;