Merge pull request #4539 from opensourcerouting/7.1/watchfrr-sd-timeout

[mirror_frr.git] / isisd / isis_spf.c

diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 1440a3becf65ff6d18cb97e600782ef50532b3d8..a28220eb260395d3b1c5013f1f14f72e6964c6b1 100644 (file)
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -39,7 +39,6 @@
 #include "isis_constants.h"
 #include "isis_common.h"
 #include "isis_flags.h"
-#include "dict.h"
 #include "isisd.h"
 #include "isis_misc.h"
 #include "isis_adjacency.h"
@@ -313,7 +312,7 @@ static struct isis_lsp *isis_root_system_lsp(struct isis_area *area, int level,
        memcpy(lspid, sysid, ISIS_SYS_ID_LEN);
        LSP_PSEUDO_ID(lspid) = 0;
        LSP_FRAGMENT(lspid) = 0;
-       lsp = lsp_search(lspid, area->lspdb[level - 1]);
+       lsp = lsp_search(&area->lspdb[level - 1], lspid);
        if (lsp && lsp->hdr.rem_lifetime != 0)
                return lsp;
        return NULL;
@@ -352,10 +351,10 @@ static struct isis_vertex *isis_spf_add_root(struct isis_spftree *spftree,
        return vertex;
 }
 
-static void vertex_add_parent_firsthop(struct hash_backet *backet, void *arg)
+static void vertex_add_parent_firsthop(struct hash_bucket *bucket, void *arg)
 {
        struct isis_vertex *vertex = arg;
-       struct isis_vertex *hop = backet->data;
+       struct isis_vertex *hop = bucket->data;
 
        hash_get(vertex->firsthops, hop, hash_alloc_intern);
 }
@@ -870,10 +869,8 @@ static int isis_spf_preload_tent(struct isis_spftree *spftree,
                                                        [spftree->level - 1],
                                                parent);
                                        lsp = lsp_search(
-                                               lsp_id,
-                                               spftree->area
-                                                       ->lspdb[spftree->level
-                                                               - 1]);
+                                               &spftree->area->lspdb[spftree->level- 1],
+                                               lsp_id);
                                        if (lsp == NULL
                                            || lsp->hdr.rem_lifetime == 0)
                                                zlog_warn(
@@ -887,7 +884,7 @@ static int isis_spf_preload_tent(struct isis_spftree *spftree,
                                case ISIS_SYSTYPE_UNKNOWN:
                                default:
                                        zlog_warn(
-                                               "isis_spf_preload_tent unknow adj type");
+                                               "isis_spf_preload_tent unknown adj type");
                                }
                        }
                        list_delete(&adj_list);
@@ -923,8 +920,8 @@ static int isis_spf_preload_tent(struct isis_spftree *spftree,
                                continue;
                        }
                        lsp = lsp_search(
-                               lsp_id,
-                               spftree->area->lspdb[spftree->level - 1]);
+                               &spftree->area->lspdb[spftree->level - 1],
+                               lsp_id);
                        if (lsp == NULL || lsp->hdr.rem_lifetime == 0) {
                                zlog_warn(
                                        "ISIS-Spf: No lsp (%p) found from root "
@@ -1248,7 +1245,8 @@ static struct isis_spf_run *isis_run_spf_arg(struct isis_area *area, int level)
        return run;
 }
 
-int isis_spf_schedule(struct isis_area *area, int level)
+int _isis_spf_schedule(struct isis_area *area, int level,
+                      const char *func, const char *file, int line)
 {
        struct isis_spftree *spftree = area->spftree[SPFTREE_IPV4][level - 1];
        time_t now = monotime(NULL);
@@ -1257,10 +1255,12 @@ int isis_spf_schedule(struct isis_area *area, int level)
        assert(diff >= 0);
        assert(area->is_type & level);
 
-       if (isis->debugs & DEBUG_SPF_EVENTS)
+       if (isis->debugs & DEBUG_SPF_EVENTS) {
                zlog_debug(
-                       "ISIS-Spf (%s) L%d SPF schedule called, lastrun %d sec ago",
-                       area->area_tag, level, diff);
+                       "ISIS-Spf (%s) L%d SPF schedule called, lastrun %d sec ago"
+                       " Caller: %s %s:%d",
+                       area->area_tag, level, diff, func, file, line);
+       }
 
        if (area->spf_delay_ietf[level - 1]) {
                /* Need to call schedule function also if spf delay is running
@@ -1468,7 +1468,7 @@ DEFUN (show_isis_topology,
        return CMD_SUCCESS;
 }
 
-void isis_spf_cmds_init()
+void isis_spf_cmds_init(void)
 {
        install_element(VIEW_NODE, &show_isis_topology_cmd);
 }