Merge branch 'maint'

4 files changed, 23 insertions, 7 deletions

diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 119d7d8df9..4a3796a15b 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -76,11 +76,11 @@ FFFF::192.168.42.2
                 {16#3ffe,16#b80,16#1f8d,16#2,16#204,16#acff,16#fe17,16#bf38}
 fe80::204:acff:fe17:bf38
                 {16#fe80,0,0,0,0,16#204,16#acff,16#fe17,16#bf38}</code>
-    <p>A function that may be useful is <c>inet_parse:address/1</c>:</p>
+    <p>A function that may be useful is <seealso marker="#parse_address/1">parse_address/1</seealso>:</p>
     <pre>
-1> <input>inet_parse:address("192.168.42.2").</input>
+1> <input>inet:parse_address("192.168.42.2").</input>
 {ok,{192,168,42,2}}
-2> <input>inet_parse:address("FFFF::192.168.42.2").</input>
+2> <input>inet:parse_address("FFFF::192.168.42.2").</input>
 {ok,{65535,0,0,0,0,0,49320,10754}}</pre>
   </description>
 
@@ -375,6 +375,13 @@ fe80::204:acff:fe17:bf38
       </desc>
     </func>
     <func>
+      <name name="ntoa" arity="1" />
+      <fsummary>Convert IPv6 / IPV4 adress to ascii</fsummary>
+      <desc>
+	<p>Parses an <a href="#type-ip_address">ip_address()</a> and returns an IPv4 or IPv6 address string.</p>
+      </desc>
+    </func>
+    <func>
       <name name="parse_ipv4_address" arity="1" />
       <fsummary>Parse an IPv4 address</fsummary>
       <desc>
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) ->
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 62ba95e1a3..46c8c0b88b 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -226,7 +226,7 @@ t_gethostbyname_v6(Config) when is_list(Config) ->
 			     h_addr_list = [IP4]} = HEnt4,
 		    {ok,IP46} =
 			inet_parse:ipv6_address(
-			  "::ffff:" ++ inet_parse:ntoa(IP4)),
+			  "::ffff:" ++ inet:ntoa(IP4)),
 		    check_elems(
 		      [{HEnt#hostent.h_name,[Name,FullName]}])
 	    end,
@@ -246,7 +246,7 @@ t_gethostbyname_v6(Config) when is_list(Config) ->
 			     h_addr_list = [IP4F]} = HEnt4F,
 		    {ok,IP46F} =
 			inet_parse:ipv6_address(
-			  "::ffff:" ++ inet_parse:ntoa(IP4F)),
+			  "::ffff:" ++ inet:ntoa(IP4F)),
 		    check_elems(
 		      [{HEntF#hostent.h_name,[Name,FullName]}])
 	    end;