Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / isisd / isis_dynhn.c

diff --git a/isisd/isis_dynhn.c b/isisd/isis_dynhn.c
index ade6e8222023a715c61640eea949d01e2a88d168..ef21de327eb6aaed359c822e4097cf581206132e 100644 (file)
--- a/isisd/isis_dynhn.c
+++ b/isisd/isis_dynhn.c
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * IS-IS Rout(e)ing protocol - isis_dynhn.c
  *                             Dynamic hostname cache
  * Copyright (C) 2001,2002   Sampo Saaristo
  *                           Tampere University of Technology
  *                           Institute of Communications Engineering
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public Licenseas published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -42,7 +29,7 @@
 
 DEFINE_MTYPE_STATIC(ISISD, ISIS_DYNHN, "ISIS dyn hostname");
 
-static int dyn_cache_cleanup(struct thread *);
+static void dyn_cache_cleanup(struct thread *);
 
 void dyn_cache_init(struct isis *isis)
 {
@@ -57,7 +44,7 @@ void dyn_cache_finish(struct isis *isis)
        struct listnode *node, *nnode;
        struct isis_dynhn *dyn;
 
-       thread_cancel(&isis->t_dync_clean);
+       THREAD_OFF(isis->t_dync_clean);
 
        for (ALL_LIST_ELEMENTS(isis->dyn_cache, node, nnode, dyn)) {
                list_delete_node(isis->dyn_cache, node);
@@ -67,7 +54,7 @@ void dyn_cache_finish(struct isis *isis)
        list_delete(&isis->dyn_cache);
 }
 
-static int dyn_cache_cleanup(struct thread *thread)
+static void dyn_cache_cleanup(struct thread *thread)
 {
        struct listnode *node, *nnode;
        struct isis_dynhn *dyn;
@@ -87,8 +74,6 @@ static int dyn_cache_cleanup(struct thread *thread)
 
        thread_add_timer(master, dyn_cache_cleanup, isis, 120,
                        &isis->t_dync_clean);
-
-       return ISIS_OK;
 }
 
 struct isis_dynhn *dynhn_find_by_id(struct isis *isis, const uint8_t *id)