diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-03-21 22:36:48 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-03-24 12:33:13 +0100 |
| commit | cb9f254c01a79c15dfa21f719396ca0d02e1c4c2 (patch) | |
| tree | 74e2c8ae24398a808400547b40759629b74b318f | |
| parent | Merge pull request #6072 from sarav511/bsrelect (diff) | |
| download | frr-cb9f254c01a79c15dfa21f719396ca0d02e1c4c2.tar.xz frr-cb9f254c01a79c15dfa21f719396ca0d02e1c4c2.zip | |
bgpd: Make bgp_debug_bestpath take a `struct bgp_node`
Defer the grabbing of the prefix for as long as is possible.
This is a long term rework of how we access the `struct bgp_node`
to only use accessor functions.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | bgpd/bgp_debug.c | 8 | ||||
| -rw-r--r-- | bgpd/bgp_debug.h | 2 | ||||
| -rw-r--r-- | bgpd/bgp_mpath.c | 2 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c index bae1079a1..ee5f75a07 100644 --- a/bgpd/bgp_debug.c +++ b/bgpd/bgp_debug.c @@ -2528,12 +2528,12 @@ bool bgp_debug_update(struct peer *peer, const struct prefix *p, return false; } -bool bgp_debug_bestpath(struct prefix *p) +bool bgp_debug_bestpath(struct bgp_node *rn) { if (BGP_DEBUG(bestpath, BESTPATH)) { - if (bgp_debug_per_prefix(p, term_bgp_debug_bestpath, - BGP_DEBUG_BESTPATH, - bgp_debug_bestpath_prefixes)) + if (bgp_debug_per_prefix( + &rn->p, term_bgp_debug_bestpath, + BGP_DEBUG_BESTPATH, bgp_debug_bestpath_prefixes)) return true; } diff --git a/bgpd/bgp_debug.h b/bgpd/bgp_debug.h index 51f939692..4ce1e1dce 100644 --- a/bgpd/bgp_debug.h +++ b/bgpd/bgp_debug.h @@ -168,7 +168,7 @@ extern int bgp_debug_neighbor_events(struct peer *peer); extern int bgp_debug_keepalive(struct peer *peer); extern bool bgp_debug_update(struct peer *peer, const struct prefix *p, struct update_group *updgrp, unsigned int inbound); -extern bool bgp_debug_bestpath(struct prefix *p); +extern bool bgp_debug_bestpath(struct bgp_node *rn); extern bool bgp_debug_zebra(const struct prefix *p); extern const char *bgp_debug_rdpfxpath2str(afi_t, safi_t, struct prefix_rd *, diff --git a/bgpd/bgp_mpath.c b/bgpd/bgp_mpath.c index 9e73acdc0..7ec33556c 100644 --- a/bgpd/bgp_mpath.c +++ b/bgpd/bgp_mpath.c @@ -457,7 +457,7 @@ void bgp_path_info_mpath_update(struct bgp_node *rn, old_mpath_count = 0; prev_mpath = new_best; mp_node = listhead(mp_list); - debug = bgp_debug_bestpath(&rn->p); + debug = bgp_debug_bestpath(rn); if (debug) prefix2str(&rn->p, pfx_buf, sizeof(pfx_buf)); diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 1bd5780a2..442a5051f 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -2096,7 +2096,7 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_node *rn, do_mpath = (mpath_cfg->maxpaths_ebgp > 1 || mpath_cfg->maxpaths_ibgp > 1); - debug = bgp_debug_bestpath(&rn->p); + debug = bgp_debug_bestpath(rn); if (debug) prefix2str(&rn->p, pfx_buf, sizeof(pfx_buf)); @@ -2450,7 +2450,7 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_node *rn, if (CHECK_FLAG(bgp->flags, BGP_FLAG_DELETE_IN_PROGRESS)) { if (rn) - debug = bgp_debug_bestpath(&rn->p); + debug = bgp_debug_bestpath(rn); if (debug) { prefix2str(&rn->p, pfx_buf, sizeof(pfx_buf)); zlog_debug( @@ -2477,7 +2477,7 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_node *rn, struct prefix *p = &rn->p; - debug = bgp_debug_bestpath(&rn->p); + debug = bgp_debug_bestpath(rn); if (debug) { prefix2str(&rn->p, pfx_buf, sizeof(pfx_buf)); zlog_debug("%s: p=%s afi=%s, safi=%s start", __func__, pfx_buf, |