Browse Source

MT#55283 convert accept to bool

Change-Id: Ie4e1415fd35fa6b4a3ab95ed80c2ab3047b902bc
pull/1910/head
Richard Fuchs 10 months ago
parent
commit
df64eb09a4
3 changed files with 7 additions and 7 deletions
  1. +2
    -2
      daemon/tcp_listener.c
  2. +4
    -4
      lib/socket.c
  3. +1
    -1
      lib/socket.h

+ 2
- 2
daemon/tcp_listener.c View File

@ -32,7 +32,7 @@ TYPED_GHASHTABLE_IMPL(tcp_streams_ht, tcp_direct_hash, tcp_direct_eq, NULL, NULL
static void tcp_listener_incoming(int fd, void *p) {
struct tcp_listener_callback *cb = p;
int ret;
bool ret;
char addr[64];
socket_t *listener;
socket_t newsock;
@ -41,7 +41,7 @@ static void tcp_listener_incoming(int fd, void *p) {
for (;;) {
ret = listener->family->accept(listener, &newsock);
if (ret == -1) {
if (!ret) {
if (errno == EINTR)
continue;
if (errno != EWOULDBLOCK && errno != EAGAIN)


+ 4
- 4
lib/socket.c View File

@ -26,7 +26,7 @@ static bool __ip6_is_specified(const sockaddr_t *a);
static bool __ip_bind(socket_t *s, unsigned int, const sockaddr_t *);
static bool __ip_connect(socket_t *s, const endpoint_t *);
static bool __ip_listen(socket_t *s, int backlog);
static int __ip_accept(socket_t *s, socket_t *new_sock);
static bool __ip_accept(socket_t *s, socket_t *new_sock);
static int __ip_timestamping(socket_t *s);
static int __ip4_pktinfo(socket_t *s);
static int __ip6_pktinfo(socket_t *s);
@ -292,7 +292,7 @@ static bool __ip_connect(socket_t *s, const endpoint_t *ep) {
static bool __ip_listen(socket_t *s, int backlog) {
return listen(s->fd, backlog) == 0;
}
static int __ip_accept(socket_t *s, socket_t *newsock) {
static bool __ip_accept(socket_t *s, socket_t *newsock) {
int nfd;
struct sockaddr_storage sin;
socklen_t sinlen;
@ -303,7 +303,7 @@ static int __ip_accept(socket_t *s, socket_t *newsock) {
nfd = accept(s->fd, (struct sockaddr *) &sin, &sinlen);
if (nfd == -1) {
__C_DBG("accept fail, fd=%d, port=%d", s->fd, s->local.port);
return -1;
return false;
}
newsock->fd = nfd;
@ -311,7 +311,7 @@ static int __ip_accept(socket_t *s, socket_t *newsock) {
newsock->local = s->local;
s->family->sockaddr2endpoint(&newsock->remote, &sin);
return 0;
return true;
}
INLINE ssize_t __ip_recvfrom_options(socket_t *s, void *buf, size_t len, endpoint_t *ep, struct timeval *tv,
sockaddr_t *to, bool (*parse)(struct cmsghdr *, sockaddr_t *))


+ 1
- 1
lib/socket.h View File

@ -72,7 +72,7 @@ struct socket_family {
bool (*bind)(socket_t *, unsigned int, const sockaddr_t *);
bool (*connect)(socket_t *, const endpoint_t *);
bool (*listen)(socket_t *, int);
int (*accept)(socket_t *, socket_t *);
bool (*accept)(socket_t *, socket_t *);
int (*timestamping)(socket_t *);
int (*pktinfo)(socket_t *);
ssize_t (*recvfrom)(socket_t *, void *, size_t, endpoint_t *);


Loading…
Cancel
Save