diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-03-26 19:11:58 -0400 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2020-06-23 17:32:52 +0200 |
| commit | 9bcb3eef541180a17341d1d4510586efc35711db (patch) | |
| tree | 686e6d7721a180a168cb3353e2c900b63069e6c3 /bgpd/bgp_mpath.c | |
| parent | 6d7824f29c4aad88009ac1dfe0491de31c01fcb3 (diff) | |
bgp: rename bgp_node to bgp_dest
This is the bulk part extracted from "bgpd: Convert from `struct
bgp_node` to `struct bgp_dest`". It should not result in any functional
change.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd/bgp_mpath.c')
| -rw-r--r-- | bgpd/bgp_mpath.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/bgpd/bgp_mpath.c b/bgpd/bgp_mpath.c index f66f56cb49..5dd1cf6de8 100644 --- a/bgpd/bgp_mpath.c +++ b/bgpd/bgp_mpath.c @@ -506,7 +506,7 @@ static void bgp_path_info_mpath_attr_set(struct bgp_path_info *path, * Compare and sync up the multipath list with the mp_list generated by * bgp_best_selection */ -void bgp_path_info_mpath_update(struct bgp_node *rn, +void bgp_path_info_mpath_update(struct bgp_dest *dest, struct bgp_path_info *new_best, struct bgp_path_info *old_best, struct list *mp_list, @@ -530,7 +530,7 @@ void bgp_path_info_mpath_update(struct bgp_node *rn, old_cum_bw = cum_bw = 0; prev_mpath = new_best; mp_node = listhead(mp_list); - debug = bgp_debug_bestpath(rn); + debug = bgp_debug_bestpath(dest); if (new_best) { mpath_count++; @@ -553,7 +553,8 @@ void bgp_path_info_mpath_update(struct bgp_node *rn, if (debug) zlog_debug( "%pRN: starting mpath update, newbest %s num candidates %d old-mpath-count %d old-cum-bw u%" PRIu64, - rn, new_best ? new_best->peer->host : "NONE", + bgp_dest_to_rnode(dest), + new_best ? new_best->peer->host : "NONE", mp_list ? listcount(mp_list) : 0, old_mpath_count, old_cum_bw); @@ -588,7 +589,7 @@ void bgp_path_info_mpath_update(struct bgp_node *rn, if (debug) zlog_debug( "%pRN: comparing candidate %s with existing mpath %s", - rn, + bgp_dest_to_rnode(dest), tmp_info ? tmp_info->peer->host : "NONE", cur_mpath ? cur_mpath->peer->host : "NONE"); @@ -617,7 +618,8 @@ void bgp_path_info_mpath_update(struct bgp_node *rn, cur_mpath, path_buf); zlog_debug( "%pRN: %s is still multipath, cur count %d", - rn, path_buf, mpath_count); + bgp_dest_to_rnode(dest), + path_buf, mpath_count); } } else { mpath_changed = 1; @@ -626,7 +628,8 @@ void bgp_path_info_mpath_update(struct bgp_node *rn, cur_mpath, path_buf); zlog_debug( "%pRN: remove mpath %s nexthop %s, cur count %d", - rn, path_buf, + bgp_dest_to_rnode(dest), + path_buf, inet_ntop(AF_INET, &cur_mpath->attr ->nexthop, @@ -659,7 +662,7 @@ void bgp_path_info_mpath_update(struct bgp_node *rn, cur_mpath, path_buf); zlog_debug( "%pRN: remove mpath %s nexthop %s, cur count %d", - rn, path_buf, + bgp_dest_to_rnode(dest), path_buf, inet_ntop(AF_INET, &cur_mpath->attr->nexthop, nh_buf[0], sizeof(nh_buf[0])), @@ -709,7 +712,8 @@ void bgp_path_info_mpath_update(struct bgp_node *rn, new_mpath, path_buf); zlog_debug( "%pRN: add mpath %s nexthop %s, cur count %d", - rn, path_buf, + bgp_dest_to_rnode(dest), + path_buf, inet_ntop(AF_INET, &new_mpath->attr ->nexthop, @@ -737,7 +741,7 @@ void bgp_path_info_mpath_update(struct bgp_node *rn, zlog_debug( "%pRN: New mpath count (incl newbest) %d mpath-change %s" " all_paths_lb %d cum_bw u%" PRIu64, - rn, mpath_count, + bgp_dest_to_rnode(dest), mpath_count, mpath_changed ? "YES" : "NO", all_paths_lb, cum_bw); |