From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 20 Aug 2018 13:34:53 +0000 (-0400)
Subject: lib: Convert netns_linux.c to new error-code work
X-Git-Tag: frr-7.1-dev~371^2~33
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8b895cd32faf5a48a6c565877091ff92b6541092;p=mirror%2Ffrr.git

lib: Convert netns_linux.c to new error-code work

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/lib/lib_errors.c b/lib/lib_errors.c
index d1c2140160..5610a32cf1 100644
--- a/lib/lib_errors.c
+++ b/lib/lib_errors.c
@@ -34,6 +34,12 @@ static struct log_ref ferr_lib_warn[] = {
 		.description = "During sanity checking stream.c has detected an error in the data associated with a particular stream",
 		.suggestion = "Gather log data and open an Issue, restart FRR",
 	},
+	{
+		.code = LIB_WARN_LINUX_NS,
+		.title = "The Linux namespace subsystem has encountered a parsing error",
+		.description = "During system startup an invalid parameter for the namesapce was give to FRR",
+		.suggestion = "Gather log data and open an Issue. restart FRR",
+	},
 	{
 		.code = END_FERR,
 	},
diff --git a/lib/lib_errors.h b/lib/lib_errors.h
index d27c1cfa26..23f5468c77 100644
--- a/lib/lib_errors.h
+++ b/lib/lib_errors.h
@@ -40,6 +40,7 @@ enum lib_log_refs {
 	LIB_ERR_UNAVAILABLE,
 	LIB_WARN_SNMP,
 	LIB_WARN_STREAM,
+	LIB_WARN_LINUX_NS,
 };
 
 extern void lib_error_init(void);
diff --git a/lib/netns_linux.c b/lib/netns_linux.c
index 33338ac89c..e3170fee1e 100644
--- a/lib/netns_linux.c
+++ b/lib/netns_linux.c
@@ -441,8 +441,8 @@ char *ns_netns_pathname(struct vty *vty, const char *name)
 				pathname,
 				safe_strerror(errno));
 		else
-			zlog_warn("Invalid pathname for %s: %s",
-				  pathname,
+			flog_warn(LIB_WARN_LINUX_NS,
+				  "Invalid pathname for %s: %s", pathname,
 				  safe_strerror(errno));
 		return NULL;
 	}
@@ -452,7 +452,8 @@ char *ns_netns_pathname(struct vty *vty, const char *name)
 			vty_out(vty, "NS name (%s) invalid: too long (>%d)\n",
 				check_base, NS_NAMSIZ - 1);
 		else
-			zlog_warn("NS name (%s) invalid: too long (>%d)",
+			flog_warn(LIB_WARN_LINUX_NS,
+				  "NS name (%s) invalid: too long (>%d)",
 				  check_base, NS_NAMSIZ - 1);
 		return NULL;
 	}