aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2017-05-30 17:19:45 +0200
committerRaimo Niskanen <[email protected]>2017-05-31 17:00:39 +0200
commit95ebfa0b19bd4b1cac8a0eb98e775517ebb2ca6d (patch)
tree9acd9224ff4e443cf5b8b4574d9e0470eb27e03f /lib/kernel/src
parentb182febe36aa63eb8290f24ba4b7932673a9a9bc (diff)
downloadotp-95ebfa0b19bd4b1cac8a0eb98e775517ebb2ca6d.tar.gz
otp-95ebfa0b19bd4b1cac8a0eb98e775517ebb2ca6d.tar.bz2
otp-95ebfa0b19bd4b1cac8a0eb98e775517ebb2ca6d.zip
Update inet:ntoa according to modern RFCs
Diffstat (limited to 'lib/kernel/src')
-rw-r--r--lib/kernel/src/inet_parse.erl24
1 files changed, 20 insertions, 4 deletions
diff --git a/lib/kernel/src/inet_parse.erl b/lib/kernel/src/inet_parse.erl
index 0f5dc40553..f150521e92 100644
--- a/lib/kernel/src/inet_parse.erl
+++ b/lib/kernel/src/inet_parse.erl
@@ -714,7 +714,13 @@ ntoa({0,0,0,0,0,0,0,1}) -> "::1";
ntoa({0,0,0,0,0,0,A,B}) -> "::" ++ dig_to_dec(A) ++ "." ++ dig_to_dec(B);
%% IPV4 non ipv6 host address
ntoa({0,0,0,0,0,16#ffff,A,B}) ->
- "::FFFF:" ++ dig_to_dec(A) ++ "." ++ dig_to_dec(B);
+ "::ffff:" ++ dig_to_dec(A) ++ "." ++ dig_to_dec(B);
+%% RFC 2765 IPv4-translated address
+ntoa({0,0,0,0,16#ffff,0,A,B}) ->
+ "::ffff:0:" ++ dig_to_dec(A) ++ "." ++ dig_to_dec(B);
+%% RFC 6052 Well-known Prefix address
+ntoa({16#64,16#ff9b,0,0,0,0,A,B}) ->
+ "64:ff9b::" ++ dig_to_dec(A) ++ "." ++ dig_to_dec(B);
ntoa({_,_,_,_,_,_,_,_}=T) ->
%% Find longest sequence of zeros, at least 2, to replace with "::"
ntoa(tuple_to_list(T), []);
@@ -780,9 +786,19 @@ dig_to_dec(X) ->
integer_to_list((X bsr 8) band 16#ff) ++ "." ++
integer_to_list(X band 16#ff).
-%% Convert a integer to hex string
-dig_to_hex(X) ->
- erlang:integer_to_list(X, 16).
+%% Convert a integer to hex string (lowercase)
+dig_to_hex(0) -> "0";
+dig_to_hex(X) when is_integer(X), 0 < X ->
+ dig_to_hex(X, "").
+%%
+dig_to_hex(0, Acc) -> Acc;
+dig_to_hex(X, Acc) ->
+ dig_to_hex(
+ X bsr 4,
+ [case X band 15 of
+ D when D < 10 -> D + $0;
+ D -> D - 10 + $a
+ end|Acc]).
%%
%% Count number of '.' in a name