From 23ca436a1e3ebf9249bdb607e4c8a4a46380ca45 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 12 Feb 2025 11:52:30 -0400 Subject: [PATCH] MT#55283 convert sockaddr2endpoint to bool Change-Id: I4d2fb4ea29284ea421920e514ec0d80392e1a7a0 --- lib/socket.c | 20 ++++++++++---------- lib/socket.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/socket.c b/lib/socket.c index 9c3503792..173cdd11b 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -32,10 +32,10 @@ static int __ip4_pktinfo(socket_t *s); static int __ip6_pktinfo(socket_t *s); static bool __ip4_sockaddr2endpoint(endpoint_t *, const void *); static bool __ip6_sockaddr2endpoint(endpoint_t *, const void *); -static int __ip4_endpoint2sockaddr(void *, const endpoint_t *); -static int __ip6_endpoint2sockaddr(void *, const endpoint_t *); -static int __ip4_addrport2sockaddr(void *, const sockaddr_t *, unsigned int); -static int __ip6_addrport2sockaddr(void *, const sockaddr_t *, unsigned int); +static bool __ip4_endpoint2sockaddr(void *, const endpoint_t *); +static bool __ip6_endpoint2sockaddr(void *, const endpoint_t *); +static bool __ip4_addrport2sockaddr(void *, const sockaddr_t *, unsigned int); +static bool __ip6_addrport2sockaddr(void *, const sockaddr_t *, unsigned int); static ssize_t __ip_recvfrom(socket_t *s, void *buf, size_t len, endpoint_t *ep); static ssize_t __ip_recvfrom_ts(socket_t *s, void *buf, size_t len, endpoint_t *ep, struct timeval *); static ssize_t __ip4_recvfrom_to(socket_t *s, void *buf, size_t len, endpoint_t *ep, sockaddr_t *to); @@ -240,29 +240,29 @@ void endpoint_parse_sockaddr_storage(endpoint_t *ep, struct sockaddr_storage *sa else abort(); } -static int __ip4_endpoint2sockaddr(void *p, const endpoint_t *ep) { +static bool __ip4_endpoint2sockaddr(void *p, const endpoint_t *ep) { return __ip4_addrport2sockaddr(p, &ep->address, ep->port); } -static int __ip6_endpoint2sockaddr(void *p, const endpoint_t *ep) { +static bool __ip6_endpoint2sockaddr(void *p, const endpoint_t *ep) { return __ip6_addrport2sockaddr(p, &ep->address, ep->port); } -static int __ip4_addrport2sockaddr(void *p, const sockaddr_t *sa, unsigned int port) { +static bool __ip4_addrport2sockaddr(void *p, const sockaddr_t *sa, unsigned int port) { struct sockaddr_in *sin = p; ZERO(*sin); sin->sin_family = AF_INET; sin->sin_port = htons(port); if (sa) sin->sin_addr = sa->ipv4; - return 0; + return true; } -static int __ip6_addrport2sockaddr(void *p, const sockaddr_t *sa, unsigned int port) { +static bool __ip6_addrport2sockaddr(void *p, const sockaddr_t *sa, unsigned int port) { struct sockaddr_in6 *sin = p; ZERO(*sin); sin->sin6_family = AF_INET6; sin->sin6_port = htons(port); if (sa) sin->sin6_addr = sa->ipv6; - return 0; + return true; } static int __ip_bind(socket_t *s, unsigned int port, const sockaddr_t *a) { struct sockaddr_storage sin; diff --git a/lib/socket.h b/lib/socket.h index c96891959..f150f9522 100644 --- a/lib/socket.h +++ b/lib/socket.h @@ -67,8 +67,8 @@ struct socket_family { bool (*addr_print_p)(const sockaddr_t *, char *, size_t); bool (*is_specified)(const sockaddr_t *); bool (*sockaddr2endpoint)(endpoint_t *, const void *); - int (*endpoint2sockaddr)(void *, const endpoint_t *); - int (*addrport2sockaddr)(void *, const sockaddr_t *, unsigned int); + bool (*endpoint2sockaddr)(void *, const endpoint_t *); + bool (*addrport2sockaddr)(void *, const sockaddr_t *, unsigned int); int (*bind)(socket_t *, unsigned int, const sockaddr_t *); int (*connect)(socket_t *, const endpoint_t *); int (*listen)(socket_t *, int);