lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / pimd / pim_msdp_socket.c

diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c
index feac42cf535d1c08d19e6b294da9b0aa8aabb364..7997d3138adf0380dd4895b1e97e5a31c4a3114a 100644 (file)
--- a/pimd/pim_msdp_socket.c
+++ b/pimd/pim_msdp_socket.c
@@ -43,7 +43,7 @@ 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) {
-               flog_err_sys(LIB_ERR_SOCKET,
+               flog_err_sys(EC_LIB_SOCKET,
                             "getsockopt of SO_SNDBUF failed %s\n",
                             safe_strerror(errno));
                return;
@@ -52,7 +52,7 @@ static void pim_msdp_update_sock_send_buffer_size(int fd)
        if (optval < size) {
                if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size))
                    < 0) {
-                       flog_err_sys(LIB_ERR_SOCKET,
+                       flog_err_sys(EC_LIB_SOCKET,
                                     "Couldn't increase send buffer: %s\n",
                                     safe_strerror(errno));
                }
@@ -74,8 +74,8 @@ static int pim_msdp_sock_accept(struct thread *thread)
        /* re-register accept thread */
        accept_sock = THREAD_FD(thread);
        if (accept_sock < 0) {
-               flog_err(LIB_ERR_DEVELOPMENT,
-                         "accept_sock is negative value %d", accept_sock);
+               flog_err(EC_LIB_DEVELOPMENT, "accept_sock is negative value %d",
+                        accept_sock);
                return -1;
        }
        pim->msdp.listener.thread = NULL;
@@ -85,7 +85,7 @@ static int pim_msdp_sock_accept(struct thread *thread)
        /* accept client connection. */
        msdp_sock = sockunion_accept(accept_sock, &su);
        if (msdp_sock < 0) {
-               flog_err_sys(LIB_ERR_SOCKET, "pim_msdp_sock_accept failed (%s)",
+               flog_err_sys(EC_LIB_SOCKET, "pim_msdp_sock_accept failed (%s)",
                             safe_strerror(errno));
                return -1;
        }
@@ -95,9 +95,9 @@ static int pim_msdp_sock_accept(struct thread *thread)
        if (!mp || !PIM_MSDP_PEER_IS_LISTENER(mp)) {
                ++pim->msdp.rejected_accepts;
                if (PIM_DEBUG_MSDP_EVENTS) {
-                       flog_err(PIM_ERR_MSDP_PACKET,
-                                 "msdp peer connection refused from %s",
-                                 sockunion2str(&su, buf, SU_ADDRSTRLEN));
+                       flog_err(EC_PIM_MSDP_PACKET,
+                                "msdp peer connection refused from %s",
+                                sockunion2str(&su, buf, SU_ADDRSTRLEN));
                }
                close(msdp_sock);
                return -1;
@@ -141,8 +141,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
 
        sock = socket(AF_INET, SOCK_STREAM, 0);
        if (sock < 0) {
-               flog_err_sys(LIB_ERR_SOCKET, "socket: %s",
-                            safe_strerror(errno));
+               flog_err_sys(EC_LIB_SOCKET, "socket: %s", safe_strerror(errno));
                return sock;
        }
 
@@ -161,14 +160,14 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
                struct interface *ifp =
                        if_lookup_by_name(pim->vrf->name, pim->vrf_id);
                if (!ifp) {
-                       flog_err(LIB_ERR_INTERFACE,
-                                 "%s: Unable to lookup vrf interface: %s",
-                                 __PRETTY_FUNCTION__, pim->vrf->name);
+                       flog_err(EC_LIB_INTERFACE,
+                                "%s: Unable to lookup vrf interface: %s",
+                                __PRETTY_FUNCTION__, pim->vrf->name);
                        close(sock);
                        return -1;
                }
                if (pim_socket_bind(sock, ifp)) {
-                       flog_err_sys(LIB_ERR_SOCKET,
+                       flog_err_sys(EC_LIB_SOCKET,
                                     "%s: Unable to bind to socket: %s",
                                     __PRETTY_FUNCTION__, safe_strerror(errno));
                        close(sock);
@@ -182,7 +181,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
        }
 
        if (rc < 0) {
-               flog_err_sys(LIB_ERR_SOCKET,
+               flog_err_sys(EC_LIB_SOCKET,
                             "pim_msdp_socket bind to port %d: %s",
                             ntohs(sin.sin_port), safe_strerror(errno));
                close(sock);
@@ -191,7 +190,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
 
        rc = listen(sock, 3 /* backlog */);
        if (rc < 0) {
-               flog_err_sys(LIB_ERR_SOCKET, "pim_msdp_socket listen: %s",
+               flog_err_sys(EC_LIB_SOCKET, "pim_msdp_socket listen: %s",
                             safe_strerror(errno));
                close(sock);
                return rc;
@@ -232,7 +231,7 @@ 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) {
-               flog_err_sys(LIB_ERR_SOCKET,
+               flog_err_sys(EC_LIB_SOCKET,
                             "pim_msdp_socket socket failure: %s",
                             safe_strerror(errno));
                return -1;
@@ -242,13 +241,13 @@ 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) {
-                       flog_err(LIB_ERR_INTERFACE,
-                                 "%s: Unable to lookup vrf interface: %s",
-                                 __PRETTY_FUNCTION__, mp->pim->vrf->name);
+                       flog_err(EC_LIB_INTERFACE,
+                                "%s: Unable to lookup vrf interface: %s",
+                                __PRETTY_FUNCTION__, mp->pim->vrf->name);
                        return -1;
                }
                if (pim_socket_bind(mp->fd, ifp)) {
-                       flog_err_sys(LIB_ERR_SOCKET,
+                       flog_err_sys(EC_LIB_SOCKET,
                                     "%s: Unable to bind to socket: %s",
                                     __PRETTY_FUNCTION__, safe_strerror(errno));
                        close(mp->fd);
@@ -267,7 +266,7 @@ 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) {
-               flog_err_sys(LIB_ERR_SOCKET,
+               flog_err_sys(EC_LIB_SOCKET,
                             "pim_msdp_socket connect bind failure: %s",
                             safe_strerror(errno));
                close(mp->fd);