Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / ripngd / ripngd.h

diff --git a/ripngd/ripngd.h b/ripngd/ripngd.h
index 70508d5cb04ada785caf02cec9c241a42e1ff0eb..59b948b8f1f63f70b47709aa20dbdc014f486ea1 100644 (file)
--- a/ripngd/ripngd.h
+++ b/ripngd/ripngd.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * RIPng related value and structure.
  * Copyright (C) 1998 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra 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
  */
 
 #ifndef _ZEBRA_RIPNG_RIPNGD_H
@@ -86,7 +71,7 @@
 #define RIPNG_INSTANCE "/frr-ripngd:ripngd/instance"
 #define RIPNG_IFACE    "/frr-interface:lib/interface/frr-ripngd:ripng"
 
-DECLARE_MGROUP(RIPNGD)
+DECLARE_MGROUP(RIPNGD);
 
 /* RIPng structure. */
 struct ripng {
@@ -137,10 +122,7 @@ struct ripng {
 
        /* RIPng threads. */
        struct thread *t_read;
-       struct thread *t_write;
        struct thread *t_update;
-       struct thread *t_garbage;
-       struct thread *t_zebra;
 
        /* Triggered update hack. */
        int trigger;
@@ -230,35 +212,6 @@ struct ripng_info {
        struct agg_node *rp;
 };
 
-#ifdef notyet
-#if 0
-/* RIPng tag structure. */
-struct ripng_tag
-{
-  /* Tag value. */
-  uint16_t tag;
-
-  /* Port. */
-  uint16_t port;
-
-  /* Multicast group. */
-  struct in6_addr maddr;
-
-  /* Table number. */
-  int table;
-
-  /* Distance. */
-  int distance;
-
-  /* Split horizon. */
-  uint8_t split_horizon;
-
-  /* Poison reverse. */
-  uint8_t poison_reverse;
-};
-#endif /* 0 */
-#endif /* not yet */
-
 typedef enum {
        RIPNG_NO_SPLIT_HORIZON = 0,
        RIPNG_SPLIT_HORIZON,
@@ -294,13 +247,6 @@ struct ripng_interface {
        /* Route-map. */
        struct route_map *routemap[RIPNG_FILTER_MAX];
 
-#ifdef notyet
-#if 0
-  /* RIPng tag configuration. */
-  struct ripng_tag *rtag;
-#endif /* 0 */
-#endif /* notyet */
-
        /* Default information originate. */
        uint8_t default_originate;
 
@@ -351,14 +297,6 @@ enum ripng_event {
 /* RIPng timer on/off macro. */
 #define RIPNG_TIMER_ON(T,F,V) thread_add_timer (master, (F), rinfo, (V), &(T))
 
-#define RIPNG_TIMER_OFF(T)                                                     \
-       do {                                                                   \
-               if (T) {                                                       \
-                       thread_cancel(T);                                      \
-                       (T) = NULL;                                            \
-               }                                                              \
-       } while (0)
-
 #define RIPNG_OFFSET_LIST_IN  0
 #define RIPNG_OFFSET_LIST_OUT 1
 #define RIPNG_OFFSET_LIST_MAX 2