From: Rich Felker Date: Sat, 7 Feb 2015 19:01:34 +0000 (-0500) Subject: make getaddrinfo support SOCK_RAW and other socket types X-Git-Tag: v1.1.7~64 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c63c98a6067030a25a42703db1209ccbcc74803a;p=oweals%2Fmusl.git make getaddrinfo support SOCK_RAW and other socket types all socket types are accepted at this point, but that may be changed at a later time if the behavior is not meaningful for other types. as before, omitting type (a value of 0) gives both UDP and TCP results, and SOCK_DGRAM or SOCK_STREAM restricts to UDP or TCP, respectively. for other socket types, the service name argument is required to be a null pointer, and the protocol number provided by the caller is used. --- diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c index d9913445..c88d558c 100644 --- a/src/network/getaddrinfo.c +++ b/src/network/getaddrinfo.c @@ -11,7 +11,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru struct address addrs[MAXADDRS]; char canon[256], *outcanon; int nservs, naddrs, nais, canon_len, i, j, k; - int family = AF_UNSPEC, flags = 0, proto = 0; + int family = AF_UNSPEC, flags = 0, proto = 0, socktype = 0; struct aibuf { struct addrinfo ai; union sa { @@ -24,6 +24,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru family = hint->ai_family; flags = hint->ai_flags; proto = hint->ai_protocol; + socktype = hint->ai_socktype; const int mask = AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_V4MAPPED | AI_ALL | AI_ADDRCONFIG | AI_NUMERICSERV; @@ -38,35 +39,9 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru default: return EAI_FAMILY; } - - switch (hint->ai_socktype) { - case SOCK_STREAM: - switch (proto) { - case 0: - proto = IPPROTO_TCP; - case IPPROTO_TCP: - break; - default: - return EAI_SERVICE; - } - break; - case SOCK_DGRAM: - switch (proto) { - case 0: - proto = IPPROTO_UDP; - case IPPROTO_UDP: - break; - default: - return EAI_SERVICE; - } - case 0: - break; - default: - return EAI_SOCKTYPE; - } } - nservs = __lookup_serv(ports, serv, proto, flags); + nservs = __lookup_serv(ports, serv, proto, socktype, flags); if (nservs < 0) return nservs; naddrs = __lookup_name(addrs, canon, host, family, flags); @@ -87,8 +62,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru for (k=i=0; i 65535) return EAI_SERVICE; if (proto != IPPROTO_UDP) { buf[cnt].port = port; + buf[cnt].socktype = SOCK_STREAM; buf[cnt++].proto = IPPROTO_TCP; } if (proto != IPPROTO_TCP) { buf[cnt].port = port; + buf[cnt].socktype = SOCK_DGRAM; buf[cnt++].proto = IPPROTO_UDP; } return cnt; @@ -58,11 +90,13 @@ int __lookup_serv(struct service buf[static MAXSERVS], const char *name, int pro if (!strncmp(z, "/udp", 4)) { if (proto == IPPROTO_TCP) continue; buf[cnt].port = port; + buf[cnt].socktype = SOCK_DGRAM; buf[cnt++].proto = IPPROTO_UDP; } if (!strncmp(z, "/tcp", 4)) { if (proto == IPPROTO_UDP) continue; buf[cnt].port = port; + buf[cnt].socktype = SOCK_STREAM; buf[cnt++].proto = IPPROTO_TCP; } }