[PATCH v2] getaddrinfo: Refactor code for readability
DJ Delorie
dj@redhat.com
Tue Mar 22 19:05:34 GMT 2022
LGTM
Reviewed-by: DJ Delorie <dj@redhat.com>
Siddhesh Poyarekar <siddhesh@sourceware.org> writes:
> diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
>
> +static bool
> +try_connect (int *fdp, int *afp, struct sockaddr_in6 *source_addrp,
> + const struct sockaddr *addr, socklen_t addrlen, int family)
> +{
> + int fd = *fdp;
> + int af = *afp;
> + socklen_t sl = sizeof (*source_addrp);
> +
> + while (true)
> + {
> + if (fd != -1 && __connect (fd, addr, addrlen) == 0
> + && __getsockname (fd, (struct sockaddr *) source_addrp, &sl) == 0)
> + return true;
> +
> + if (errno == EAFNOSUPPORT && af == AF_INET6 && family == AF_INET)
> + {
> + /* This could mean IPv6 sockets are IPv6-only. */
> + if (fd != -1)
> + __close_nocancel_nostatus (fd);
> + *afp = af = AF_INET;
> + *fdp = fd = __socket (AF_INET, SOCK_DGRAM | SOCK_CLOEXEC,
> + IPPROTO_IP);
> + continue;
> + }
> +
> + return false;
> + }
> +
> + __builtin_unreachable ();
> +}
Ok.
> if (fd != -1)
> - close_retry:
> __close_nocancel_nostatus (fd);
Ok.
> - socklen_t sl = sizeof (results[i].source_addr);
> - if (fd != -1
> - && __connect (fd, q->ai_addr, q->ai_addrlen) == 0
> - && __getsockname (fd,
> - (struct sockaddr *) &results[i].source_addr,
> - &sl) == 0)
> + if (try_connect (&fd, &af, &results[i].source_addr, q->ai_addr,
> + q->ai_addrlen, q->ai_family))
Ok.
> - results[i].source_addr_len = sl;
> + results[i].source_addr_len = sizeof (results[i].source_addr);
Ok.
> - else if (errno == EAFNOSUPPORT && af == AF_INET6
> - && q->ai_family == AF_INET)
> - /* This could mean IPv6 sockets are IPv6-only. */
> - goto close_retry;
Ok.
More information about the Libc-alpha
mailing list