Merge pull request #13287 from anlancs/bgpd-cleanup-9

[mirror_frr.git] / ripd / rip_offset.c

diff --git a/ripd/rip_offset.c b/ripd/rip_offset.c
index ca273c53b2fc41432a355ad4e7508aa7437c3282..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,7 +14,7 @@
 
 #include "ripd/ripd.h"
 
-static struct list *rip_offset_list_master;
+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)
@@ -37,20 +22,26 @@ static struct list *rip_offset_list_master;
 #define OFFSET_LIST_OUT_NAME(O)  ((O)->direct[RIP_OFFSET_LIST_OUT].alist_name)
 #define OFFSET_LIST_OUT_METRIC(O)  ((O)->direct[RIP_OFFSET_LIST_OUT].metric)
 
-struct rip_offset_list *rip_offset_list_new(const char *ifname)
+struct rip_offset_list *rip_offset_list_new(struct rip *rip, const char *ifname)
 {
        struct rip_offset_list *offset;
 
        offset = XCALLOC(MTYPE_RIP_OFFSET_LIST, sizeof(struct rip_offset_list));
+       offset->rip = rip;
        offset->ifname = strdup(ifname);
-       listnode_add_sort(rip_offset_list_master, offset);
+       listnode_add_sort(rip->offset_list_master, offset);
 
        return offset;
 }
 
 void offset_list_del(struct rip_offset_list *offset)
 {
-       listnode_delete(rip_offset_list_master, 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))
@@ -59,27 +50,29 @@ void offset_list_del(struct rip_offset_list *offset)
        XFREE(MTYPE_RIP_OFFSET_LIST, offset);
 }
 
-struct rip_offset_list *rip_offset_list_lookup(const char *ifname)
+struct rip_offset_list *rip_offset_list_lookup(struct rip *rip,
+                                              const char *ifname)
 {
        struct rip_offset_list *offset;
        struct listnode *node, *nnode;
 
-       for (ALL_LIST_ELEMENTS(rip_offset_list_master, node, nnode, offset)) {
+       for (ALL_LIST_ELEMENTS(rip->offset_list_master, node, nnode, offset)) {
                if (strcmp(offset->ifname, ifname) == 0)
                        return offset;
        }
        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)
 {
+       struct rip_interface *ri = ifp->info;
        struct rip_offset_list *offset;
        struct access_list *alist;
 
        /* Look up offset-list with interface name. */
-       offset = rip_offset_list_lookup(ifp->name);
+       offset = rip_offset_list_lookup(ri->rip, ifp->name);
        if (offset && OFFSET_LIST_IN_NAME(offset)) {
                alist = access_list_lookup(AFI_IP, OFFSET_LIST_IN_NAME(offset));
 
@@ -92,7 +85,7 @@ int rip_offset_list_apply_in(struct prefix_ipv4 *p, struct interface *ifp,
                return 0;
        }
        /* Look up offset-list without interface name. */
-       offset = rip_offset_list_lookup("*");
+       offset = rip_offset_list_lookup(ri->rip, "*");
        if (offset && OFFSET_LIST_IN_NAME(offset)) {
                alist = access_list_lookup(AFI_IP, OFFSET_LIST_IN_NAME(offset));
 
@@ -107,15 +100,16 @@ 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)
 {
+       struct rip_interface *ri = ifp->info;
        struct rip_offset_list *offset;
        struct access_list *alist;
 
        /* Look up offset-list with interface name. */
-       offset = rip_offset_list_lookup(ifp->name);
+       offset = rip_offset_list_lookup(ri->rip, ifp->name);
        if (offset && OFFSET_LIST_OUT_NAME(offset)) {
                alist = access_list_lookup(AFI_IP,
                                           OFFSET_LIST_OUT_NAME(offset));
@@ -130,7 +124,7 @@ int rip_offset_list_apply_out(struct prefix_ipv4 *p, struct interface *ifp,
        }
 
        /* Look up offset-list without interface name. */
-       offset = rip_offset_list_lookup("*");
+       offset = rip_offset_list_lookup(ri->rip, "*");
        if (offset && OFFSET_LIST_OUT_NAME(offset)) {
                alist = access_list_lookup(AFI_IP,
                                           OFFSET_LIST_OUT_NAME(offset));
@@ -146,24 +140,7 @@ int rip_offset_list_apply_out(struct prefix_ipv4 *p, struct interface *ifp,
        return 0;
 }
 
-static int offset_list_cmp(struct rip_offset_list *o1,
-                          struct rip_offset_list *o2)
+int offset_list_cmp(struct rip_offset_list *o1, struct rip_offset_list *o2)
 {
        return strcmp(o1->ifname, o2->ifname);
 }
-
-void rip_offset_init(void)
-{
-       rip_offset_list_master = list_new();
-       rip_offset_list_master->cmp = (int (*)(void *, void *))offset_list_cmp;
-       rip_offset_list_master->del = (void (*)(void *))offset_list_del;
-}
-
-void rip_offset_clean(void)
-{
-       list_delete(&rip_offset_list_master);
-
-       rip_offset_list_master = list_new();
-       rip_offset_list_master->cmp = (int (*)(void *, void *))offset_list_cmp;
-       rip_offset_list_master->del = (void (*)(void *))offset_list_del;
-}