diff options
Diffstat (limited to 'pimd/pim_msdp_socket.c')
| -rw-r--r-- | pimd/pim_msdp_socket.c | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c index 6f334ca758..b0e7b39d7b 100644 --- a/pimd/pim_msdp_socket.c +++ b/pimd/pim_msdp_socket.c @@ -43,17 +43,18 @@ 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(LIB_ERR_SOCKET, "getsockopt of SO_SNDBUF failed %s\n", - safe_strerror(errno)); + flog_err_sys(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) { - flog_err(LIB_ERR_SOCKET, - "Couldn't increase send buffer: %s\n", - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, + "Couldn't increase send buffer: %s\n", + safe_strerror(errno)); } } } @@ -84,8 +85,8 @@ 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(LIB_ERR_SOCKET, "pim_msdp_sock_accept failed (%s)", - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, "pim_msdp_sock_accept failed (%s)", + safe_strerror(errno)); return -1; } @@ -140,7 +141,8 @@ int pim_msdp_sock_listen(struct pim_instance *pim) sock = socket(AF_INET, SOCK_STREAM, 0); if (sock < 0) { - flog_err(LIB_ERR_SOCKET, "socket: %s", safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, "socket: %s", + safe_strerror(errno)); return sock; } @@ -166,9 +168,9 @@ int pim_msdp_sock_listen(struct pim_instance *pim) return -1; } if (pim_socket_bind(sock, ifp)) { - flog_err(LIB_ERR_SOCKET, - "%s: Unable to bind to socket: %s", - __PRETTY_FUNCTION__, safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, + "%s: Unable to bind to socket: %s", + __PRETTY_FUNCTION__, safe_strerror(errno)); close(sock); return -1; } @@ -190,16 +192,17 @@ int pim_msdp_sock_listen(struct pim_instance *pim) } if (rc < 0) { - flog_err(LIB_ERR_SOCKET, "pim_msdp_socket bind to port %d: %s", - ntohs(sin.sin_port), safe_strerror(errno)); + flog_err_sys(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) { - flog_err(LIB_ERR_SOCKET, "pim_msdp_socket listen: %s", - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, "pim_msdp_socket listen: %s", + safe_strerror(errno)); close(sock); return rc; } @@ -239,8 +242,9 @@ 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(LIB_ERR_SOCKET, "pim_msdp_socket socket failure: %s", - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, + "pim_msdp_socket socket failure: %s", + safe_strerror(errno)); return -1; } @@ -254,9 +258,9 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp) return -1; } if (pim_socket_bind(mp->fd, ifp)) { - flog_err(LIB_ERR_SOCKET, - "%s: Unable to bind to socket: %s", - __PRETTY_FUNCTION__, safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, + "%s: Unable to bind to socket: %s", + __PRETTY_FUNCTION__, safe_strerror(errno)); close(mp->fd); mp->fd = -1; return -1; @@ -273,9 +277,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) { - flog_err(LIB_ERR_SOCKET, - "pim_msdp_socket connect bind failure: %s", - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, + "pim_msdp_socket connect bind failure: %s", + safe_strerror(errno)); close(mp->fd); mp->fd = -1; return rc; |