diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-03-06 21:24:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 21:24:25 -0500 |
| commit | 4e48b44f195f34ee122b08d7c26d37918ea2f508 (patch) | |
| tree | 296616c8457939b87d35c7c8a6c679329188b3b4 /lib/netns_linux.c | |
| parent | defd0965f4a85a392e29032f712617e3c617596d (diff) | |
| parent | c214a6e9282315e20494ab681a5036e386aa7fd1 (diff) | |
Merge pull request #1840 from pguibert6WIND/issue_1829
Misc BGP VRF fixes
Diffstat (limited to 'lib/netns_linux.c')
| -rw-r--r-- | lib/netns_linux.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/netns_linux.c b/lib/netns_linux.c index 0e955bade9..a92431d1ae 100644 --- a/lib/netns_linux.c +++ b/lib/netns_linux.c @@ -43,6 +43,9 @@ DEFINE_MTYPE_STATIC(LIB, NS, "NetNS Context") DEFINE_MTYPE_STATIC(LIB, NS_NAME, "NetNS Name") +/* default NS ID value used when VRF backend is not NETNS */ +#define NS_DEFAULT_INTERNAL 0 + static inline int ns_compare(const struct ns *ns, const struct ns *ns2); static struct ns *ns_lookup_name_internal(const char *name); @@ -414,8 +417,10 @@ void ns_init(void) #ifdef HAVE_NETNS if (have_netns_enabled < 0) ns_default_ns_fd = open(NS_DEFAULT_NAME, O_RDONLY); - else + else { ns_default_ns_fd = -1; + default_ns = NULL; + } #else ns_default_ns_fd = -1; default_ns = NULL; @@ -534,6 +539,6 @@ ns_id_t ns_get_default_id(void) { if (default_ns) return default_ns->ns_id; - return NS_UNKNOWN; + return NS_DEFAULT_INTERNAL; } |