Skip to content

Commit

Permalink
Merge pull request #3195 from donaldsharp/nht_crash
Browse files Browse the repository at this point in the history
Nht crash
  • Loading branch information
eqvinox authored Oct 18, 2018
2 parents 705d21f + 3d11193 commit f2ca2b0
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 10 deletions.
15 changes: 11 additions & 4 deletions bgpd/bgp_nexthop.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,18 @@ static void bgp_nexthop_cache_reset(struct bgp_table *table)

for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
bnc = bgp_nexthop_get_node_info(rn);
if (bnc != NULL) {
bnc_free(bnc);
bgp_nexthop_set_node_info(rn, NULL);
bgp_unlock_node(rn);
if (!bnc)
continue;

while (!LIST_EMPTY(&(bnc->paths))) {
struct bgp_path_info *path = LIST_FIRST(&(bnc->paths));

path_nh_map(path, bnc, false);
}

bnc_free(bnc);
bgp_nexthop_set_node_info(rn, NULL);
bgp_unlock_node(rn);
}
}

Expand Down
11 changes: 5 additions & 6 deletions bgpd/bgp_nht.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ static void unregister_zebra_rnh(struct bgp_nexthop_cache *bnc,
int is_bgp_static_route);
static void evaluate_paths(struct bgp_nexthop_cache *bnc);
static int make_prefix(int afi, struct bgp_path_info *pi, struct prefix *p);
static void path_nh_map(struct bgp_path_info *path,
struct bgp_nexthop_cache *bnc, int keep);

static int bgp_isvalid_nexthop(struct bgp_nexthop_cache *bnc)
{
Expand Down Expand Up @@ -111,7 +109,7 @@ void bgp_unlink_nexthop(struct bgp_path_info *path)
if (!bnc)
return;

path_nh_map(path, NULL, 0);
path_nh_map(path, NULL, false);

bgp_unlink_nexthop_check(bnc);
}
Expand Down Expand Up @@ -253,7 +251,8 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop,
*/
bgp_unlink_nexthop(pi);

path_nh_map(pi, bnc, 1); /* updates NHT pi list reference */
/* updates NHT pi list reference */
path_nh_map(pi, bnc, true);

if (CHECK_FLAG(bnc->flags, BGP_NEXTHOP_VALID) && bnc->metric)
(bgp_path_info_extra_get(pi))->igpmetric = bnc->metric;
Expand Down Expand Up @@ -789,8 +788,8 @@ static void evaluate_paths(struct bgp_nexthop_cache *bnc)
* make - if set, make the association. if unset, just break the existing
* association.
*/
static void path_nh_map(struct bgp_path_info *path,
struct bgp_nexthop_cache *bnc, int make)
void path_nh_map(struct bgp_path_info *path, struct bgp_nexthop_cache *bnc,
bool make)
{
if (path->nexthop) {
LIST_REMOVE(path, nh_thread);
Expand Down
7 changes: 7 additions & 0 deletions bgpd/bgp_nht.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,11 @@ extern void bgp_delete_connected_nexthop(afi_t afi, struct peer *peer);
*/
extern void bgp_cleanup_nexthops(struct bgp *bgp);

/*
* Add or remove the tracking of the bgp_path_info that
* uses this nexthop
*/
extern void path_nh_map(struct bgp_path_info *path,
struct bgp_nexthop_cache *bnc, bool make);

#endif /* _BGP_NHT_H */

0 comments on commit f2ca2b0

Please sign in to comment.