matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

bgpd: Abstract bgp_info retrieving/setting from info pointer

Browse source 
The bgp_info data is stored as a void pointer in `struct bgp_node`.
Abstract retrieval of this data and setting of this data
into functions so that in the future we can move around
what is stored in bgp_node.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-07-30 11:40:02 -04:00
parent aaafc32167
commit 6f94b685d0
20 changed files with 224 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bgpd/bgp_addpath.c
View file

@ -193,7 +193,7 @@ static void bgp_addpath_flush_type(struct bgp *bgp, afi_t afi, safi_t safi,
idalloc_drain_pool(
bgp->tx_addpath.id_allocators[afi][safi][addpath_type],
&(rn->tx_addpath.free_ids[addpath_type]));
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
if (pi->tx_addpath.addpath_tx_id[addpath_type]
!= IDALLOC_INVALID) {
idalloc_free(
@ -256,7 +256,7 @@ static void bgp_addpath_populate_type(struct bgp *bgp, afi_t afi, safi_t safi,
for (rn = bgp_table_top(bgp->rib[afi][safi]); rn;
rn = bgp_route_next(rn))
for (bi = rn->info; bi; bi = bi->next)
for (bi = bgp_node_get_bgp_path_info(rn); bi; bi = bi->next)
bgp_addpath_populate_path(allocator, bi, addpath_type);
}
@ -396,7 +396,7 @@ void bgp_addpath_update_ids(struct bgp *bgp, struct bgp_node *bn, afi_t afi,
continue;
/* Free Unused IDs back to the pool.*/
for (pi = bn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(bn); pi; pi = pi->next) {
if (pi->tx_addpath.addpath_tx_id[i] != IDALLOC_INVALID
&& !bgp_addpath_tx_path(i, pi)) {
idalloc_free_to_pool(pool_ptr,
@ -407,7 +407,7 @@ void bgp_addpath_update_ids(struct bgp *bgp, struct bgp_node *bn, afi_t afi,
}
/* Give IDs to paths that need them (pulling from the pool) */
for (pi = bn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(bn); pi; pi = pi->next) {
if (pi->tx_addpath.addpath_tx_id[i] == IDALLOC_INVALID
&& bgp_addpath_tx_path(i, pi)) {
pi->tx_addpath.addpath_tx_id[i] =

2
bgpd/bgp_dump.c
View file

@ -410,7 +410,7 @@ static unsigned int bgp_dump_routes_func(int afi, int first_run,
table = bgp->rib[afi][SAFI_UNICAST];
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
path = rn->info;
path = bgp_node_get_bgp_path_info(rn);
while (path) {
path = bgp_dump_route_node_record(afi, rn, path, seq);
seq++;

68
bgpd/bgp_evpn.c
View file

@ -1232,7 +1232,8 @@ static int evpn_route_is_def_gw(struct bgp *bgp, struct bgp_node *rn)
struct bgp_path_info *local_pi = NULL;
local_pi = NULL;
for (tmp_pi = rn->info; tmp_pi; tmp_pi = tmp_pi->next) {
for (tmp_pi = bgp_node_get_bgp_path_info(rn); tmp_pi;
tmp_pi = tmp_pi->next) {
if (tmp_pi->peer == bgp->peer_self
&& tmp_pi->type == ZEBRA_ROUTE_BGP
&& tmp_pi->sub_type == BGP_ROUTE_STATIC)
@ -1255,7 +1256,8 @@ static int evpn_route_is_sticky(struct bgp *bgp, struct bgp_node *rn)
struct bgp_path_info *local_pi;
local_pi = NULL;
for (tmp_pi = rn->info; tmp_pi; tmp_pi = tmp_pi->next) {
for (tmp_pi = bgp_node_get_bgp_path_info(rn); tmp_pi;
tmp_pi = tmp_pi->next) {
if (tmp_pi->peer == bgp->peer_self
&& tmp_pi->type == ZEBRA_ROUTE_BGP
&& tmp_pi->sub_type == BGP_ROUTE_STATIC)
@ -1292,7 +1294,8 @@ static int update_evpn_type4_route_entry(struct bgp *bgp, struct evpnes *es,
evp = (struct prefix_evpn *)&rn->p;
/* locate the local and remote entries if any */
for (tmp_pi = rn->info; tmp_pi; tmp_pi = tmp_pi->next) {
for (tmp_pi = bgp_node_get_bgp_path_info(rn); tmp_pi;
tmp_pi = tmp_pi->next) {
if (tmp_pi->peer == bgp->peer_self
&& tmp_pi->type == ZEBRA_ROUTE_BGP
&& tmp_pi->sub_type == BGP_ROUTE_STATIC)
@ -1303,7 +1306,7 @@ static int update_evpn_type4_route_entry(struct bgp *bgp, struct evpnes *es,
remote_pi = tmp_pi;
}
/* we don't expect to see a remote_pi at this point.
/* we don't expect to see a remote_ri at this point.
* An ES route has esi + vtep_ip as the key,
* We shouldn't see the same route from any other vtep.
*/
@ -1449,7 +1452,8 @@ static int update_evpn_type5_route_entry(struct bgp *bgp_def,
*route_changed = 0;
/* locate the local route entry if any */
for (tmp_pi = rn->info; tmp_pi; tmp_pi = tmp_pi->next) {
for (tmp_pi = bgp_node_get_bgp_path_info(rn); tmp_pi;
tmp_pi = tmp_pi->next) {
if (tmp_pi->peer == bgp_def->peer_self
&& tmp_pi->type == ZEBRA_ROUTE_BGP
&& tmp_pi->sub_type == BGP_ROUTE_STATIC)
@ -1587,7 +1591,8 @@ static int update_evpn_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
/* See if this is an update of an existing route, or a new add. */
local_pi = NULL;
for (tmp_pi = rn->info; tmp_pi; tmp_pi = tmp_pi->next) {
for (tmp_pi = bgp_node_get_bgp_path_info(rn); tmp_pi;
tmp_pi = tmp_pi->next) {
if (tmp_pi->peer == bgp->peer_self
&& tmp_pi->type == ZEBRA_ROUTE_BGP
&& tmp_pi->sub_type == BGP_ROUTE_STATIC)
@ -1726,7 +1731,8 @@ static void evpn_cleanup_local_non_best_route(struct bgp *bgp,
bgp_path_info_reap(rn, local_pi);
/* tell zebra to re-add the best remote path */
for (tmp_pi = rn->info; tmp_pi; tmp_pi = tmp_pi->next) {
for (tmp_pi = bgp_node_get_bgp_path_info(rn);
tmp_pi; tmp_pi = tmp_pi->next) {
if (CHECK_FLAG(tmp_pi->flags, BGP_PATH_SELECTED)) {
curr_select = tmp_pi;
break;
@ -1863,7 +1869,8 @@ static void delete_evpn_route_entry(struct bgp *bgp, afi_t afi, safi_t safi,
*pi = NULL;
/* Now, find matching route. */
for (tmp_pi = rn->info; tmp_pi; tmp_pi = tmp_pi->next)
for (tmp_pi = bgp_node_get_bgp_path_info(rn); tmp_pi;
tmp_pi = tmp_pi->next)
if (tmp_pi->peer == bgp->peer_self
&& tmp_pi->type == ZEBRA_ROUTE_BGP
&& tmp_pi->sub_type == BGP_ROUTE_STATIC)
@ -2034,7 +2041,8 @@ static int update_all_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)
continue;
/* Identify local route. */
for (tmp_pi = rn->info; tmp_pi; tmp_pi = tmp_pi->next) {
for (tmp_pi = bgp_node_get_bgp_path_info(rn); tmp_pi;
tmp_pi = tmp_pi->next) {
if (tmp_pi->peer == bgp->peer_self
&& tmp_pi->type == ZEBRA_ROUTE_BGP
&& tmp_pi->sub_type == BGP_ROUTE_STATIC)
@ -2125,7 +2133,7 @@ static int delete_global_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)
safi = SAFI_EVPN;
rdrn = bgp_node_lookup(bgp->rib[afi][safi], (struct prefix *)&vpn->prd);
if (rdrn && rdrn->info) {
if (rdrn && bgp_node_has_bgp_path_info_data(rdrn)) {
table = (struct bgp_table *)rdrn->info;
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
struct prefix_evpn *evp = (struct prefix_evpn *)&rn->p;
@ -2195,8 +2203,8 @@ static int delete_all_es_routes(struct bgp *bgp, struct evpnes *es)
/* Walk this ES's route table and delete all routes. */
for (rn = bgp_table_top(es->route_table); rn;
rn = bgp_route_next(rn)) {
for (pi = rn->info; (pi != NULL) && (nextpi = pi->next, 1);
pi = nextpi) {
for (pi = bgp_node_get_bgp_path_info(rn);
(pi != NULL) && (nextpi = pi->next, 1); pi = nextpi) {
bgp_path_info_delete(rn, pi);
bgp_path_info_reap(rn, pi);
}
@ -2216,8 +2224,8 @@ static int delete_all_vni_routes(struct bgp *bgp, struct bgpevpn *vpn)
/* Walk this VNI's route table and delete all routes. */
for (rn = bgp_table_top(vpn->route_table); rn;
rn = bgp_route_next(rn)) {
for (pi = rn->info; (pi != NULL) && (nextpi = pi->next, 1);
pi = nextpi) {
for (pi = bgp_node_get_bgp_path_info(rn);
(pi != NULL) && (nextpi = pi->next, 1); pi = nextpi) {
bgp_path_info_delete(rn, pi);
bgp_path_info_reap(rn, pi);
}
@ -2353,7 +2361,7 @@ static int install_evpn_route_entry_in_es(struct bgp *bgp, struct evpnes *es,
rn = bgp_node_get(es->route_table, (struct prefix *)p);
/* Check if route entry is already present. */
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->extra
&& (struct bgp_path_info *)pi->extra->parent == parent_pi)
break;
@ -2454,7 +2462,7 @@ static int install_evpn_route_entry_in_vrf(struct bgp *bgp_vrf,
attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP);
/* Check if route entry is already present. */
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->extra
&& (struct bgp_path_info *)pi->extra->parent == parent_pi)
break;
@ -2529,7 +2537,7 @@ static int install_evpn_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
rn = bgp_node_get(vpn->route_table, (struct prefix *)p);
/* Check if route entry is already present. */
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->extra
&& (struct bgp_path_info *)pi->extra->parent == parent_pi)
break;
@ -2601,7 +2609,7 @@ static int uninstall_evpn_route_entry_in_es(struct bgp *bgp, struct evpnes *es,
return 0;
/* Find matching route entry. */
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->extra
&& (struct bgp_path_info *)pi->extra->parent == parent_pi)
break;
@ -2666,7 +2674,7 @@ static int uninstall_evpn_route_entry_in_vrf(struct bgp *bgp_vrf,
return 0;
/* Find matching route entry. */
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->extra
&& (struct bgp_path_info *)pi->extra->parent == parent_pi)
break;
@ -2707,7 +2715,7 @@ static int uninstall_evpn_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
return 0;
/* Find matching route entry. */
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->extra
&& (struct bgp_path_info *)pi->extra->parent == parent_pi)
break;
@ -2907,7 +2915,8 @@ static int install_uninstall_routes_for_es(struct bgp *bgp,
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
struct prefix_evpn *evp = (struct prefix_evpn *)&rn->p;
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi;
pi = pi->next) {
/*
* Consider "valid" remote routes applicable for
* this ES.
@ -2990,7 +2999,8 @@ static int install_uninstall_routes_for_vrf(struct bgp *bgp_vrf, int install)
|| is_evpn_prefix_ipaddr_v6(evp)))
continue;
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi;
pi = pi->next) {
/* Consider "valid" remote routes applicable for
* this VRF.
*/
@ -3065,7 +3075,8 @@ static int install_uninstall_routes_for_vni(struct bgp *bgp,
if (evp->prefix.route_type != rtype)
continue;
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi;
pi = pi->next) {
/* Consider "valid" remote routes applicable for
* this VNI. */
if (!(CHECK_FLAG(pi->flags, BGP_PATH_VALID)
@ -3479,7 +3490,7 @@ static int update_advertise_vni_routes(struct bgp *bgp, struct bgpevpn *vpn)
rn = bgp_node_lookup(vpn->route_table, (struct prefix *)&p);
if (!rn) /* unexpected */
return 0;
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == bgp->peer_self &&
pi->type == ZEBRA_ROUTE_BGP
&& pi->sub_type == BGP_ROUTE_STATIC)
@ -3509,7 +3520,7 @@ static int update_advertise_vni_routes(struct bgp *bgp, struct bgpevpn *vpn)
if (evp->prefix.route_type != BGP_EVPN_MAC_IP_ROUTE)
continue;
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == bgp->peer_self
&& pi->type == ZEBRA_ROUTE_BGP
&& pi->sub_type == BGP_ROUTE_STATIC)
@ -4207,7 +4218,7 @@ void bgp_evpn_withdraw_type5_routes(struct bgp *bgp_vrf, afi_t afi, safi_t safi)
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
/* Only care about "selected" routes - non-imported. */
/* TODO: Support for AddPath for EVPN. */
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
if (CHECK_FLAG(pi->flags, BGP_PATH_SELECTED)
&& (!pi->extra || !pi->extra->parent)) {
bgp_evpn_withdraw_type5_route(bgp_vrf, &rn->p,
@ -4257,7 +4268,7 @@ void bgp_evpn_advertise_type5_routes(struct bgp *bgp_vrf, afi_t afi,
* attribute. Also, we only consider "non-imported" routes.
* TODO: Support for AddPath for EVPN.
*/
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
if (CHECK_FLAG(pi->flags, BGP_PATH_SELECTED)
&& (!pi->extra || !pi->extra->parent)) {
@ -5225,7 +5236,8 @@ int bgp_filter_evpn_routes_upon_martian_nh_change(struct bgp *bgp)
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi;
pi = pi->next) {
/* Consider "valid" remote routes applicable for
* this VNI. */

29
bgpd/bgp_evpn_vty.c
View file

@ -556,7 +556,8 @@ static void show_esi_routes(struct bgp *bgp,
if (json)
json_prefix = json_object_new_object();
if (rn->info) {
pi = bgp_node_get_bgp_path_info(rn);
if (pi) {
/* Overall header/legend displayed once. */
if (header) {
bgp_evpn_show_route_header(vty, bgp,
@ -573,7 +574,7 @@ static void show_esi_routes(struct bgp *bgp,
/* For EVPN, the prefix is displayed for each path (to fit in
* with code that already exists).
*/
for (pi = rn->info; pi; pi = pi->next) {
for (; pi; pi = pi->next) {
json_object *json_path = NULL;
if (json)
@ -643,7 +644,8 @@ static void show_vni_routes(struct bgp *bgp, struct bgpevpn *vpn, int type,
if (json)
json_prefix = json_object_new_object();
if (rn->info) {
pi = bgp_node_get_bgp_path_info(rn);
if (pi) {
/* Overall header/legend displayed once. */
if (header) {
bgp_evpn_show_route_header(vty, bgp,
@ -660,7 +662,7 @@ static void show_vni_routes(struct bgp *bgp, struct bgpevpn *vpn, int type,
/* For EVPN, the prefix is displayed for each path (to fit in
* with code that already exists).
*/
for (pi = rn->info; pi; pi = pi->next) {
for (; pi; pi = pi->next) {
json_object *json_path = NULL;
if (vtep_ip.s_addr
@ -1046,7 +1048,8 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
tbl_ver = table->version;
for (rm = bgp_table_top(table); rm; rm = bgp_route_next(rm))
for (pi = rm->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rm); pi;
pi = pi->next) {
total_count++;
if (type == bgp_show_type_neighbor) {
union sockunion *su = output_arg;
@ -2049,7 +2052,7 @@ static void evpn_show_route_vni_multicast(struct vty *vty, struct bgp *bgp,
route_vty_out_detail_header(vty, bgp, rn, NULL, afi, safi, json);
/* Display each path for this prefix. */
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
json_object *json_path = NULL;
if (json)
@ -2119,7 +2122,7 @@ static void evpn_show_route_vni_macip(struct vty *vty, struct bgp *bgp,
route_vty_out_detail_header(vty, bgp, rn, NULL, afi, safi, json);
/* Display each path for this prefix. */
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
json_object *json_path = NULL;
if (json)
@ -2226,7 +2229,7 @@ static void evpn_show_route_rd_macip(struct vty *vty, struct bgp *bgp,
json_paths = json_object_new_array();
/* Display each path for this prefix. */
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
json_object *json_path = NULL;
if (json)
@ -2307,7 +2310,8 @@ static void evpn_show_route_rd(struct vty *vty, struct bgp *bgp,
if (json)
json_prefix = json_object_new_object();
if (rn->info) {
pi = bgp_node_get_bgp_path_info(rn);
if (pi) {
/* RD header and legend - once overall. */
if (rd_header && !json) {
vty_out(vty,
@ -2330,7 +2334,7 @@ static void evpn_show_route_rd(struct vty *vty, struct bgp *bgp,
json_paths = json_object_new_array();
/* Display each path for this prefix. */
for (pi = rn->info; pi; pi = pi->next) {
for (; pi; pi = pi->next) {
json_object *json_path = NULL;
if (json)
@ -2435,7 +2439,8 @@ static void evpn_show_all_routes(struct vty *vty, struct bgp *bgp, int type,
if (type && evp->prefix.route_type != type)
continue;
if (rn->info) {
pi = bgp_node_get_bgp_path_info(rn);
if (pi) {
/* Overall header/legend displayed once. */
if (header) {
bgp_evpn_show_route_header(vty, bgp,
@ -2467,7 +2472,7 @@ static void evpn_show_all_routes(struct vty *vty, struct bgp *bgp, int type,
* fit in
* with code that already exists).
*/
for (pi = rn->info; pi; pi = pi->next) {
for (; pi; pi = pi->next) {
json_object *json_path = NULL;
path_cnt++;
add_prefix_to_json = 1;

15
bgpd/bgp_flowspec_vty.c
View file

@ -379,13 +379,14 @@ int bgp_show_table_flowspec(struct vty *vty, struct bgp *bgp, afi_t afi,
return CMD_SUCCESS;
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
if (rn->info == NULL)
pi = bgp_node_get_bgp_path_info(rn);
if (pi == NULL)
continue;
if (use_json) {
json_paths = json_object_new_array();
display = NLRI_STRING_FORMAT_JSON;
}
for (pi = rn->info; pi; pi = pi->next) {
for (; pi; pi = pi->next) {
total_count++;
route_vty_out_flowspec(vty, &rn->p, pi, display,
json_paths);
@ -542,11 +543,11 @@ extern int bgp_flowspec_display_match_per_ip(afi_t afi, struct bgp_table *rib,
continue;
if (bgp_flowspec_contains_prefix(prefix, match, prefix_check)) {
route_vty_out_flowspec(vty, &rn->p,
rn->info, use_json ?
NLRI_STRING_FORMAT_JSON :
NLRI_STRING_FORMAT_LARGE,
json_paths);
route_vty_out_flowspec(
vty, &rn->p, bgp_node_get_bgp_path_info(rn),
use_json ? NLRI_STRING_FORMAT_JSON
: NLRI_STRING_FORMAT_LARGE,
json_paths);
display++;
}
}

24
bgpd/bgp_mplsvpn.c
View file

@ -500,7 +500,7 @@ leak_update(struct bgp *bgp, /* destination bgp instance */
/*
* match parent
*/
for (bpi = bn->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(bn); bpi; bpi = bpi->next) {
if (bpi->extra && bpi->extra->parent == parent)
break;
}
@ -919,11 +919,13 @@ void vpn_leak_from_vrf_withdraw(struct bgp *bgp_vpn, /* to */
bn = bgp_afi_node_get(bgp_vpn->rib[afi][safi], afi, safi, p,
&(bgp_vrf->vpn_policy[afi].tovpn_rd));
if (!bn)
return;
/*
* vrf -> vpn
* match original bpi imported from
*/
for (bpi = (bn ? bn->info : NULL); bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(bn); bpi; bpi = bpi->next) {
if (bpi->extra && bpi->extra->parent == path_vrf) {
break;
}
@ -968,13 +970,14 @@ void vpn_leak_from_vrf_withdraw_all(struct bgp *bgp_vpn, /* to */
char buf[PREFIX2STR_BUFFER];
if (debug && bn->info) {
bpi = bgp_node_get_bgp_path_info(bn);
if (debug && bpi) {
zlog_debug(
"%s: looking at prefix %s", __func__,
prefix2str(&bn->p, buf, sizeof(buf)));
}
for (bpi = bn->info; bpi; bpi = bpi->next) {
for (; bpi; bpi = bpi->next) {
if (debug)
zlog_debug("%s: type %d, sub_type %d",
__func__, bpi->type,
@ -1017,7 +1020,8 @@ void vpn_leak_from_vrf_update_all(struct bgp *bgp_vpn, /* to */
if (debug)
zlog_debug("%s: node=%p", __func__, bn);
for (bpi = bn->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(bn); bpi;
bpi = bpi->next) {
if (debug)
zlog_debug(
"%s: calling vpn_leak_from_vrf_update",
@ -1299,7 +1303,9 @@ void vpn_leak_to_vrf_withdraw(struct bgp *bgp_vpn, /* from */
bgp->name_pretty);
bn = bgp_afi_node_get(bgp->rib[afi][safi], afi, safi, p, NULL);
for (bpi = (bn ? bn->info : NULL); bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(bn); bpi;
bpi = bpi->next) {
if (bpi->extra
&& (struct bgp_path_info *)bpi->extra->parent
== path_vpn) {
@ -1335,7 +1341,8 @@ void vpn_leak_to_vrf_withdraw_all(struct bgp *bgp_vrf, /* to */
for (bn = bgp_table_top(bgp_vrf->rib[afi][safi]); bn;
bn = bgp_route_next(bn)) {
for (bpi = bn->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(bn); bpi;
bpi = bpi->next) {
if (bpi->extra && bpi->extra->bgp_orig != bgp_vrf) {
/* delete route */
@ -1381,7 +1388,8 @@ void vpn_leak_to_vrf_update_all(struct bgp *bgp_vrf, /* to */
for (bn = bgp_table_top(table); bn; bn = bgp_route_next(bn)) {
for (bpi = bn->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(bn); bpi;
bpi = bpi->next) {
if (bpi->extra
&& bpi->extra->bgp_orig == bgp_vrf)

104
bgpd/bgp_route.c
View file

@ -152,7 +152,7 @@ struct bgp_node *bgp_afi_node_lookup(struct bgp_table *table, afi_t afi,
if (!prn)
return NULL;
if (prn->info == NULL) {
if (!bgp_node_has_bgp_path_info_data(prn)) {
bgp_unlock_node(prn);
return NULL;
}
@ -291,13 +291,13 @@ void bgp_path_info_add(struct bgp_node *rn, struct bgp_path_info *pi)
{
struct bgp_path_info *top;
top = rn->info;
top = bgp_node_get_bgp_path_info(rn);
pi->next = rn->info;
pi->next = top;
pi->prev = NULL;
if (top)
top->prev = pi;
rn->info = pi;
bgp_node_set_bgp_path_info(rn, pi);
bgp_path_info_lock(pi);
bgp_lock_node(rn);
@ -313,7 +313,7 @@ void bgp_path_info_reap(struct bgp_node *rn, struct bgp_path_info *pi)
if (pi->prev)
pi->prev->next = pi->next;
else
rn->info = pi->next;
bgp_node_set_bgp_path_info(rn, pi->next);
bgp_path_info_mpath_dequeue(pi);
bgp_path_info_unlock(pi);
@ -1895,11 +1895,13 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_node *rn,
if (bgp_flag_check(bgp, BGP_FLAG_DETERMINISTIC_MED)) {
/* Clear BGP_PATH_DMED_SELECTED for all paths */
for (pi1 = rn->info; pi1; pi1 = pi1->next)
for (pi1 = bgp_node_get_bgp_path_info(rn); pi1;
pi1 = pi1->next)
bgp_path_info_unset_flag(rn, pi1,
BGP_PATH_DMED_SELECTED);
for (pi1 = rn->info; pi1; pi1 = pi1->next) {
for (pi1 = bgp_node_get_bgp_path_info(rn); pi1;
pi1 = pi1->next) {
if (CHECK_FLAG(pi1->flags, BGP_PATH_DMED_CHECK))
continue;
if (BGP_PATH_HOLDDOWN(pi1))
@ -1965,8 +1967,8 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_node *rn,
/* Check old selected route and new selected route. */
old_select = NULL;
new_select = NULL;
for (pi = rn->info; (pi != NULL) && (nextpi = pi->next, 1);
pi = nextpi) {
for (pi = bgp_node_get_bgp_path_info(rn);
(pi != NULL) && (nextpi = pi->next, 1); pi = nextpi) {
if (CHECK_FLAG(pi->flags, BGP_PATH_SELECTED))
old_select = pi;
@ -2030,8 +2032,8 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_node *rn,
}
if (do_mpath && new_select) {
for (pi = rn->info; (pi != NULL) && (nextpi = pi->next, 1);
pi = nextpi) {
for (pi = bgp_node_get_bgp_path_info(rn);
(pi != NULL) && (nextpi = pi->next, 1); pi = nextpi) {
if (debug)
bgp_path_info_path_with_addpath_rx_str(
@ -2151,7 +2153,7 @@ void bgp_zebra_clear_route_change_flags(struct bgp_node *rn)
{
struct bgp_path_info *pi;
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
if (BGP_PATH_HOLDDOWN(pi))
continue;
UNSET_FLAG(pi->flags, BGP_PATH_IGP_CHANGED);
@ -2948,7 +2950,7 @@ int bgp_update(struct peer *peer, struct prefix *p, uint32_t addpath_id,
bgp_adj_in_set(rn, peer, attr, addpath_id);
/* Check previously received route. */
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == peer && pi->type == type
&& pi->sub_type == sub_type
&& pi->addpath_rx_id == addpath_id)
@ -3611,7 +3613,7 @@ int bgp_withdraw(struct peer *peer, struct prefix *p, uint32_t addpath_id,
}
/* Lookup withdrawn route. */
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == peer && pi->type == type
&& pi->sub_type == sub_type
&& pi->addpath_rx_id == addpath_id)
@ -3765,7 +3767,8 @@ static void bgp_soft_reconfig_table(struct peer *peer, afi_t afi, safi_t safi,
if (ain->peer != peer)
continue;
struct bgp_path_info *pi = rn->info;
struct bgp_path_info *pi =
bgp_node_get_bgp_path_info(rn);
uint32_t num_labels = 0;
mpls_label_t *label_pnt = NULL;
@ -3832,7 +3835,7 @@ static wq_item_status bgp_clear_route_node(struct work_queue *wq, void *data)
/* It is possible that we have multiple paths for a prefix from a peer
* if that peer is using AddPath.
*/
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
if (pi->peer != peer)
continue;
@ -3971,7 +3974,7 @@ static void bgp_clear_route_table(struct peer *peer, afi_t afi, safi_t safi,
ain = ain_next;
}
for (pi = rn->info; pi; pi = next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = next) {
next = pi->next;
if (pi->peer != peer)
continue;
@ -4095,7 +4098,8 @@ void bgp_clear_stale_route(struct peer *peer, afi_t afi, safi_t safi)
for (rm = bgp_table_top(table); rm;
rm = bgp_route_next(rm))
for (pi = rm->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rm); pi;
pi = pi->next) {
if (pi->peer != peer)
continue;
if (!CHECK_FLAG(pi->flags,
@ -4109,7 +4113,8 @@ void bgp_clear_stale_route(struct peer *peer, afi_t afi, safi_t safi)
} else {
for (rn = bgp_table_top(peer->bgp->rib[afi][safi]); rn;
rn = bgp_route_next(rn))
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi;
pi = pi->next) {
if (pi->peer != peer)
continue;
if (!CHECK_FLAG(pi->flags, BGP_PATH_STALE))
@ -4128,7 +4133,7 @@ static void bgp_cleanup_table(struct bgp *bgp, struct bgp_table *table,
struct bgp_path_info *next;
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn))
for (pi = rn->info; pi; pi = next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = next) {
next = pi->next;
if (CHECK_FLAG(pi->flags, BGP_PATH_SELECTED)
&& pi->type == ZEBRA_ROUTE_BGP
@ -4458,7 +4463,7 @@ void bgp_static_update(struct bgp *bgp, struct prefix *p,
attr_new = bgp_attr_intern(&attr);
}
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == bgp->peer_self && pi->type == ZEBRA_ROUTE_BGP
&& pi->sub_type == BGP_ROUTE_STATIC)
break;
@ -4626,7 +4631,7 @@ void bgp_static_withdraw(struct bgp *bgp, struct prefix *p, afi_t afi,
rn = bgp_afi_node_get(bgp->rib[afi][safi], afi, safi, p, NULL);
/* Check selected route and self inserted route. */
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == bgp->peer_self && pi->type == ZEBRA_ROUTE_BGP
&& pi->sub_type == BGP_ROUTE_STATIC)
break;
@ -4661,7 +4666,7 @@ static void bgp_static_withdraw_safi(struct bgp *bgp, struct prefix *p,
rn = bgp_afi_node_get(bgp->rib[afi][safi], afi, safi, p, prd);
/* Check selected route and self inserted route. */
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == bgp->peer_self && pi->type == ZEBRA_ROUTE_BGP
&& pi->sub_type == BGP_ROUTE_STATIC)
break;
@ -4771,7 +4776,7 @@ static void bgp_static_update_safi(struct bgp *bgp, struct prefix *p,
attr_new = bgp_attr_intern(&attr);
}
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == bgp->peer_self && pi->type == ZEBRA_ROUTE_BGP
&& pi->sub_type == BGP_ROUTE_STATIC)
break;
@ -5115,7 +5120,7 @@ static void bgp_purge_af_static_redist_routes(struct bgp *bgp, afi_t afi,
table = bgp->rib[afi][safi];
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
if (pi->peer == bgp->peer_self
&& ((pi->type == ZEBRA_ROUTE_BGP
&& pi->sub_type == BGP_ROUTE_STATIC)
@ -5553,13 +5558,13 @@ static void bgp_aggregate_install(struct bgp *bgp, afi_t afi, safi_t safi,
{
struct bgp_node *rn;
struct bgp_table *table;
struct bgp_path_info *pi, *new;
struct bgp_path_info *pi, *orig, *new;
table = bgp->rib[afi][safi];
rn = bgp_node_get(table, p);
for (pi = rn->info; pi; pi = pi->next)
for (orig = pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == bgp->peer_self && pi->type == ZEBRA_ROUTE_BGP
&& pi->sub_type == BGP_ROUTE_AGGREGATE)
break;
@ -5569,7 +5574,7 @@ static void bgp_aggregate_install(struct bgp *bgp, afi_t afi, safi_t safi,
* If the aggregate information has not changed
* no need to re-install it again.
*/
if (bgp_aggregate_info_same(rn->info, origin, aspath, community,
if (bgp_aggregate_info_same(orig, origin, aspath, community,
ecommunity, lcommunity)) {
bgp_unlock_node(rn);
@ -5604,7 +5609,7 @@ static void bgp_aggregate_install(struct bgp *bgp, afi_t afi, safi_t safi,
bgp_path_info_add(rn, new);
bgp_process(bgp, rn, afi, safi);
} else {
for (pi = rn->info; pi; pi = pi->next)
for (pi = orig; pi; pi = pi->next)
if (pi->peer == bgp->peer_self
&& pi->type == ZEBRA_ROUTE_BGP
&& pi->sub_type == BGP_ROUTE_AGGREGATE)
@ -5662,7 +5667,7 @@ static void bgp_aggregate_route(struct bgp *bgp, struct prefix *p,
match = 0;
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
if (BGP_PATH_HOLDDOWN(pi))
continue;
@ -5854,7 +5859,7 @@ static void bgp_aggregate_delete(struct bgp *bgp, struct prefix *p, afi_t afi,
continue;
match = 0;
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
if (BGP_PATH_HOLDDOWN(pi))
continue;
@ -6269,7 +6274,8 @@ void bgp_redistribute_add(struct bgp *bgp, struct prefix *p,
new_attr = bgp_attr_intern(&attr_new);
for (bpi = bn->info; bpi; bpi = bpi->next)
for (bpi = bgp_node_get_bgp_path_info(bn); bpi;
bpi = bpi->next)
if (bpi->peer == bgp->peer_self
&& bpi->sub_type == BGP_ROUTE_REDISTRIBUTE)
break;
@ -6351,7 +6357,7 @@ void bgp_redistribute_delete(struct bgp *bgp, struct prefix *p, uint8_t type,
rn = bgp_afi_node_get(bgp->rib[afi][SAFI_UNICAST], afi,
SAFI_UNICAST, p, NULL);
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == bgp->peer_self && pi->type == type)
break;
@ -6381,7 +6387,7 @@ void bgp_redistribute_withdraw(struct bgp *bgp, afi_t afi, int type,
table = bgp->rib[afi][SAFI_UNICAST];
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (pi->peer == bgp->peer_self && pi->type == type
&& pi->instance == instance)
break;
@ -8446,7 +8452,8 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi,
/* Start processing of routes. */
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
if (rn->info == NULL)
pi = bgp_node_get_bgp_path_info(rn);
if (pi == NULL)
continue;
display = 0;
@ -8455,7 +8462,7 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi,
else
json_paths = NULL;
for (pi = rn->info; pi; pi = pi->next) {
for (; pi; pi = pi->next) {
total_count++;
if (type == bgp_show_type_flap_statistics
|| type == bgp_show_type_flap_neighbor
@ -8897,7 +8904,7 @@ void route_vty_out_detail_header(struct vty *vty, struct bgp *bgp,
vty_out(vty, "not allocated\n");
}
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
count++;
if (CHECK_FLAG(pi->flags, BGP_PATH_SELECTED)) {
best = count;
@ -9076,7 +9083,8 @@ static int bgp_show_route_in_table(struct vty *vty, struct bgp *bgp,
continue;
}
for (pi = rm->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rm); pi;
pi = pi->next) {
if (header) {
route_vty_out_detail_header(
vty, bgp, rm,
@ -9114,7 +9122,8 @@ static int bgp_show_route_in_table(struct vty *vty, struct bgp *bgp,
if ((rn = bgp_node_match(rib, &match)) != NULL) {
if (!prefix_check
|| rn->p.prefixlen == match.prefixlen) {
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi;
pi = pi->next) {
if (header) {
route_vty_out_detail_header(
vty, bgp, rn, NULL, afi,
@ -9923,7 +9932,7 @@ static int bgp_table_stats_walker(struct thread *t)
if (rn == top)
continue;
if (!rn->info)
if (!bgp_node_has_bgp_path_info_data(rn))
continue;
ts->counts[BGP_STATS_PREFIXES]++;
@ -9937,7 +9946,7 @@ static int bgp_table_stats_walker(struct thread *t)
#endif
/* check if the prefix is included by any other announcements */
while (prn && !prn->info)
while (prn && !bgp_node_has_bgp_path_info_data(prn))
prn = bgp_node_parent_nolock(prn);
if (prn == NULL || prn == top) {
@ -9946,10 +9955,10 @@ static int bgp_table_stats_walker(struct thread *t)
if (space)
ts->total_space +=
pow(2.0, space - rn->p.prefixlen);
} else if (prn->info)
} else if (bgp_node_has_bgp_path_info_data(prn))
ts->counts[BGP_STATS_MAX_AGGREGATEABLE]++;
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
pinum++;
ts->counts[BGP_STATS_RIB]++;
@ -10132,7 +10141,8 @@ static int bgp_peer_count_walker(struct thread *t)
if (ain->peer == peer)
pc->count[PCOUNT_ADJ_IN]++;
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
if (pi->peer != peer)
continue;
@ -11095,7 +11105,7 @@ static int bgp_distance_unset(struct vty *vty, const char *distance_str,
XFREE(MTYPE_AS_LIST, bdistance->access_list);
bgp_distance_free(bdistance);
rn->info = NULL;
bgp_node_set_bgp_path_info(rn, NULL);
bgp_unlock_node(rn);
bgp_unlock_node(rn);
@ -11425,7 +11435,7 @@ static int bgp_clear_damp_route(struct vty *vty, const char *view_name,
if (!prefix_check
|| rm->p.prefixlen == match.prefixlen) {
pi = rm->info;
pi = bgp_node_get_bgp_path_info(rm);
while (pi) {
if (pi->extra && pi->extra->damp_info) {
pi_temp = pi->next;
@ -11445,7 +11455,7 @@ static int bgp_clear_damp_route(struct vty *vty, const char *view_name,
!= NULL) {
if (!prefix_check
|| rn->p.prefixlen == match.prefixlen) {
pi = rn->info;
pi = bgp_node_get_bgp_path_info(rn);
while (pi) {
if (pi->extra && pi->extra->damp_info) {
pi_temp = pi->next;

2
bgpd/bgp_rpki.c
View file

@ -418,7 +418,7 @@ static void revalidate_bgp_node(struct bgp_node *bgp_node, afi_t afi,
for (ain = bgp_node->adj_in; ain; ain = ain->next) {
int ret;
struct bgp_path_info *path = bgp_node->info;
struct bgp_path_info *path = bgp_info_from_node(bgp_node);
mpls_label_t *label = NULL;
uint32_t num_labels = 0;

6
bgpd/bgp_snmp.c
View file

@ -715,7 +715,8 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[],
if (rn) {
bgp_unlock_node(rn);
for (path = rn->info; path; path = path->next)
for (path = bgp_info_from_node(rn); path;
path = path->next)
if (sockunion_same(&path->peer->su, &su))
return path;
}
@ -762,7 +763,8 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[],
do {
min = NULL;
for (path = rn->info; path; path = path->next) {
for (path = bgp_info_from_node(rn); path;
path = path->next) {
if (path->peer->su.sin.sin_family == AF_INET
&& ntohl(paddr.s_addr)
< ntohl(path->peer->su.sin

7
bgpd/bgp_table.c
View file

@ -156,7 +156,8 @@ void bgp_table_range_lookup(const struct bgp_table *table, struct prefix *p,
while (node && node->p.prefixlen <= p->prefixlen
&& prefix_match(&node->p, p)) {
if (node->info && node->p.prefixlen == p->prefixlen) {
if (bgp_node_has_bgp_path_info_data(node)
&& node->p.prefixlen == p->prefixlen) {
matched = node;
break;
}
@ -172,14 +173,14 @@ void bgp_table_range_lookup(const struct bgp_table *table, struct prefix *p,
else if (matched == NULL)
matched = node = bgp_node_from_rnode(node->parent);
if (matched->info) {
if (bgp_node_has_bgp_path_info_data(matched)) {
bgp_lock_node(matched);
listnode_add(matches, matched);
}
while ((node = bgp_route_next_until_maxlen(node, matched, maxlen))) {
if (prefix_match(p, &node->p)) {
if (node->info) {
if (bgp_node_has_bgp_path_info_data(node)) {
bgp_lock_node(node);
listnode_add(matches, node);
}

17
bgpd/bgp_table.h
View file

@ -376,4 +376,21 @@ static inline void bgp_nexthop_set_node_info(struct bgp_node *node,
node->info = bnc;
}
static inline struct bgp_path_info *
bgp_node_get_bgp_path_info(struct bgp_node *node)
{
return node->info;
}
static inline void bgp_node_set_bgp_path_info(struct bgp_node *node,
struct bgp_path_info *bi)
{
node->info = bi;
}
static inline bool bgp_node_has_bgp_path_info_data(struct bgp_node *node)
{
return !!node->info;
}
#endif /* _QUAGGA_BGP_TABLE_H */

11
bgpd/bgp_updgrp_adv.c
View file

@ -114,7 +114,8 @@ static void subgrp_withdraw_stale_addpath(struct updwalk_context *ctx,
adj_next = 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);
@ -168,7 +169,8 @@ static int group_announce_route_walkcb(struct update_group *updgrp, void *arg)
if (addpath_capable) {
subgrp_withdraw_stale_addpath(ctx, subgrp);
for (pi = ctx->rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(ctx->rn);
pi; pi = pi->next) {
/* Skip the bestpath for now */
if (pi == ctx->pi)
continue;
@ -622,7 +624,7 @@ void subgroup_announce_table(struct update_subgroup *subgrp,
subgroup_default_originate(subgrp, 0);
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn))
for (ri = rn->info; ri; ri = ri->next)
for (ri = bgp_node_get_bgp_path_info(rn); ri; ri = ri->next)
if (CHECK_FLAG(ri->flags, BGP_PATH_SELECTED)
|| (addpath_capable
@ -745,7 +747,8 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
SET_FLAG(bgp->peer_self->rmap_type, PEER_RMAP_TYPE_DEFAULT);
for (rn = bgp_table_top(bgp->rib[afi][safi]); rn;
rn = bgp_route_next(rn)) {
for (ri = rn->info; ri; ri = ri->next) {
for (ri = bgp_node_get_bgp_path_info(rn);
ri; ri = ri->next) {
struct attr dummy_attr;
/* Provide dummy so the route-map can't modify

7
bgpd/bgp_vpn.c
View file

@ -38,7 +38,7 @@ int show_adj_route_vpn(struct vty *vty, struct peer *peer,
struct bgp_table *table;
struct bgp_node *rn;
struct bgp_node *rm;
struct attr *attr;
struct bgp_path_info *path;
int rd_header;
int header = 1;
json_object *json = NULL;
@ -89,7 +89,8 @@ int show_adj_route_vpn(struct vty *vty, struct peer *peer,
for (rm = bgp_table_top(table); rm;
rm = bgp_route_next(rm)) {
if ((attr = rm->info) != NULL) {
path = bgp_node_get_bgp_path_info(rm);
if (path != NULL) {
if (header) {
if (use_json) {
json_object_int_add(
@ -238,7 +239,7 @@ int show_adj_route_vpn(struct vty *vty, struct peer *peer,
json_array);
} else {
route_vty_out_tmp(
vty, &rm->p, attr,
vty, &rm->p, path->attr,
SAFI_MPLS_VPN, use_json,
json_array);
}

4
bgpd/bgp_zebra.c
View file

@ -1480,7 +1480,7 @@ void bgp_zebra_announce_table(struct bgp *bgp, afi_t afi, safi_t safi)
return;
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn))
for (pi = rn->info; pi; pi = pi->next)
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next)
if (CHECK_FLAG(pi->flags, BGP_PATH_SELECTED) &&
(pi->type == ZEBRA_ROUTE_BGP
@ -1692,7 +1692,7 @@ int bgp_redistribute_metric_set(struct bgp *bgp, struct bgp_redist *red,
for (rn = bgp_table_top(bgp->rib[afi][SAFI_UNICAST]); rn;
rn = bgp_route_next(rn)) {
for (pi = rn->info; pi; pi = pi->next) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {
if (pi->sub_type == BGP_ROUTE_REDISTRIBUTE
&& pi->type == type
&& pi->instance == red->instance) {

20
bgpd/rfapi/rfapi.c
View file

@ -382,9 +382,10 @@ void del_vnc_route(struct rfapi_descriptor *rfd,
vnc_zlog_debug_verbose(
"%s: peer=%p, prefix=%s, prd=%s afi=%d, safi=%d bn=%p, bn->info=%p",
__func__, peer, buf, prefix_rd2str(prd, buf2, sizeof(buf2)),
afi, safi, bn, (bn ? bn->info : NULL));
afi, safi, bn, (bn ? bgp_node_get_bgp_path_info(bn) : NULL));
for (bpi = (bn ? bn->info : NULL); bpi; bpi = bpi->next) {
for (bpi = (bn ? bgp_node_get_bgp_path_info(bn) : NULL); bpi;
bpi = bpi->next) {
vnc_zlog_debug_verbose(
"%s: trying bpi=%p, bpi->peer=%p, bpi->type=%d, bpi->sub_type=%d, bpi->extra->vnc.export.rfapi_handle=%p, local_pref=%u",
@ -945,7 +946,7 @@ void add_vnc_route(struct rfapi_descriptor *rfd, /* cookie, VPN UN addr, peer */
* ecommunity: POINTS TO interned/refcounted dynamic 2-part AS attr
* aspath: POINTS TO interned/refcounted hashed block
*/
for (bpi = bn->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(bn); bpi; bpi = bpi->next) {
/* probably only need to check
* bpi->extra->vnc.export.rfapi_handle */
if (bpi->peer == rfd->peer && bpi->type == type
@ -1081,7 +1082,7 @@ void add_vnc_route(struct rfapi_descriptor *rfd, /* cookie, VPN UN addr, peer */
/* debug */
if (VNC_DEBUG(VERBOSE)) {
vnc_zlog_debug_verbose("%s: printing BI", __func__);
vnc_zlog_debug_verbose("%s: printing BPI", __func__);
rfapiPrintBi(NULL, new);
}
@ -3701,10 +3702,12 @@ static void rfapi_print_exported(struct bgp *bgp)
fprintf(stderr, "%s: vpn rdn=%p\n", __func__, rdn);
for (rn = bgp_table_top(rdn->info); rn;
rn = bgp_route_next(rn)) {
if (!rn->info)
bpi = bgp_node_get_bgp_path_info(rn);
if (!bpi)
continue;
fprintf(stderr, "%s: rn=%p\n", __func__, rn);
for (bpi = rn->info; bpi; bpi = bpi->next) {
for (; bpi; bpi = bpi->next) {
rfapiPrintBi((void *)2, bpi); /* 2 => stderr */
}
}
@ -3716,10 +3719,11 @@ static void rfapi_print_exported(struct bgp *bgp)
fprintf(stderr, "%s: encap rdn=%p\n", __func__, rdn);
for (rn = bgp_table_top(rdn->info); rn;
rn = bgp_route_next(rn)) {
if (!rn->info)
bpi = bgp_node_get_bgp_path_info(rn);
if (!bpi)
continue;
fprintf(stderr, "%s: rn=%p\n", __func__, rn);
for (bpi = rn->info; bpi; bpi = bpi->next) {
for (; bpi; bpi = bpi->next) {
rfapiPrintBi((void *)2, bpi); /* 2 => stderr */
}
}

6
bgpd/rfapi/rfapi_import.c
View file

@ -4244,13 +4244,15 @@ static void rfapiBgpTableFilteredImport(struct bgp *bgp,
for (rn1 = bgp_table_top(bgp->rib[afi][safi]); rn1;
rn1 = bgp_route_next(rn1)) {
if (rn1->info) {
if (bgp_node_has_bgp_path_info_data(rn1)) {
for (rn2 = bgp_table_top(rn1->info); rn2;
rn2 = bgp_route_next(rn2)) {
struct bgp_path_info *bpi;
for (bpi = rn2->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(rn2);
bpi; bpi = bpi->next) {
uint32_t label = 0;
if (CHECK_FLAG(bpi->flags,

2
bgpd/rfapi/rfapi_vty.c
View file

@ -1570,7 +1570,7 @@ void rfapiPrintAdvertisedInfo(struct vty *vty, struct rfapi_descriptor *rfd,
vty_out(vty, " bn=%p%s", bn, HVTYNL);
for (bpi = bn->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(bn); bpi; bpi = bpi->next) {
if (bpi->peer == rfd->peer && bpi->type == type
&& bpi->sub_type == BGP_ROUTE_RFP && bpi->extra
&& bpi->extra->vnc.export.rfapi_handle == (void *)rfd) {

12
bgpd/rfapi/vnc_export_bgp.c
View file

@ -256,7 +256,7 @@ void vnc_direct_bgp_add_route_ce(struct bgp *bgp, struct agg_node *rn,
*/
urn = bgp_afi_node_get(bgp->rib[afi][SAFI_UNICAST], afi, SAFI_UNICAST,
prefix, NULL);
for (ubpi = urn->info; ubpi; ubpi = ubpi->next) {
for (ubpi = bgp_node_get_bgp_path_info(urn); ubpi; ubpi = ubpi->next) {
struct prefix unicast_nexthop;
if (CHECK_FLAG(ubpi->flags, BGP_PATH_REMOVED))
@ -483,7 +483,8 @@ static void vnc_direct_bgp_vpn_disable_ce(struct bgp *bgp, afi_t afi)
struct bgp_path_info *ri;
struct bgp_path_info *next;
for (ri = rn->info, next = NULL; ri; ri = next) {
for (ri = bgp_node_get_bgp_path_info(rn), next = NULL;
ri; ri = next) {
next = ri->next;
@ -1856,7 +1857,7 @@ void vnc_direct_bgp_rh_vpn_enable(struct bgp *bgp, afi_t afi)
/*
* skip prefix list check if no routes here
*/
if (!rn->info)
if (!bgp_node_has_bgp_path_info_data(rn))
continue;
{
@ -1883,7 +1884,8 @@ void vnc_direct_bgp_rh_vpn_enable(struct bgp *bgp, afi_t afi)
}
}
for (ri = rn->info; ri; ri = ri->next) {
for (ri = bgp_node_get_bgp_path_info(rn);
ri; ri = ri->next) {
vnc_zlog_debug_verbose("%s: ri->sub_type: %d",
__func__, ri->sub_type);
@ -2003,7 +2005,7 @@ void vnc_direct_bgp_rh_vpn_disable(struct bgp *bgp, afi_t afi)
struct bgp_path_info *ri;
struct bgp_path_info *next;
for (ri = rn->info, next = NULL; ri; ri = next) {
for (ri = bgp_node_get_bgp_path_info(rn), next = NULL; ri; ri = next) {
next = ri->next;

26
bgpd/rfapi/vnc_import_bgp.c
View file

@ -545,8 +545,8 @@ static void vnc_import_bgp_add_route_mode_resolve_nve_one_rd(
return;
}
/* Iterate over bgp_path_info items at this node */
for (bpi = bn->info; bpi; bpi = bpi->next) {
/* Iterate over bgp_info items at this node */
for (bpi = bgp_node_get_bgp_path_info(bn); bpi; bpi = bpi->next) {
vnc_import_bgp_add_route_mode_resolve_nve_one_bi(
bgp, afi, bpi, /* VPN bpi */
@ -1305,8 +1305,8 @@ static void vnc_import_bgp_del_route_mode_resolve_nve_one_rd(
return;
}
/* Iterate over bgp_path_info items at this node */
for (bpi = bn->info; bpi; bpi = bpi->next) {
/* Iterate over bgp_info items at this node */
for (bpi = bgp_node_get_bgp_path_info(bn); bpi; bpi = bpi->next) {
vnc_import_bgp_del_route_mode_resolve_nve_one_bi(
bgp, afi, bpi, /* VPN bpi */
@ -2780,7 +2780,8 @@ void vnc_import_bgp_redist_enable(struct bgp *bgp, afi_t afi)
struct bgp_path_info *bpi;
for (bpi = rn->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(rn); bpi;
bpi = bpi->next) {
if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED))
continue;
@ -2820,7 +2821,8 @@ void vnc_import_bgp_exterior_redist_enable(struct bgp *bgp, afi_t afi)
struct bgp_path_info *bpi;
for (bpi = rn->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(rn); bpi;
bpi = bpi->next) {
if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED))
continue;
@ -2865,7 +2867,8 @@ void vnc_import_bgp_exterior_redist_enable_it(
struct bgp_path_info *bpi;
for (bpi = rn->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(rn); bpi;
bpi = bpi->next) {
if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED))
continue;
@ -2902,14 +2905,16 @@ void vnc_import_bgp_redist_disable(struct bgp *bgp, afi_t afi)
for (rn1 = bgp_table_top(bgp->rib[afi][SAFI_MPLS_VPN]); rn1;
rn1 = bgp_route_next(rn1)) {
if (rn1->info) {
if (bgp_node_has_bgp_path_info_data(rn1)) {
for (rn2 = bgp_table_top(rn1->info); rn2;
rn2 = bgp_route_next(rn2)) {
struct bgp_path_info *bpi;
struct bgp_path_info *nextbpi;
for (bpi = rn2->info; bpi; bpi = nextbpi) {
for (bpi = bgp_node_get_bgp_path_info(rn2); bpi;
bpi = nextbpi) {
nextbpi = bpi->next;
@ -2999,7 +3004,8 @@ void vnc_import_bgp_exterior_redist_disable(struct bgp *bgp, afi_t afi)
struct bgp_path_info *bpi;
for (bpi = rn->info; bpi; bpi = bpi->next) {
for (bpi = bgp_node_get_bgp_path_info(rn); bpi;
bpi = bpi->next) {
if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED))
continue;

3
bgpd/rfapi/vnc_zebra.c
View file

@ -320,7 +320,8 @@ static void vnc_redistribute_withdraw(struct bgp *bgp, afi_t afi, uint8_t type)
struct bgp_path_info *ri;
for (ri = rn->info; ri; ri = ri->next) {
for (ri = bgp_node_get_bgp_path_info(rn); ri;
ri = ri->next) {
if (ri->type
== type) { /* has matching redist type */
break;