Merge pull request #3093 from donaldsharp/bgp_node_continued

Bgp node continued

diff --cc bgpd/bgp_evpn.c
Simple merge

diff --cc bgpd/bgp_evpn_vty.c
Simple merge

diff --cc bgpd/bgp_flowspec_vty.c
Simple merge

diff --cc bgpd/bgp_mplsvpn.c
Simple merge

diff --cc bgpd/bgp_nht.c
index c5d12a570678febe0aa5bdce7fd7ebef85585db6,221bfea93df3e0a861346da1ef2c0ee3bc5ad7e0..b6ef5a55c5377fde6590c93734412a03bef6d939
--- 1/bgpd/bgp_nht.c
--- 2/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_route.c
Simple merge

diff --cc bgpd/bgp_routemap.c
Simple merge

diff --cc bgpd/bgp_rpki.c
Simple merge

diff --cc bgpd/bgp_table.c
Simple merge

diff --cc bgpd/bgp_table.h
Simple merge

diff --cc bgpd/bgp_updgrp_adv.c
index cefbf72b58ea8d95bc2209ebeba3fe02f5bb8275,a6542f48a01b17134c025d9231df9adfe43570ed..3870df593f51a2278c1770167212aec5b8b59da7
--- 1/bgpd/bgp_updgrp_adv.c
--- 2/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);
  

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/rfapi/rfapi_import.c
Simple merge