mirror of
https://github.com/FRRouting/frr.git
synced 2025-04-30 13:37:17 +02:00
Merge 344a9add44
into 3dd4d417be
This commit is contained in:
commit
e088500846
|
@ -5339,11 +5339,10 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
|
|||
peer->sort == BGP_PEER_EBGP &&
|
||||
CHECK_FLAG(pi->flags, BGP_PATH_HISTORY)) {
|
||||
if (unlikely(bgp_debug_update(peer, p, NULL, 1))) {
|
||||
bgp_debug_rdpfxpath2str(
|
||||
afi, safi, prd, p, label,
|
||||
num_labels, addpath_id ? 1 : 0,
|
||||
addpath_id, evpn, pfx_buf,
|
||||
sizeof(pfx_buf));
|
||||
bgp_debug_rdpfxpath2str(afi, safi, prd, p, label,
|
||||
num_labels, addpath_id ? 1 : 0,
|
||||
addpath_id, attr_new->evpn_overlay,
|
||||
pfx_buf, sizeof(pfx_buf));
|
||||
zlog_debug("%pBP rcvd %s", peer,
|
||||
pfx_buf);
|
||||
}
|
||||
|
@ -5365,11 +5364,10 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
|
|||
peer->rcvd_attr_printed = true;
|
||||
}
|
||||
|
||||
bgp_debug_rdpfxpath2str(
|
||||
afi, safi, prd, p, label,
|
||||
num_labels, addpath_id ? 1 : 0,
|
||||
addpath_id, evpn, pfx_buf,
|
||||
sizeof(pfx_buf));
|
||||
bgp_debug_rdpfxpath2str(afi, safi, prd, p, label,
|
||||
num_labels, addpath_id ? 1 : 0,
|
||||
addpath_id, attr_new->evpn_overlay,
|
||||
pfx_buf, sizeof(pfx_buf));
|
||||
zlog_debug(
|
||||
"%pBP rcvd %s...duplicate ignored",
|
||||
peer, pfx_buf);
|
||||
|
@ -5394,10 +5392,10 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
|
|||
/* Withdraw/Announce before we fully processed the withdraw */
|
||||
if (CHECK_FLAG(pi->flags, BGP_PATH_REMOVED)) {
|
||||
if (unlikely(bgp_debug_update(peer, p, NULL, 1))) {
|
||||
bgp_debug_rdpfxpath2str(
|
||||
afi, safi, prd, p, label, num_labels,
|
||||
addpath_id ? 1 : 0, addpath_id, evpn,
|
||||
pfx_buf, sizeof(pfx_buf));
|
||||
bgp_debug_rdpfxpath2str(afi, safi, prd, p, label, num_labels,
|
||||
addpath_id ? 1 : 0, addpath_id,
|
||||
attr_new->evpn_overlay, pfx_buf,
|
||||
sizeof(pfx_buf));
|
||||
zlog_debug(
|
||||
"%pBP rcvd %s, flapped quicker than processing",
|
||||
peer, pfx_buf);
|
||||
|
@ -5422,10 +5420,9 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
|
|||
|
||||
/* Received Logging. */
|
||||
if (unlikely(bgp_debug_update(peer, p, NULL, 1))) {
|
||||
bgp_debug_rdpfxpath2str(afi, safi, prd, p, label,
|
||||
num_labels, addpath_id ? 1 : 0,
|
||||
addpath_id, evpn, pfx_buf,
|
||||
sizeof(pfx_buf));
|
||||
bgp_debug_rdpfxpath2str(afi, safi, prd, p, label, num_labels,
|
||||
addpath_id ? 1 : 0, addpath_id,
|
||||
attr_new->evpn_overlay, pfx_buf, sizeof(pfx_buf));
|
||||
zlog_debug("%pBP rcvd %s", peer, pfx_buf);
|
||||
}
|
||||
|
||||
|
@ -5653,9 +5650,9 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
|
|||
peer->rcvd_attr_printed = true;
|
||||
}
|
||||
|
||||
bgp_debug_rdpfxpath2str(afi, safi, prd, p, label, num_labels,
|
||||
addpath_id ? 1 : 0, addpath_id, evpn,
|
||||
pfx_buf, sizeof(pfx_buf));
|
||||
bgp_debug_rdpfxpath2str(afi, safi, prd, p, label, num_labels, addpath_id ? 1 : 0,
|
||||
addpath_id, attr_new->evpn_overlay, pfx_buf,
|
||||
sizeof(pfx_buf));
|
||||
zlog_debug("%pBP rcvd %s", peer, pfx_buf);
|
||||
}
|
||||
|
||||
|
@ -5759,9 +5756,9 @@ filtered:
|
|||
peer->rcvd_attr_printed = true;
|
||||
}
|
||||
|
||||
bgp_debug_rdpfxpath2str(afi, safi, prd, p, label, num_labels,
|
||||
addpath_id ? 1 : 0, addpath_id, evpn,
|
||||
pfx_buf, sizeof(pfx_buf));
|
||||
bgp_debug_rdpfxpath2str(afi, safi, prd, p, label, num_labels, addpath_id ? 1 : 0,
|
||||
addpath_id, attr_new->evpn_overlay, pfx_buf,
|
||||
sizeof(pfx_buf));
|
||||
zlog_debug("%pBP rcvd UPDATE about %s -- DENIED due to: %s",
|
||||
peer, pfx_buf, reason);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue