Browse Source

MT#55283 convert close_socket to bool

Change-Id: I290012391ba1fa2c6c550614e054181de6e0b94e
pull/1910/head
Richard Fuchs 10 months ago
parent
commit
7599e5c375
3 changed files with 7 additions and 7 deletions
  1. +1
    -1
      daemon/media_socket.c
  2. +5
    -5
      lib/socket.c
  3. +1
    -1
      lib/socket.h

+ 1
- 1
daemon/media_socket.c View File

@ -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);


+ 5
- 5
lib/socket.c View File

@ -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:


+ 1
- 1
lib/socket.h View File

@ -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 *);


Loading…
Cancel
Save