Merge branch 'fredrik/inet/export-ip-funcs/OTP-8067'

* fredrik/inet/export-ip-funcs/OTP-8067:
  Inet doc clarifications
  Documentation changes inet
  Changes to function names, tests and docs of inet
  Added specs and doc
  Exported ipv4address and ipv6address functions to inet module, changed and made testcases

2 files changed, 57 insertions, 2 deletions

diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 92c1802a86..719dd00720 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -30,7 +30,9 @@
 	 ifget/3, ifget/2, ifset/3, ifset/2,
 	 getstat/1, getstat/2,
 	 ip/1, stats/0, options/0, 
-	 pushf/3, popf/1, close/1, gethostname/0, gethostname/1]).
+	 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]).
 
 -export([connect_options/2, listen_options/2, udp_options/2, sctp_options/2]).
 
@@ -527,6 +529,48 @@ getservbyname(Name, Protocol) when is_atom(Name) ->
 	Error -> Error
     end.
 
+-spec parse_ipv4_address(Address) ->
+	{ok, IPv4Address} | {error, einval} when
+      Address :: string(),
+      IPv4Address :: ip_address().
+parse_ipv4_address(Addr) ->
+    inet_parse:ipv4_address(Addr).
+
+-spec parse_ipv6_address(Address) ->
+	{ok, IPv6Address} | {error, einval} when
+      Address :: string(),
+      IPv6Address :: ip_address().
+parse_ipv6_address(Addr) ->
+    inet_parse:ipv6_address(Addr).
+
+-spec parse_ipv4strict_address(Address) ->
+	{ok, IPv4Address} | {error, einval} when
+      Address :: string(),
+      IPv4Address :: ip_address().
+parse_ipv4strict_address(Addr) ->
+    inet_parse:ipv4strict_address(Addr).
+
+-spec parse_ipv6strict_address(Address) ->
+	{ok, IPv6Address} | {error, einval} when
+      Address :: string(),
+      IPv6Address :: ip_address().
+parse_ipv6strict_address(Addr) ->
+    inet_parse:ipv6strict_address(Addr).
+
+-spec parse_address(Address) ->
+	{ok, IPAddress} | {error, einval} when
+      Address :: string(),
+      IPAddress :: ip_address().
+parse_address(Addr) ->
+    inet_parse:address(Addr).
+
+-spec parse_strict_address(Address) ->
+	{ok, IPAddress} | {error, einval} when
+      Address :: string(),
+      IPAddress :: ip_address().
+parse_strict_address(Addr) ->
+    inet_parse:strict_address(Addr).
+
 %% Return a list of available options
 options() ->
     [
diff --git a/lib/kernel/src/inet_parse.erl b/lib/kernel/src/inet_parse.erl
index ba62a59068..3551e701b6 100644
--- a/lib/kernel/src/inet_parse.erl
+++ b/lib/kernel/src/inet_parse.erl
@@ -36,7 +36,7 @@
 
 -export([ipv4_address/1, ipv6_address/1]).
 -export([ipv4strict_address/1, ipv6strict_address/1]).
--export([address/1]).
+-export([address/1, strict_address/1]).
 -export([visible_string/1, domain/1]).
 -export([ntoa/1, dots/1]).
 -export([split_line/1]).
@@ -456,6 +456,17 @@ address(Cs) when is_list(Cs) ->
 address(_) -> 
     {error, einval}.
 
+%%Parse ipv4 strict address or ipv6 strict address
+strict_address(Cs) when is_list(Cs) ->
+    case ipv4strict_address(Cs) of
+	{ok,IP} ->
+	    {ok,IP};
+	_ ->
+	    ipv6strict_address(Cs)
+    end;
+strict_address(Cs) ->
+    {error, einval}.
+
 %%
 %% Parse IPv4 address: 
 %%    d1.d2.d3.d4