Merge pull request #4849 from sworleys/Label-Append-Resolve_2

[mirror_frr.git] / lib / ns.h

diff --git a/lib/ns.h b/lib/ns.h
index b3810f069b46b8914b24c565b5c8daa524247990..1963b8a35968750efc194319b1614d132fc66ca7 100644 (file)
--- a/lib/ns.h
+++ b/lib/ns.h
@@ -26,6 +26,10 @@
 #include "linklist.h"
 #include "vty.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef uint32_t ns_id_t;
 
 /* the default NS ID */
@@ -37,7 +41,7 @@ typedef uint32_t ns_id_t;
 #ifdef HAVE_NETNS
 #define NS_DEFAULT_NAME    "/proc/self/ns/net"
 #else  /* !HAVE_NETNS */
-#define NS_DEFAULT_NAME    "Default-logical-router"
+#define NS_DEFAULT_NAME    "default-netns"
 #endif /* HAVE_NETNS */
 
 struct ns {
@@ -78,10 +82,10 @@ extern struct ns_head ns_tree;
  * NS hooks
  */
 
-#define NS_NEW_HOOK        0   /* a new logical-router is just created */
-#define NS_DELETE_HOOK     1   /* a logical-router is to be deleted */
-#define NS_ENABLE_HOOK     2   /* a logical-router is ready to use */
-#define NS_DISABLE_HOOK    3   /* a logical-router is to be unusable */
+#define NS_NEW_HOOK        0   /* a new netns is just created */
+#define NS_DELETE_HOOK     1   /* a netns is to be deleted */
+#define NS_ENABLE_HOOK     2   /* a netns is ready to use */
+#define NS_DISABLE_HOOK    3   /* a netns is to be unusable */
 
 /*
  * Add a specific hook ns module.
@@ -124,7 +128,7 @@ extern void ns_walk_func(int (*func)(struct ns *));
 extern const char *ns_get_name(struct ns *ns);
 
 /* only called from vrf ( when removing netns from vrf)
- * or at VRF or logical router termination
+ * or at VRF termination
  */
 extern void ns_delete(struct ns *ns);
 
@@ -174,4 +178,8 @@ extern int ns_enable(struct ns *ns, void (*func)(ns_id_t, void *));
 extern struct ns *ns_get_created(struct ns *ns, char *name, ns_id_t ns_id);
 extern void ns_disable(struct ns *ns);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*_ZEBRA_NS_H*/