From: Lou Berger <lberger@labn.net>
Date: Tue, 11 Dec 2018 16:13:25 +0000 (-0500)
Subject: Merge pull request #3093 from donaldsharp/bgp_node_continued
X-Git-Tag: frr-7.1-dev~108
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9bdb632c68428cc20a92e00d593ae90cb94690ad;p=matthieu%2Ffrr.git

Merge pull request #3093 from donaldsharp/bgp_node_continued

Bgp node continued
---

9bdb632c68428cc20a92e00d593ae90cb94690ad
diff --cc bgpd/bgp_nht.c
index c5d12a5706,221bfea93d..b6ef5a55c5
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@@ -866,10 -866,8 +866,10 @@@ void bgp_nht_register_enhe_capability_i
  	if (p.family != AF_INET6)
  		return;
  	rn = bgp_node_lookup(bgp->nexthop_cache_table[AFI_IP6], &p);
 +	if (!rn)
 +		return;
  
- 	bnc = bgp_nexthop_get_node_info(rn);
+ 	bnc = bgp_node_get_bgp_nexthop_info(rn);
  	if (!bnc)
  		return;
  
diff --cc bgpd/bgp_updgrp_adv.c
index cefbf72b58,a6542f48a0..3870df593f
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@@ -119,10 -110,12 +119,11 @@@ static void subgrp_withdraw_stale_addpa
  
  	/* Look through all of the paths we have advertised for this rn and send
  	 * a withdraw for the ones that are no longer present */
 -	for (adj = ctx->rn->adj_out; adj; adj = adj_next) {
 -		adj_next = adj->next;
 +	RB_FOREACH_SAFE (adj, bgp_adj_out_rb, &ctx->rn->adj_out, adj_next) {
  
  		if (adj->subgroup == subgrp) {
- 			for (pi = ctx->rn->info; pi; pi = pi->next) {
+ 			for (pi = bgp_node_get_bgp_path_info(ctx->rn);
+ 			     pi; pi = pi->next) {
  				id = bgp_addpath_id_for_peer(peer, afi, safi,
  					&pi->tx_addpath);