proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 15:17:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2108 from donaldsharp/redistribute_debugs

Browse Source 
zebra: Add some information to redistribute debugs
This commit is contained in:
Lou Berger 2018-04-23 10:56:44 -04:00 committed by GitHub
commit c1da3ee614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
zebra/redistribute.c
View File

@ -113,18 +113,20 @@ static void zebra_redistribute(struct zserv *client, int type,
for (rn = route_top(table); rn; rn = srcdest_route_next(rn)) for (rn = route_top(table); rn; rn = srcdest_route_next(rn))
RNODE_FOREACH_RE (rn, newre) { RNODE_FOREACH_RE (rn, newre) {
struct prefix *dst_p, *src_p; struct prefix *dst_p, *src_p;
char buf[PREFIX_STRLEN];
srcdest_rnode_prefixes(rn, &dst_p, &src_p); srcdest_rnode_prefixes(rn, &dst_p, &src_p);
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT)
zlog_debug( zlog_debug(
"%s: client %s vrf %d checking: selected=%d, type=%d, distance=%d, " "%s: client %s %s(%d) checking: selected=%d, type=%d, distance=%d, metric=%d zebra_check_addr=%d",
"zebra_check_addr=%d",
__func__, __func__,
zebra_route_string(client->proto), zebra_route_string(client->proto),
prefix2str(dst_p, buf, sizeof(buf)),
vrf_id, CHECK_FLAG(newre->flags, vrf_id, CHECK_FLAG(newre->flags,
ZEBRA_FLAG_SELECTED), ZEBRA_FLAG_SELECTED),
newre->type, newre->distance, newre->type, newre->distance,
zebra_check_addr(dst_p)); newre->metric, zebra_check_addr(dst_p));
if (!CHECK_FLAG(newre->flags, ZEBRA_FLAG_SELECTED)) if (!CHECK_FLAG(newre->flags, ZEBRA_FLAG_SELECTED))
continue; continue;
@ -151,13 +153,13 @@ void redistribute_update(struct prefix *p, struct prefix *src_p,
struct zserv *client; struct zserv *client;
int send_redistribute; int send_redistribute;
int afi; int afi;
char buf[INET6_ADDRSTRLEN]; char buf[PREFIX_STRLEN];
if (IS_ZEBRA_DEBUG_RIB) { if (IS_ZEBRA_DEBUG_RIB) {
inet_ntop(p->family, &p->u.prefix, buf, INET6_ADDRSTRLEN);
zlog_debug( zlog_debug(
"%u:%s/%d: Redist update re %p (type %d), old %p (type %d)", "%u:%s: Redist update re %p (type %d), old %p (type %d)",
re->vrf_id, buf, p->prefixlen, re, re->type, prev_re, re->vrf_id, prefix2str(p, buf, sizeof(buf)),
re, re->type, prev_re,
prev_re ? prev_re->type : -1); prev_re ? prev_re->type : -1);
} }
@ -187,6 +189,15 @@ void redistribute_update(struct prefix *p, struct prefix *src_p,
send_redistribute = 1; send_redistribute = 1;
if (send_redistribute) { if (send_redistribute) {
if (IS_ZEBRA_DEBUG_EVENT) {
zlog_debug(
"%s: client %s %s(%d), type=%d, distance=%d, metric=%d",
__func__,
zebra_route_string(client->proto),
prefix2str(p, buf, sizeof(buf)),
re->vrf_id, re->type,
re->distance, re->metric);
}
zsend_redistribute_route(ZEBRA_REDISTRIBUTE_ROUTE_ADD, zsend_redistribute_route(ZEBRA_REDISTRIBUTE_ROUTE_ADD,
client, p, src_p, re); client, p, src_p, re);
} else if (prev_re } else if (prev_re