From 167b08892aacbd937d3864ef7e3debabc23f5abd Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Fri, 28 Dec 2018 14:27:45 +0100 Subject: [PATCH] zebra: do not create vrf if name already set to default vrf at startup if the default vrf name is manually set, by passing -o parameter to zebra, then this should be detected when walking the list of netns available in the system. If a netns called vrf0 is present, then it should be ignored. Signed-off-by: Philippe Guibert --- zebra/zebra_netns_notify.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c index a4e1022148..a6b17303b9 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -215,6 +215,12 @@ static int zebra_ns_ready_read(struct thread *t) if (err < 0) return zebra_ns_continue_read(zns_info, stop_retry); + /* check default name is not already set */ + if (strmatch(VRF_DEFAULT_NAME, basename(netnspath))) { + zlog_warn("NS notify : NS %s is already default VRF." + "Cancel VRF Creation", basename(netnspath)); + return zebra_ns_continue_read(zns_info, 1); + } if (zebra_ns_notify_is_default_netns(basename(netnspath))) { zlog_warn( "NS notify : NS %s is default VRF." @@ -311,6 +317,12 @@ void zebra_ns_notify_parse(void) dent->d_name); continue; } + /* check default name is not already set */ + if (strmatch(VRF_DEFAULT_NAME, basename(dent->d_name))) { + zlog_warn("NS notify : NS %s is already default VRF." + "Cancel VRF Creation", dent->d_name); + continue; + } if (zebra_ns_notify_is_default_netns(dent->d_name)) { zlog_warn( "NS notify : NS %s is default VRF." -- 2.39.5