Merge pull request #13493 from anlancs/fix/bgpd-cleanup-11

[mirror_frr.git] / ripd / rip_offset.c

diff --git a/ripd/rip_offset.c b/ripd/rip_offset.c
index b3f84fe50f6a702b1ae8b54415e795c5ff9d0f16..4c93f712f7d36b8253cc5e3ef8898e82c8262076 100644 (file)
--- a/ripd/rip_offset.c
+++ b/ripd/rip_offset.c
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* RIP 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
  */
 
 #include <zebra.h>
@@ -29,6 +14,8 @@
 
 #include "ripd/ripd.h"
 
+DEFINE_MTYPE_STATIC(RIPD, RIP_OFFSET_LIST, "RIP offset list");
+
 #define OFFSET_LIST_IN_NAME(O)  ((O)->direct[RIP_OFFSET_LIST_IN].alist_name)
 #define OFFSET_LIST_IN_METRIC(O)  ((O)->direct[RIP_OFFSET_LIST_IN].metric)
 
@@ -50,6 +37,11 @@ struct rip_offset_list *rip_offset_list_new(struct rip *rip, const char *ifname)
 void offset_list_del(struct rip_offset_list *offset)
 {
        listnode_delete(offset->rip->offset_list_master, offset);
+       offset_list_free(offset);
+}
+
+void offset_list_free(struct rip_offset_list *offset)
+{
        if (OFFSET_LIST_IN_NAME(offset))
                free(OFFSET_LIST_IN_NAME(offset));
        if (OFFSET_LIST_OUT_NAME(offset))
@@ -71,7 +63,7 @@ struct rip_offset_list *rip_offset_list_lookup(struct rip *rip,
        return NULL;
 }
 
-/* If metric is modifed return 1. */
+/* If metric is modified return 1. */
 int rip_offset_list_apply_in(struct prefix_ipv4 *p, struct interface *ifp,
                             uint32_t *metric)
 {
@@ -108,7 +100,7 @@ int rip_offset_list_apply_in(struct prefix_ipv4 *p, struct interface *ifp,
        return 0;
 }
 
-/* If metric is modifed return 1. */
+/* If metric is modified return 1. */
 int rip_offset_list_apply_out(struct prefix_ipv4 *p, struct interface *ifp,
                              uint32_t *metric)
 {