diff options
| author | Raimo Niskanen <[email protected]> | 2018-02-22 14:46:23 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-02-22 14:46:23 +0100 |
| commit | 6a4fb088b97a118bd1dcc1a544578f9fabc10c25 (patch) | |
| tree | d7f41305b2181e207249abee0c1fadf9a07c8700 | |
| parent | ee6d1b9a61d8f2f087f0f3bf3ea2b933b5c3a93a (diff) | |
| download | otp-6a4fb088b97a118bd1dcc1a544578f9fabc10c25.tar.gz otp-6a4fb088b97a118bd1dcc1a544578f9fabc10c25.tar.bz2 otp-6a4fb088b97a118bd1dcc1a544578f9fabc10c25.zip | |
Stop translating V4MAPPED addresses
| -rw-r--r-- | lib/kernel/src/inet_hosts.erl | 5 | ||||
| -rw-r--r-- | lib/kernel/src/inet_res.erl | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/kernel/src/inet_hosts.erl b/lib/kernel/src/inet_hosts.erl index 0bdf00ac30..fc653bf0d3 100644 --- a/lib/kernel/src/inet_hosts.erl +++ b/lib/kernel/src/inet_hosts.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2016. All Rights Reserved. +%% Copyright Ericsson AB 1997-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -72,9 +72,6 @@ gethostbyname(Name, Type, Byname, Byaddr) -> gethostbyaddr({A,B,C,D}=IP) when ?ip(A,B,C,D) -> gethostbyaddr(IP, inet); -%% ipv4 only ipv6 address -gethostbyaddr({0,0,0,0,0,16#ffff=F,G,H}) when ?ip6(0,0,0,0,0,F,G,H) -> - gethostbyaddr({G bsr 8, G band 255, H bsr 8, H band 255}); gethostbyaddr({A,B,C,D,E,F,G,H}=IP) when ?ip6(A,B,C,D,E,F,G,H) -> gethostbyaddr(IP, inet6); gethostbyaddr(Addr) when is_list(Addr) -> diff --git a/lib/kernel/src/inet_res.erl b/lib/kernel/src/inet_res.erl index 58017c62fb..6454802b04 100644 --- a/lib/kernel/src/inet_res.erl +++ b/lib/kernel/src/inet_res.erl @@ -349,9 +349,6 @@ gethostbyaddr_tm({A,B,C,D} = IP, Timer) when ?ip(A,B,C,D) -> {ok, HEnt} -> {ok, HEnt}; _ -> res_gethostbyaddr(dn_in_addr_arpa(A,B,C,D), IP, Timer) end; -%% ipv4 only ipv6 address -gethostbyaddr_tm({0,0,0,0,0,16#ffff,G,H},Timer) when is_integer(G+H) -> - gethostbyaddr_tm({G div 256, G rem 256, H div 256, H rem 256},Timer); gethostbyaddr_tm({A,B,C,D,E,F,G,H} = IP, Timer) when ?ip6(A,B,C,D,E,F,G,H) -> inet_db:res_update_conf(), case inet_db:gethostbyaddr(IP) of |