Page MenuHomeFreeBSD
Files F115558092

D45547.diff
No OneTemporary
Actions

D45547.diff
View Options

diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -229,24 +229,44 @@
case AF_INET6:
{
const struct sockaddr_in6 *sin6;
+
sin6 = (const struct sockaddr_in6 *)sa;
- switch (sin6->sin6_addr.s6_addr[0]) {
- case 0x00:
- if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr))
- ;
- else if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
- ;
- else
- flags |= NI_NUMERICHOST;
- break;
- default:
- if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
- flags |= NI_NUMERICHOST;
- }
- else if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
- flags |= NI_NUMERICHOST;
- break;
- }
+
+ /*
+ * https://pubs.opengroup.org/onlinepubs/9699919799/functions/getnameinfo.html
+ * "[IP6] [Option Start] If the socket address structure
+ * contains an IPv4-mapped IPv6 address or an IPv4-compatible
+ * IPv6 address, the implementation shall extract the embedded
+ * IPv4 address and lookup the node name for that IPv4 address.
+ * [Option End]"
+ * => getipnodebyaddr() handles this case for us.
+ * => in case of NI_NUMERICHOST being set, inet_ntop[6] will
+ * handle it too.
+ *
+ * "If the address is the IPv6 unspecified address ( "::" ),
+ * a lookup shall not be performed and the behavior shall be
+ * the same as when the node's name cannot be located."
+ * => getipnodebyaddr() handles this case for us.
+ * => in case of NI_NUMERICHOST being set,
+ * ip6_parsenumeric() -> inet_ntop[6] will handle it too.
+ */
+
+ /*
+ * We used to exclude link-local from lookups.
+ * Even though calles in the resolver chain may not (yet)
+ * properly deal with them, we no longer do as for link-local
+ * there is a path to resolve these. See:
+ * RFC 6303 4.5. IPv6 Link-Local Addresses
+ * RFC 6762 4. Reverse Address Mapping
+ *
+ * XXX For IPv6 MC the only reference found was
+ * https://www.ietf.org/archive/id/draft-michaelson-as112-ipv6-02.html
+ * but there are also no "empty zone"s for x.0.f.f.ip6.arpa
+ * in DNS servers. Keep catching it here for now and
+ * do not attempt name resolution but return the address string.
+ */
+ if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
+ flags |= NI_NUMERICHOST;
}
break;
#endif

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 7:37 AM (17 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17800788
Default Alt Text
D45547.diff (2 KB)

Event Timeline