diff --git a/daemon/media_socket.c b/daemon/media_socket.c index 17d8b733d..bc2d914cb 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -1094,7 +1094,7 @@ static void release_port_now(socket_t *r, ports_q *list, struct port_pool *pp) { __C_DBG("Trying to release the port '%u'", port); - if (close_socket(r) == 0) { + if (close_socket(r)) { __C_DBG("A socket for the '%u' has been closed", port); iptables_del_rule(r); diff --git a/lib/socket.c b/lib/socket.c index 55b9b304b..5797886b5 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -857,26 +857,26 @@ bool reset_socket(socket_t *r) { return true; } -int close_socket(socket_t *r) { +bool close_socket(socket_t *r) { if (!r) { __C_DBG("close() syscall not called, no socket"); - return -1; + return false; } if (r->fd == -1) { __C_DBG("close() syscall not called, fd=%d", r->fd); - return -1; + return false; } if (close(r->fd) != 0) { __C_DBG("close() syscall fail, fd=%d", r->fd); - return -1; + return false; } __C_DBG("close() syscall success, fd=%d", r->fd); reset_socket(r); - return 0; + return true; } // moves the contents of the socket object: diff --git a/lib/socket.h b/lib/socket.h index 609c05813..733f96e3b 100644 --- a/lib/socket.h +++ b/lib/socket.h @@ -279,7 +279,7 @@ bool open_v46_socket(socket_t *r, int type); bool connect_socket(socket_t *r, int type, const endpoint_t *ep); int connect_socket_nb(socket_t *r, int type, const endpoint_t *ep); // 1 == in progress int connect_socket_retry(socket_t *r); // retries connect() while in progress -int close_socket(socket_t *r); +bool close_socket(socket_t *r); bool reset_socket(socket_t *r); void move_socket(socket_t *dst, socket_t *src); void dummy_socket(socket_t *r, const sockaddr_t *);