diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2019-08-02 16:10:11 +0200 |
|---|---|---|
| committer | Igor Ryzhov <iryzhov@nfware.com> | 2019-08-02 16:10:11 +0200 |
| commit | c7975431e633c88ff9a728aba514f97638d4f51a (patch) | |
| tree | f00873ae4047cc13848a287b8d07756471648d6b /zebra | |
| parent | Merge pull request #4766 from donaldsharp/redist_small_fix (diff) | |
| download | frr-c7975431e633c88ff9a728aba514f97638d4f51a.tar.xz frr-c7975431e633c88ff9a728aba514f97638d4f51a.zip | |
all: remove logical-router functionality
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/main.c | 4 | ||||
| -rw-r--r-- | zebra/zebra_ns.c | 19 |
2 files changed, 0 insertions, 23 deletions
diff --git a/zebra/main.c b/zebra/main.c index 84e83bc37..657d1247e 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -34,7 +34,6 @@ #include "privs.h" #include "sigevent.h" #include "vrf.h" -#include "logicalrouter.h" #include "libfrr.h" #include "routemap.h" #include "frr_pthread.h" @@ -262,7 +261,6 @@ int main(int argc, char **argv) graceful_restart = 0; vrf_configure_backend(VRF_BACKEND_VRF_LITE); - logicalrouter_configure_backend(LOGICALROUTER_BACKEND_NETNS); frr_preinit(&zebra_di, argc, argv); @@ -349,8 +347,6 @@ int main(int argc, char **argv) break; case 'n': vrf_configure_backend(VRF_BACKEND_NETNS); - logicalrouter_configure_backend( - LOGICALROUTER_BACKEND_OFF); break; case OPTION_V6_RR_SEMANTICS: v6_rr_semantics = true; diff --git a/zebra/zebra_ns.c b/zebra/zebra_ns.c index db4f9d001..94918365a 100644 --- a/zebra/zebra_ns.c +++ b/zebra/zebra_ns.c @@ -23,7 +23,6 @@ #include "lib/ns.h" #include "lib/vrf.h" -#include "lib/logicalrouter.h" #include "lib/prefix.h" #include "lib/memory.h" @@ -45,7 +44,6 @@ DEFINE_MTYPE(ZEBRA, ZEBRA_NS, "Zebra Name Space") static struct zebra_ns *dzns; -static int logicalrouter_config_write(struct vty *vty); static int zebra_ns_disable_internal(struct zebra_ns *zns, bool complete); struct zebra_ns *zebra_ns_lookup(ns_id_t ns_id) @@ -188,8 +186,6 @@ int zebra_ns_init(const char *optional_default_name) ns_id_external = ns_map_nsid_with_external(ns_id, true); ns_init_management(ns_id_external, ns_id); - logicalrouter_init(logicalrouter_config_write); - /* Do any needed per-NS data structure allocation. */ dzns->if_table = route_table_init(); @@ -215,21 +211,6 @@ int zebra_ns_init(const char *optional_default_name) return 0; } -static int logicalrouter_config_write(struct vty *vty) -{ - struct ns *ns; - int write = 0; - - RB_FOREACH (ns, ns_head, &ns_tree) { - if (ns->ns_id == NS_DEFAULT || ns->name == NULL) - continue; - vty_out(vty, "logical-router %u netns %s\n", ns->ns_id, - ns->name); - write = 1; - } - return write; -} - int zebra_ns_config_write(struct vty *vty, struct ns *ns) { if (ns && ns->name != NULL) |