isisd : Transformational changes to support different VRFs.

[mirror_frr.git] / isisd / isis_dynhn.c

diff --git a/isisd/isis_dynhn.c b/isisd/isis_dynhn.c
index 921e23d33a31ac8b752af4739beebf51b4e29ba1..e34c59be11bb5527505f9bb128d5ffc957ba02fa 100644 (file)
--- a/isisd/isis_dynhn.c
+++ b/isisd/isis_dynhn.c
@@ -45,11 +45,11 @@ extern struct host host;
 struct list *dyn_cache = NULL;
 static int dyn_cache_cleanup(struct thread *);
 
-void dyn_cache_init(void)
+void dyn_cache_init(struct isis *isis)
 {
        if (dyn_cache == NULL)
                dyn_cache = list_new();
-       thread_add_timer(master, dyn_cache_cleanup, NULL, 120,
+       thread_add_timer(master, dyn_cache_cleanup, isis, 120,
                         &isis->t_dync_clean);
        return;
 }
@@ -59,19 +59,22 @@ static int dyn_cache_cleanup(struct thread *thread)
        struct listnode *node, *nnode;
        struct isis_dynhn *dyn;
        time_t now = time(NULL);
+       struct isis *isis = NULL;
+
+       isis = THREAD_ARG(thread);
 
        isis->t_dync_clean = NULL;
 
        for (ALL_LIST_ELEMENTS(dyn_cache, node, nnode, dyn)) {
                if ((now - dyn->refresh) < MAX_LSP_LIFETIME)
                        continue;
-
                list_delete_node(dyn_cache, node);
                XFREE(MTYPE_ISIS_DYNHN, dyn);
        }
 
-       thread_add_timer(master, dyn_cache_cleanup, NULL, 120,
-                        &isis->t_dync_clean);
+       thread_add_timer(master, dyn_cache_cleanup, isis, 120,
+                       &isis->t_dync_clean);
+
        return ISIS_OK;
 }
 
@@ -132,11 +135,14 @@ void isis_dynhn_remove(const uint8_t *id)
  *  2     0000.0000.0002 bar-gw
  *      * 0000.0000.0004 this-gw
  */
-void dynhn_print_all(struct vty *vty)
+void dynhn_print_all(struct vty *vty, struct isis *isis)
 {
        struct listnode *node;
        struct isis_dynhn *dyn;
 
+       vty_out(vty, "vrf     : %s\n", isis->name);
+       if (!isis->sysid_set)
+               return;
        vty_out(vty, "Level  System ID      Dynamic Hostname\n");
        for (ALL_LIST_ELEMENTS_RO(dyn_cache, node, dyn)) {
                vty_out(vty, "%-7d", dyn->level);