From ad11e98903040e2be5d57cd946f4b9bf9d8623bf Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 12 Feb 2025 12:03:23 -0400 Subject: [PATCH] MT#55283 convert pktinfo to bool Change-Id: I4fa705063400f119568f93fa037a51adabbe9c40 --- lib/socket.c | 16 ++++++++-------- lib/socket.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/socket.c b/lib/socket.c index e707ca787..5372ab2ae 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -28,8 +28,8 @@ static bool __ip_connect(socket_t *s, const endpoint_t *); static bool __ip_listen(socket_t *s, int backlog); static bool __ip_accept(socket_t *s, socket_t *new_sock); static bool __ip_timestamping(socket_t *s); -static int __ip4_pktinfo(socket_t *s); -static int __ip6_pktinfo(socket_t *s); +static bool __ip4_pktinfo(socket_t *s); +static bool __ip6_pktinfo(socket_t *s); static bool __ip4_sockaddr2endpoint(endpoint_t *, const void *); static bool __ip6_sockaddr2endpoint(endpoint_t *, const void *); static bool __ip4_endpoint2sockaddr(void *, const endpoint_t *); @@ -416,11 +416,11 @@ static bool __ip_timestamping(socket_t *s) { return false; return true; } -static int __ip4_pktinfo(socket_t *s) { +static bool __ip4_pktinfo(socket_t *s) { int one = 1; if (setsockopt(s->fd, IPPROTO_IP, IP_PKTINFO, &one, sizeof(one))) - return -1; - return 0; + return false; + return true; } static void __ip4_cmsg_pktinfo(struct cmsghdr *cm, const sockaddr_t *addr) { cm->cmsg_level = IPPROTO_IP; @@ -430,11 +430,11 @@ static void __ip4_cmsg_pktinfo(struct cmsghdr *cm, const sockaddr_t *addr) { pi->ipi_spec_dst = addr->ipv4; cm->cmsg_len = CMSG_LEN(sizeof(*pi)); } -static int __ip6_pktinfo(socket_t *s) { +static bool __ip6_pktinfo(socket_t *s) { int one = 1; if (setsockopt(s->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &one, sizeof(one))) - return -1; - return 0; + return false; + return true; } static void __ip6_cmsg_pktinfo(struct cmsghdr *cm, const sockaddr_t *addr) { cm->cmsg_level = IPPROTO_IPV6; diff --git a/lib/socket.h b/lib/socket.h index 8926b57ee..091ac3bb9 100644 --- a/lib/socket.h +++ b/lib/socket.h @@ -74,7 +74,7 @@ struct socket_family { bool (*listen)(socket_t *, int); bool (*accept)(socket_t *, socket_t *); bool (*timestamping)(socket_t *); - int (*pktinfo)(socket_t *); + bool (*pktinfo)(socket_t *); ssize_t (*recvfrom)(socket_t *, void *, size_t, endpoint_t *); ssize_t (*recvfrom_ts)(socket_t *, void *, size_t, endpoint_t *, struct timeval *); ssize_t (*recvfrom_to)(socket_t *, void *, size_t, endpoint_t *, sockaddr_t *);