pimd: Convert over to use LIB_ERR_XXX for zlog_err

Convert, where appropriate, the zlog_err functions to zlog_ferr
for the LIB_ERR_XXX enums

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

1 files changed, 40 insertions, 29 deletions

diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c
index f245a04353..5b1afb774b 100644
--- a/pimd/pim_msdp_socket.c
+++ b/pimd/pim_msdp_socket.c
@@ -26,6 +26,7 @@
 #include <lib/vty.h>
 #include <lib/if.h>
 #include <lib/vrf.h>
+#include <lib/lib_errors.h>
 
 #include "pimd.h"
 #include "pim_sock.h"
@@ -41,16 +42,17 @@ static void pim_msdp_update_sock_send_buffer_size(int fd)
 	socklen_t optlen = sizeof(optval);
 
 	if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &optval, &optlen) < 0) {
-		zlog_err("getsockopt of SO_SNDBUF failed %s\n",
-			 safe_strerror(errno));
+		zlog_ferr(LIB_ERR_SOCKET, "getsockopt of SO_SNDBUF failed %s\n",
+			  safe_strerror(errno));
 		return;
 	}
 
 	if (optval < size) {
 		if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size))
 		    < 0) {
-			zlog_err("Couldn't increase send buffer: %s\n",
-				 safe_strerror(errno));
+			zlog_ferr(LIB_ERR_SOCKET,
+				  "Couldn't increase send buffer: %s\n",
+				  safe_strerror(errno));
 		}
 	}
 }
@@ -70,7 +72,8 @@ static int pim_msdp_sock_accept(struct thread *thread)
 	/* re-register accept thread */
 	accept_sock = THREAD_FD(thread);
 	if (accept_sock < 0) {
-		zlog_err("accept_sock is negative value %d", accept_sock);
+		zlog_ferr(LIB_ERR_DEVELOPMENT,
+			  "accept_sock is negative value %d", accept_sock);
 		return -1;
 	}
 	pim->msdp.listener.thread = NULL;
@@ -80,8 +83,8 @@ static int pim_msdp_sock_accept(struct thread *thread)
 	/* accept client connection. */
 	msdp_sock = sockunion_accept(accept_sock, &su);
 	if (msdp_sock < 0) {
-		zlog_err("pim_msdp_sock_accept failed (%s)",
-			 safe_strerror(errno));
+		zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_sock_accept failed (%s)",
+			  safe_strerror(errno));
 		return -1;
 	}
 
@@ -106,7 +109,7 @@ static int pim_msdp_sock_accept(struct thread *thread)
 	 * with this one */
 	if (mp->fd >= 0) {
 		if (PIM_DEBUG_MSDP_EVENTS) {
-			zlog_err(
+			zlog_notice(
 				"msdp peer new connection from %s stop old connection",
 				sockunion2str(&su, buf, SU_ADDRSTRLEN));
 		}
@@ -135,7 +138,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
 
 	sock = socket(AF_INET, SOCK_STREAM, 0);
 	if (sock < 0) {
-		zlog_err("socket: %s", safe_strerror(errno));
+		zlog_ferr(LIB_ERR_SOCKET, "socket: %s", safe_strerror(errno));
 		return sock;
 	}
 
@@ -154,42 +157,47 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
 		struct interface *ifp =
 			if_lookup_by_name(pim->vrf->name, pim->vrf_id);
 		if (!ifp) {
-			zlog_err("%s: Unable to lookup vrf interface: %s",
-				 __PRETTY_FUNCTION__, pim->vrf->name);
+			zlog_ferr(LIB_ERR_INTERFACE,
+				  "%s: Unable to lookup vrf interface: %s",
+				  __PRETTY_FUNCTION__, pim->vrf->name);
 			close(sock);
 			return -1;
 		}
 		if (pim_socket_bind(sock, ifp)) {
-			zlog_err("%s: Unable to bind to socket: %s",
-				 __PRETTY_FUNCTION__, safe_strerror(errno));
+			zlog_ferr(LIB_ERR_SOCKET,
+				  "%s: Unable to bind to socket: %s",
+				  __PRETTY_FUNCTION__, safe_strerror(errno));
 			close(sock);
 			return -1;
 		}
 	}
 
 	if (pimd_privs.change(ZPRIVS_RAISE)) {
-		zlog_err("pim_msdp_socket: could not raise privs, %s",
-			 safe_strerror(errno));
+		zlog_ferr(LIB_ERR_PRIVILEGES,
+			  "pim_msdp_socket: could not raise privs, %s",
+			  safe_strerror(errno));
 	}
 
 	/* bind to well known TCP port */
 	rc = bind(sock, (struct sockaddr *)&sin, socklen);
 
 	if (pimd_privs.change(ZPRIVS_LOWER)) {
-		zlog_err("pim_msdp_socket: could not lower privs, %s",
-			 safe_strerror(errno));
+		zlog_ferr(LIB_ERR_PRIVILEGES,
+			  "pim_msdp_socket: could not lower privs, %s",
+			  safe_strerror(errno));
 	}
 
 	if (rc < 0) {
-		zlog_err("pim_msdp_socket bind to port %d: %s",
-			 ntohs(sin.sin_port), safe_strerror(errno));
+		zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_socket bind to port %d: %s",
+			  ntohs(sin.sin_port), safe_strerror(errno));
 		close(sock);
 		return rc;
 	}
 
 	rc = listen(sock, 3 /* backlog */);
 	if (rc < 0) {
-		zlog_err("pim_msdp_socket listen: %s", safe_strerror(errno));
+		zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_socket listen: %s",
+			  safe_strerror(errno));
 		close(sock);
 		return rc;
 	}
@@ -219,7 +227,7 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
 	 * with this one */
 	if (mp->fd >= 0) {
 		if (PIM_DEBUG_MSDP_EVENTS) {
-			zlog_err(
+			zlog_notice(
 				"msdp duplicate connect to %s nuke old connection",
 				mp->key_str);
 		}
@@ -229,8 +237,8 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
 	/* Make socket for the peer. */
 	mp->fd = sockunion_socket(&mp->su_peer);
 	if (mp->fd < 0) {
-		zlog_err("pim_msdp_socket socket failure: %s",
-			 safe_strerror(errno));
+		zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_socket socket failure: %s",
+			  safe_strerror(errno));
 		return -1;
 	}
 
@@ -238,13 +246,15 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
 		struct interface *ifp =
 			if_lookup_by_name(mp->pim->vrf->name, mp->pim->vrf_id);
 		if (!ifp) {
-			zlog_err("%s: Unable to lookup vrf interface: %s",
-				 __PRETTY_FUNCTION__, mp->pim->vrf->name);
+			zlog_ferr(LIB_ERR_INTERFACE,
+				  "%s: Unable to lookup vrf interface: %s",
+				  __PRETTY_FUNCTION__, mp->pim->vrf->name);
 			return -1;
 		}
 		if (pim_socket_bind(mp->fd, ifp)) {
-			zlog_err("%s: Unable to bind to socket: %s",
-				 __PRETTY_FUNCTION__, safe_strerror(errno));
+			zlog_ferr(LIB_ERR_SOCKET,
+				  "%s: Unable to bind to socket: %s",
+				  __PRETTY_FUNCTION__, safe_strerror(errno));
 			close(mp->fd);
 			mp->fd = -1;
 			return -1;
@@ -261,8 +271,9 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
 	/* source bind */
 	rc = sockunion_bind(mp->fd, &mp->su_local, 0, &mp->su_local);
 	if (rc < 0) {
-		zlog_err("pim_msdp_socket connect bind failure: %s",
-			 safe_strerror(errno));
+		zlog_ferr(LIB_ERR_SOCKET,
+			  "pim_msdp_socket connect bind failure: %s",
+			  safe_strerror(errno));
 		close(mp->fd);
 		mp->fd = -1;
 		return rc;