summaryrefslogtreecommitdiff
path: root/bgpd/bgp_mpath.c
diff options
context:
space:
mode:
Diffstat (limited to 'bgpd/bgp_mpath.c')
-rw-r--r--bgpd/bgp_mpath.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/bgpd/bgp_mpath.c b/bgpd/bgp_mpath.c
index 1d727d267a..42077d4e8e 100644
--- a/bgpd/bgp_mpath.c
+++ b/bgpd/bgp_mpath.c
@@ -508,7 +508,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_dest *dest,
+void bgp_path_info_mpath_update(struct bgp *bgp, struct bgp_dest *dest,
struct bgp_path_info *new_best,
struct bgp_path_info *old_best,
struct list *mp_list,
@@ -553,11 +553,11 @@ void bgp_path_info_mpath_update(struct bgp_dest *dest,
if (debug)
zlog_debug(
- "%pRN: starting mpath update, newbest %s num candidates %d old-mpath-count %d old-cum-bw u%" PRIu64,
- bgp_dest_to_rnode(dest),
+ "%pRN(%s): starting mpath update, newbest %s num candidates %d old-mpath-count %d old-cum-bw u%" PRIu64,
+ bgp_dest_to_rnode(dest), bgp->name_pretty,
new_best ? new_best->peer->host : "NONE",
- mp_list ? listcount(mp_list) : 0,
- old_mpath_count, old_cum_bw);
+ mp_list ? listcount(mp_list) : 0, old_mpath_count,
+ old_cum_bw);
/*
* We perform an ordered walk through both lists in parallel.
@@ -589,8 +589,8 @@ void bgp_path_info_mpath_update(struct bgp_dest *dest,
if (debug)
zlog_debug(
- "%pRN: comparing candidate %s with existing mpath %s",
- bgp_dest_to_rnode(dest),
+ "%pRN(%s): comparing candidate %s with existing mpath %s",
+ bgp_dest_to_rnode(dest), bgp->name_pretty,
tmp_info ? tmp_info->peer->host : "NONE",
cur_mpath ? cur_mpath->peer->host : "NONE");
@@ -734,9 +734,9 @@ void bgp_path_info_mpath_update(struct bgp_dest *dest,
if (debug)
zlog_debug(
- "%pRN: New mpath count (incl newbest) %d mpath-change %s all_paths_lb %d cum_bw u%" PRIu64,
- bgp_dest_to_rnode(dest), mpath_count,
- mpath_changed ? "YES" : "NO",
+ "%pRN(%s): New mpath count (incl newbest) %d mpath-change %s all_paths_lb %d cum_bw u%" PRIu64,
+ bgp_dest_to_rnode(dest), bgp->name_pretty,
+ mpath_count, mpath_changed ? "YES" : "NO",
all_paths_lb, cum_bw);
if (mpath_changed