*: make all route_map_rule_cmd const

[mirror_frr.git] / ripngd / ripng_offset.c

diff --git a/ripngd/ripng_offset.c b/ripngd/ripng_offset.c
index 278df758924164116f9a21c7f48f0a4af5416cca..0094c993add429f58a869e6b6d9eb920f93e9a55 100644 (file)
--- a/ripngd/ripng_offset.c
+++ b/ripngd/ripng_offset.c
@@ -33,7 +33,7 @@
 
 #include "ripngd/ripngd.h"
 
-static struct list *ripng_offset_list_master;
+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)
@@ -41,21 +41,28 @@ static struct list *ripng_offset_list_master;
 #define OFFSET_LIST_OUT_NAME(O)  ((O)->direct[RIPNG_OFFSET_LIST_OUT].alist_name)
 #define OFFSET_LIST_OUT_METRIC(O)  ((O)->direct[RIPNG_OFFSET_LIST_OUT].metric)
 
-struct ripng_offset_list *ripng_offset_list_new(const char *ifname)
+struct ripng_offset_list *ripng_offset_list_new(struct ripng *ripng,
+                                               const char *ifname)
 {
        struct ripng_offset_list *new;
 
        new = XCALLOC(MTYPE_RIPNG_OFFSET_LIST,
                      sizeof(struct ripng_offset_list));
+       new->ripng = ripng;
        new->ifname = strdup(ifname);
-       listnode_add_sort(ripng_offset_list_master, new);
+       listnode_add_sort(ripng->offset_list_master, new);
 
        return new;
 }
 
 void ripng_offset_list_del(struct ripng_offset_list *offset)
 {
-       listnode_delete(ripng_offset_list_master, 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))
@@ -64,12 +71,14 @@ void ripng_offset_list_del(struct ripng_offset_list *offset)
        XFREE(MTYPE_RIPNG_OFFSET_LIST, offset);
 }
 
-struct ripng_offset_list *ripng_offset_list_lookup(const char *ifname)
+struct ripng_offset_list *ripng_offset_list_lookup(struct ripng *ripng,
+                                                  const char *ifname)
 {
        struct ripng_offset_list *offset;
        struct listnode *node, *nnode;
 
-       for (ALL_LIST_ELEMENTS(ripng_offset_list_master, node, nnode, offset)) {
+       for (ALL_LIST_ELEMENTS(ripng->offset_list_master, node, nnode,
+                              offset)) {
                if (strcmp(offset->ifname, ifname) == 0)
                        return offset;
        }
@@ -77,14 +86,14 @@ struct ripng_offset_list *ripng_offset_list_lookup(const char *ifname)
 }
 
 /* If metric is modifed return 1. */
-int ripng_offset_list_apply_in(struct prefix_ipv6 *p, struct interface *ifp,
-                              uint8_t *metric)
+int ripng_offset_list_apply_in(struct ripng *ripng, struct prefix_ipv6 *p,
+                              struct interface *ifp, uint8_t *metric)
 {
        struct ripng_offset_list *offset;
        struct access_list *alist;
 
        /* Look up offset-list with interface name. */
-       offset = ripng_offset_list_lookup(ifp->name);
+       offset = ripng_offset_list_lookup(ripng, ifp->name);
        if (offset && OFFSET_LIST_IN_NAME(offset)) {
                alist = access_list_lookup(AFI_IP6,
                                           OFFSET_LIST_IN_NAME(offset));
@@ -98,7 +107,7 @@ int ripng_offset_list_apply_in(struct prefix_ipv6 *p, struct interface *ifp,
                return 0;
        }
        /* Look up offset-list without interface name. */
-       offset = ripng_offset_list_lookup("*");
+       offset = ripng_offset_list_lookup(ripng, "*");
        if (offset && OFFSET_LIST_IN_NAME(offset)) {
                alist = access_list_lookup(AFI_IP6,
                                           OFFSET_LIST_IN_NAME(offset));
@@ -115,14 +124,14 @@ int ripng_offset_list_apply_in(struct prefix_ipv6 *p, struct interface *ifp,
 }
 
 /* If metric is modifed return 1. */
-int ripng_offset_list_apply_out(struct prefix_ipv6 *p, struct interface *ifp,
-                               uint8_t *metric)
+int ripng_offset_list_apply_out(struct ripng *ripng, struct prefix_ipv6 *p,
+                               struct interface *ifp, uint8_t *metric)
 {
        struct ripng_offset_list *offset;
        struct access_list *alist;
 
        /* Look up offset-list with interface name. */
-       offset = ripng_offset_list_lookup(ifp->name);
+       offset = ripng_offset_list_lookup(ripng, ifp->name);
        if (offset && OFFSET_LIST_OUT_NAME(offset)) {
                alist = access_list_lookup(AFI_IP6,
                                           OFFSET_LIST_OUT_NAME(offset));
@@ -137,7 +146,7 @@ int ripng_offset_list_apply_out(struct prefix_ipv6 *p, struct interface *ifp,
        }
 
        /* Look up offset-list without interface name. */
-       offset = ripng_offset_list_lookup("*");
+       offset = ripng_offset_list_lookup(ripng, "*");
        if (offset && OFFSET_LIST_OUT_NAME(offset)) {
                alist = access_list_lookup(AFI_IP6,
                                           OFFSET_LIST_OUT_NAME(offset));
@@ -153,26 +162,7 @@ int ripng_offset_list_apply_out(struct prefix_ipv6 *p, struct interface *ifp,
        return 0;
 }
 
-static int offset_list_cmp(struct ripng_offset_list *o1,
-                          struct ripng_offset_list *o2)
+int offset_list_cmp(struct ripng_offset_list *o1, struct ripng_offset_list *o2)
 {
        return strcmp(o1->ifname, o2->ifname);
 }
-
-void ripng_offset_init(void)
-{
-       ripng_offset_list_master = list_new();
-       ripng_offset_list_master->cmp =
-               (int (*)(void *, void *))offset_list_cmp;
-       ripng_offset_list_master->del = (void (*)(void *))ripng_offset_list_del;
-}
-
-void ripng_offset_clean(void)
-{
-       list_delete(&ripng_offset_list_master);
-
-       ripng_offset_list_master = list_new();
-       ripng_offset_list_master->cmp =
-               (int (*)(void *, void *))offset_list_cmp;
-       ripng_offset_list_master->del = (void (*)(void *))ripng_offset_list_del;
-}