diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-05 11:15:45 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-05 11:15:45 +0200 |
| commit | 7a99d823c96d8db0504b574420c9537b3a154425 (patch) | |
| tree | 2b2b5474740cab5dc1eb2c3ee706d35d4f36701f /lib/kernel/src | |
| parent | f5acd1050a34f8195437f41d9965357eb107d804 (diff) | |
| parent | 0fad6449c7ec48aa7454880b5a1caf0f2580b33f (diff) | |
| download | otp-7a99d823c96d8db0504b574420c9537b3a154425.tar.gz otp-7a99d823c96d8db0504b574420c9537b3a154425.tar.bz2 otp-7a99d823c96d8db0504b574420c9537b3a154425.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/inet.erl | 9 | ||||
| -rw-r--r-- | lib/kernel/src/inet_parse.erl | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl index 6f65968fc2..7a516c3947 100644 --- a/lib/kernel/src/inet.erl +++ b/lib/kernel/src/inet.erl @@ -32,7 +32,7 @@ ip/1, stats/0, options/0, pushf/3, popf/1, close/1, gethostname/0, gethostname/1, parse_ipv4_address/1, parse_ipv6_address/1, parse_ipv4strict_address/1, - parse_ipv6strict_address/1, parse_address/1, parse_strict_address/1]). + parse_ipv6strict_address/1, parse_address/1, parse_strict_address/1, ntoa/1]). -export([connect_options/2, listen_options/2, udp_options/2, sctp_options/2]). @@ -529,6 +529,13 @@ getservbyname(Name, Protocol) when is_atom(Name) -> Error -> Error end. +-spec ntoa(IpAddress) -> + {ok, Address} | {error, einval} when + Address :: string(), + IpAddress :: ip_address(). +ntoa(Addr) -> + inet_parse:ntoa(Addr). + -spec parse_ipv4_address(Address) -> {ok, IPv4Address} | {error, einval} when Address :: string(), diff --git a/lib/kernel/src/inet_parse.erl b/lib/kernel/src/inet_parse.erl index d24bda0c3d..a88c94a453 100644 --- a/lib/kernel/src/inet_parse.erl +++ b/lib/kernel/src/inet_parse.erl @@ -722,7 +722,9 @@ ntoa({0,0,0,0,0,16#ffff,A,B}) -> "::FFFF:" ++ 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), []). + ntoa(tuple_to_list(T), []); +ntoa(_) -> + {error, einval}. %% Find first double zero ntoa([], R) -> |