Merge pull request #12780 from opensourcerouting/spdx-license-id

[mirror_frr.git] / ripngd / ripng_offset.c

diff --git a/ripngd/ripng_offset.c b/ripngd/ripng_offset.c
index 41ba2360ba07d5b4510328dc23fc33efacc661d5..ba3ba558afda91a986556b63b4005c574b1c3bd6 100644 (file)
--- a/ripngd/ripng_offset.c
+++ b/ripngd/ripng_offset.c
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* RIPng offset-list
  * Copyright (C) 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
- *
- * 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
  */
 
 /* RIPng support by Vincent Jardin <vincent.jardin@6wind.com>
@@ -33,6 +18,8 @@
 
 #include "ripngd/ripngd.h"
 
+DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_OFFSET_LIST, "RIPng offset lst");
+
 #define OFFSET_LIST_IN_NAME(O)  ((O)->direct[RIPNG_OFFSET_LIST_IN].alist_name)
 #define OFFSET_LIST_IN_METRIC(O)  ((O)->direct[RIPNG_OFFSET_LIST_IN].metric)
 
@@ -56,6 +43,11 @@ struct ripng_offset_list *ripng_offset_list_new(struct ripng *ripng,
 void ripng_offset_list_del(struct ripng_offset_list *offset)
 {
        listnode_delete(offset->ripng->offset_list_master, offset);
+       ripng_offset_list_free(offset);
+}
+
+void ripng_offset_list_free(struct ripng_offset_list *offset)
+{
        if (OFFSET_LIST_IN_NAME(offset))
                free(OFFSET_LIST_IN_NAME(offset));
        if (OFFSET_LIST_OUT_NAME(offset))
@@ -78,7 +70,7 @@ struct ripng_offset_list *ripng_offset_list_lookup(struct ripng *ripng,
        return NULL;
 }
 
-/* If metric is modifed return 1. */
+/* If metric is modified return 1. */
 int ripng_offset_list_apply_in(struct ripng *ripng, struct prefix_ipv6 *p,
                               struct interface *ifp, uint8_t *metric)
 {
@@ -116,7 +108,7 @@ int ripng_offset_list_apply_in(struct ripng *ripng, struct prefix_ipv6 *p,
        return 0;
 }
 
-/* If metric is modifed return 1. */
+/* If metric is modified return 1. */
 int ripng_offset_list_apply_out(struct ripng *ripng, struct prefix_ipv6 *p,
                                struct interface *ifp, uint8_t *metric)
 {