}
unregister_zebra_rnh(bnc,
CHECK_FLAG(bnc->flags, BGP_STATIC_ROUTE));
- bnc->node->info = NULL;
+ bgp_nexthop_set_node_info(bnc->node, NULL);
bgp_unlock_node(bnc->node);
bnc->node = NULL;
bnc_free(bnc);
rn = bgp_node_get(peer->bgp->nexthop_cache_table[afi], &p);
- if (!rn->info)
+ bnc = bgp_nexthop_get_node_info(rn);
+ if (!bnc)
return;
- bnc = rn->info;
-
/* cleanup the peer reference */
bnc->nht_info = NULL;
else
rn = bgp_node_get(bgp_nexthop->nexthop_cache_table[afi], &p);
- if (!rn->info) {
+ bnc = bgp_nexthop_get_node_info(rn);
+ if (!bnc) {
bnc = bnc_new();
- rn->info = bnc;
+ bgp_nexthop_set_node_info(rn, bnc);
bnc->node = rn;
bnc->bgp = bgp_nexthop;
bgp_lock_node(rn);
}
}
- bnc = rn->info;
bgp_unlock_node(rn);
if (is_bgp_static_route) {
SET_FLAG(bnc->flags, BGP_STATIC_ROUTE);
rn = bgp_node_lookup(
peer->bgp->nexthop_cache_table[family2afi(p.family)], &p);
- if (!rn || !rn->info) {
+ if (!rn) {
if (BGP_DEBUG(nht, NHT))
zlog_debug("Cannot find connected NHT node for peer %s",
peer->host);
- if (rn)
- bgp_unlock_node(rn);
return;
}
- bnc = rn->info;
+ bnc = bgp_nexthop_get_node_info(rn);
+ if (!bnc) {
+ if (BGP_DEBUG(nht, NHT))
+ zlog_debug("Cannot find connected NHT node for peer %s on route_node as expected",
+ peer->host);
+ bgp_unlock_node(rn);
+ return;
+ }
bgp_unlock_node(rn);
if (bnc->nht_info != peer) {
zlog_debug("Freeing connected NHT node %p for peer %s",
bnc, peer->host);
unregister_zebra_rnh(bnc, 0);
- bnc->node->info = NULL;
+ bgp_nexthop_set_node_info(bnc->node, NULL);
bgp_unlock_node(bnc->node);
bnc_free(bnc);
}
bgp->import_check_table[family2afi(nhr.prefix.family)],
&nhr.prefix);
- if (!rn || !rn->info) {
+ if (!rn) {
if (BGP_DEBUG(nht, NHT)) {
char buf[PREFIX2STR_BUFFER];
prefix2str(&nhr.prefix, buf, sizeof(buf));
zlog_debug("parse nexthop update(%s): rn not found",
buf);
}
- if (rn)
- bgp_unlock_node(rn);
return;
}
- bnc = rn->info;
+ bnc = bgp_nexthop_get_node_info(rn);
+ if (!bnc) {
+ if (BGP_DEBUG(nht, NHT)) {
+ char buf[PREFIX2STR_BUFFER];
+
+ prefix2str(&nhr.prefix, buf, sizeof(buf));
+ zlog_debug("parse nexthop update(%s): bnc node info not found",
+ buf);
+ }
+ bgp_unlock_node(rn);
+ return;
+ }
+
bgp_unlock_node(rn);
bnc->last_update = bgp_clock();
bnc->change_flags = 0;
for (rn = bgp_table_top(bgp->nexthop_cache_table[afi]); rn;
rn = bgp_route_next(rn)) {
- bnc = rn->info;
+ bnc = bgp_nexthop_get_node_info(rn);
if (!bnc)
continue;