proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-02 18:40:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isisd: add flex-algo info to spf extreme debug

Browse Source 
Add flex-algo information ID to the SPF extreme debug mode.

Signed-off-by: Eric Kinzie <ekinzie@labn.net>
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2022-08-30 11:21:20 +02:00
parent 42ac448538
commit 042ea8f2fc
1 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
isisd/isis_spf.c
View File

@ -522,8 +522,8 @@ static struct isis_vertex *isis_spf_add_root(struct isis_spftree *spftree)
#ifdef EXTREME_DEBUG #ifdef EXTREME_DEBUG
if (IS_DEBUG_SPF_EVENTS) if (IS_DEBUG_SPF_EVENTS)
zlog_debug( zlog_debug(
"ISIS-SPF: added this IS %s %s depth %d dist %d to PATHS", "ISIS-SPF: A:%hhu added this IS %s %s depth %d dist %d to PATHS",
vtype2string(vertex->type), spftree->algorithm, vtype2string(vertex->type),
vid2string(vertex, buff, sizeof(buff)), vertex->depth, vid2string(vertex, buff, sizeof(buff)), vertex->depth,
vertex->d_N); vertex->d_N);
#endif /* EXTREME_DEBUG */ #endif /* EXTREME_DEBUG */
@ -653,8 +653,8 @@ isis_spf_add2tent(struct isis_spftree *spftree, enum vertextype vtype, void *id,
#ifdef EXTREME_DEBUG #ifdef EXTREME_DEBUG
if (IS_DEBUG_SPF_EVENTS) if (IS_DEBUG_SPF_EVENTS)
zlog_debug( zlog_debug(
"ISIS-SPF: add to TENT %s %s %s depth %d dist %d adjcount %d", "ISIS-SPF: A:%hhu add to TENT %s %s %s depth %d dist %d adjcount %d",
print_sys_hostname(vertex->N.id), spftree->algorithm, print_sys_hostname(vertex->N.id),
vtype2string(vertex->type), vtype2string(vertex->type),
vid2string(vertex, buff, sizeof(buff)), vertex->depth, vid2string(vertex, buff, sizeof(buff)), vertex->depth,
vertex->d_N, listcount(vertex->Adj_N)); vertex->d_N, listcount(vertex->Adj_N));
@ -747,7 +747,8 @@ static void process_N(struct isis_spftree *spftree, enum vertextype vtype,
#ifdef EXTREME_DEBUG #ifdef EXTREME_DEBUG
if (IS_DEBUG_SPF_EVENTS) if (IS_DEBUG_SPF_EVENTS)
zlog_debug( zlog_debug(
"ISIS-SPF: process_N %s %s %s dist %d already found from PATH", "ISIS-SPF: A:%hhu process_N %s %s %s dist %d already found from PATH",
spftree->algorithm,
print_sys_hostname(vertex->N.id), print_sys_hostname(vertex->N.id),
vtype2string(vtype), vtype2string(vtype),
vid2string(vertex, buff, sizeof(buff)), dist); vid2string(vertex, buff, sizeof(buff)), dist);
@ -763,7 +764,8 @@ static void process_N(struct isis_spftree *spftree, enum vertextype vtype,
#ifdef EXTREME_DEBUG #ifdef EXTREME_DEBUG
if (IS_DEBUG_SPF_EVENTS) if (IS_DEBUG_SPF_EVENTS)
zlog_debug( zlog_debug(
"ISIS-SPF: process_N %s %s %s dist %d parent %s adjcount %d", "ISIS-SPF: A:%hhu process_N %s %s %s dist %d parent %s adjcount %d",
spftree->algorithm,
print_sys_hostname(vertex->N.id), print_sys_hostname(vertex->N.id),
vtype2string(vtype), vtype2string(vtype),
vid2string(vertex, buff, sizeof(buff)), dist, vid2string(vertex, buff, sizeof(buff)), dist,
@ -809,8 +811,9 @@ static void process_N(struct isis_spftree *spftree, enum vertextype vtype,
#ifdef EXTREME_DEBUG #ifdef EXTREME_DEBUG
if (IS_DEBUG_SPF_EVENTS) if (IS_DEBUG_SPF_EVENTS)
zlog_debug( zlog_debug(
"ISIS-SPF: process_N add2tent %s %s dist %d parent %s", "ISIS-SPF: A:%hhu process_N add2tent %s %s dist %d parent %s",
print_sys_hostname(id), vtype2string(vtype), dist, spftree->algorithm, print_sys_hostname(id),
vtype2string(vtype), dist,
(parent ? print_sys_hostname(parent->N.id) : "null")); (parent ? print_sys_hostname(parent->N.id) : "null"));
#endif /* EXTREME_DEBUG */ #endif /* EXTREME_DEBUG */
@ -870,7 +873,8 @@ lspfragloop:
#ifdef EXTREME_DEBUG #ifdef EXTREME_DEBUG
if (IS_DEBUG_SPF_EVENTS) if (IS_DEBUG_SPF_EVENTS)
zlog_debug("ISIS-SPF: process_lsp %s", zlog_debug("ISIS-SPF: A:%hhu process_lsp %s",
spftree->algorithm,
print_sys_hostname(lsp->hdr.lsp_id)); print_sys_hostname(lsp->hdr.lsp_id));
#endif /* EXTREME_DEBUG */ #endif /* EXTREME_DEBUG */
@ -1560,11 +1564,13 @@ static void add_to_paths(struct isis_spftree *spftree,
#ifdef EXTREME_DEBUG #ifdef EXTREME_DEBUG
if (IS_DEBUG_SPF_EVENTS) if (IS_DEBUG_SPF_EVENTS)
zlog_debug("ISIS-SPF: added %s %s %s depth %d dist %d to PATHS", zlog_debug(
"ISIS-SPF: A:%hhu S:%p added %s %s %s depth %d dist %d to PATHS",
spftree->algorithm, spftree,
print_sys_hostname(vertex->N.id), print_sys_hostname(vertex->N.id),
vtype2string(vertex->type), vtype2string(vertex->type),
vid2string(vertex, buff, sizeof(buff)), vid2string(vertex, buff, sizeof(buff)), vertex->depth,
vertex->depth, vertex->d_N); vertex->d_N);
#endif /* EXTREME_DEBUG */ #endif /* EXTREME_DEBUG */
} }
@ -1710,10 +1716,23 @@ static void spf_path_process(struct isis_spftree *spftree,
break; break;
} }
isis_route_create( #ifdef EXTREME_DEBUG
&vertex->N.ip.p.dest, &vertex->N.ip.p.src, struct isis_route_info *ri =
vertex->d_N, vertex->depth, &vertex->N.ip.sr, #endif /* EXTREME_DEBUG */
vertex->Adj_N, allow_ecmp, area, route_table); isis_route_create(&vertex->N.ip.p.dest,
&vertex->N.ip.p.src,
vertex->d_N, vertex->depth,
&vertex->N.ip.sr,
vertex->Adj_N, allow_ecmp,
area, route_table);
#ifdef EXTREME_DEBUG
zlog_debug(
"ISIS-SPF: A:%hhu create route pfx %pFX dist %d, sr.algo %d, table %p, rv %p",
spftree->algorithm, &vertex->N.ip.p.dest,
vertex->d_N, vertex->N.ip.sr.algorithm,
route_table, ri);
#endif /* EXTREME_DEBUG */
} else if (IS_DEBUG_SPF_EVENTS) } else if (IS_DEBUG_SPF_EVENTS)
zlog_debug( zlog_debug(
"ISIS-SPF: no adjacencies, do not install route for %s depth %d dist %d", "ISIS-SPF: no adjacencies, do not install route for %s depth %d dist %d",
@ -1733,12 +1752,10 @@ static void isis_spf_loop(struct isis_spftree *spftree,
vertex = isis_vertex_queue_pop(&spftree->tents); vertex = isis_vertex_queue_pop(&spftree->tents);
#ifdef EXTREME_DEBUG #ifdef EXTREME_DEBUG
if (IS_DEBUG_SPF_EVENTS)
zlog_debug( zlog_debug(
"ISIS-SPF: get TENT node %s %s depth %d dist %d to PATHS", "ISIS-SPF: A:%hhu get TENT node %s %s depth %d dist %d to PATHS",
print_sys_hostname(vertex->N.id), spftree->algorithm, print_sys_hostname(vertex->N.id),
vtype2string(vertex->type), vertex->depth, vtype2string(vertex->type), vertex->depth, vertex->d_N);
vertex->d_N);
#endif /* EXTREME_DEBUG */ #endif /* EXTREME_DEBUG */
add_to_paths(spftree, vertex); add_to_paths(spftree, vertex);