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

Revert "isisd: fix SPF scheduling on IPv6 only topology"

Browse Source 
This reverts commit d95cd33545.
This commit is contained in:
Donatas Abraitis 2022-07-10 21:40:32 +03:00
parent 82f4ef9c90
commit 8ab2f0d18d
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
isisd/isis_spf.c
View File

@ -1931,19 +1931,9 @@ void isis_spf_timer_free(void *run)
int _isis_spf_schedule(struct isis_area *area, int level,
const char *func, const char *file, int line)
{
struct isis_spftree *spftree;
time_t now;
long tree_diff, diff;
int tree;
now = monotime(NULL);
diff = 0;
for (tree = SPFTREE_IPV4; tree < SPFTREE_COUNT; tree++) {
spftree = area->spftree[tree][level - 1];
tree_diff = difftime(now - spftree->last_run_monotime, 0);
if (tree_diff != now && (diff == 0 || tree_diff < diff))
diff = tree_diff;
}
struct isis_spftree *spftree = area->spftree[SPFTREE_IPV4][level - 1];
time_t now = monotime(NULL);
int diff = now - spftree->last_run_monotime;
if (CHECK_FLAG(im->options, F_ISIS_UNIT_TEST))
return 0;
@ -1953,7 +1943,7 @@ int _isis_spf_schedule(struct isis_area *area, int level,
if (IS_DEBUG_SPF_EVENTS) {
zlog_debug(
"ISIS-SPF (%s) L%d SPF schedule called, lastrun %ld sec ago Caller: %s %s:%d",
"ISIS-SPF (%s) L%d SPF schedule called, lastrun %d sec ago Caller: %s %s:%d",
area->area_tag, level, diff, func, file, line);
}