staticd: kill static_memory.h, use MTYPE_STATIC

[mirror_frr.git] / staticd / static_vrf.c

diff --git a/staticd/static_vrf.c b/staticd/static_vrf.c
index 83894e92672f5a7ae1dc6a6c9b0f1a0c5e8e1c96..ba1367b877f4175dc553e61ffc64f08b4693de23 100644 (file)
--- a/staticd/static_vrf.c
+++ b/staticd/static_vrf.c
@@ -24,7 +24,6 @@
 #include "table.h"
 #include "srcdest_table.h"
 
-#include "static_memory.h"
 #include "static_vrf.h"
 #include "static_routes.h"
 #include "static_zebra.h"
@@ -32,63 +31,6 @@
 
 DEFINE_MTYPE_STATIC(STATIC, STATIC_RTABLE_INFO, "Static Route Table Info");
 
-static void zebra_stable_node_cleanup(struct route_table *table,
-                                     struct route_node *node)
-{
-       struct static_nexthop *nh;
-       struct static_path *pn;
-       struct static_route_info *si;
-       struct route_table *src_table;
-       struct route_node *src_node;
-       struct static_path *src_pn;
-       struct static_route_info *src_si;
-
-       si = node->info;
-
-       if (si) {
-               frr_each_safe(static_path_list, &si->path_list, pn) {
-                       frr_each_safe(static_nexthop_list, &pn->nexthop_list,
-                                      nh) {
-                               static_nexthop_list_del(&pn->nexthop_list, nh);
-                               XFREE(MTYPE_STATIC_NEXTHOP, nh);
-                       }
-                       static_path_list_del(&si->path_list, pn);
-                       XFREE(MTYPE_STATIC_PATH, pn);
-               }
-
-               /* clean up for dst table */
-               src_table = srcdest_srcnode_table(node);
-               if (src_table) {
-                       /* This means the route_node is part of the top
-                        * hierarchy and refers to a destination prefix.
-                        */
-                       for (src_node = route_top(src_table); src_node;
-                            src_node = route_next(src_node)) {
-                               src_si = src_node->info;
-
-                               frr_each_safe(static_path_list,
-                                             &src_si->path_list, src_pn) {
-                                       frr_each_safe(static_nexthop_list,
-                                                     &src_pn->nexthop_list,
-                                                     nh) {
-                                               static_nexthop_list_del(
-                                                       &src_pn->nexthop_list,
-                                                       nh);
-                                               XFREE(MTYPE_STATIC_NEXTHOP, nh);
-                                       }
-                                       static_path_list_del(&src_si->path_list,
-                                                            src_pn);
-                                       XFREE(MTYPE_STATIC_PATH, src_pn);
-                               }
-
-                               XFREE(MTYPE_STATIC_ROUTE, src_node->info);
-                       }
-               }
-
-               XFREE(MTYPE_STATIC_ROUTE, node->info);
-       }
-}
-
 static struct static_vrf *static_vrf_alloc(void)
 {
        struct route_table *table;
@@ -261,25 +203,3 @@ void static_vrf_terminate(void)
 {
        vrf_terminate();
 }
-
-struct static_vrf *static_vty_get_unknown_vrf(const char *vrf_name)
-{
-       struct static_vrf *svrf;
-       struct vrf *vrf;
-
-       svrf = static_vrf_lookup_by_name(vrf_name);
-
-       if (svrf)
-               return svrf;
-
-       vrf = vrf_get(VRF_UNKNOWN, vrf_name);
-       if (!vrf)
-               return NULL;
-       svrf = vrf->info;
-       if (!svrf)
-               return NULL;
-       /* Mark as having FRR configuration */
-       vrf_set_user_cfged(vrf);
-
-       return svrf;
-}