From e367eb44969b00cac910c8eb14e7b3ce3ee0cc91 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Mon, 19 Nov 2012 17:54:08 +0100
Subject: Exported ipv4address and ipv6address functions to inet module,
 changed and made testcases

---
 lib/kernel/src/inet.erl        | 22 +++++++++++++++++++++-
 lib/kernel/src/inet_parse.erl  | 13 ++++++++++++-
 lib/kernel/test/inet_SUITE.erl | 13 ++++++++-----
 3 files changed, 41 insertions(+), 7 deletions(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 1a03424f88..133cc523fa 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, 
+	 ipv4_address/1, ipv6_address/1, ipv4strict_address/1,
+	 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,24 @@ getservbyname(Name, Protocol) when is_atom(Name) ->
 	Error -> Error
     end.
 
+ipv4_address(Addr) ->
+    inet_parse:ipv4_address(Addr).
+
+ipv6_address(Addr) ->
+    inet_parse:ipv6_address(Addr).
+
+ipv4strict_address(Addr) ->
+    inet_parse:ipv4strict_address(Addr).
+
+ipv6strict_address(Addr) ->
+    inet_parse:ipv6strict_address(Addr).
+
+parse_address(Addr) ->
+    inet_parse:address(Addr).
+
+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 65edddcb46..98390d1dcc 100644
--- a/lib/kernel/src/inet_parse.erl
+++ b/lib/kernel/src/inet_parse.erl
@@ -37,7 +37,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]).
@@ -472,6 +472,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
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 7241b093d0..d70df1efe6 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -37,7 +37,8 @@
          gethostnative_soft_restart/0, gethostnative_soft_restart/1,
 	 gethostnative_debug_level/0, gethostnative_debug_level/1,
 	 getif/1,
-	 getif_ifr_name_overflow/1,getservbyname_overflow/1, getifaddrs/1]).
+	 getif_ifr_name_overflow/1,getservbyname_overflow/1, getifaddrs/1,
+	 parse_strict_address/1]).
 
 -export([get_hosts/1, get_ipv6_hosts/1, parse_hosts/1, parse_address/1,
 	 kill_gethost/0, parallell_gethost/0]).
@@ -52,7 +53,7 @@ all() ->
      t_gethostnative, gethostnative_parallell, cname_loop,
      gethostnative_debug_level, gethostnative_soft_restart,
      getif, getif_ifr_name_overflow, getservbyname_overflow,
-     getifaddrs].
+     getifaddrs, parse_strict_address].
 
 groups() -> 
     [{parse, [], [parse_hosts, parse_address]}].
@@ -599,14 +600,16 @@ t_parse_address(Func, []) ->
     ok;
 t_parse_address(Func, [{Addr,String}|L]) ->
     io:format("~p = ~p.~n", [Addr,String]),
-    {ok,Addr} = inet_parse:Func(String),
+    {ok,Addr} = inet:Func(String),
     t_parse_address(Func, L);
 t_parse_address(Func, [String|L]) ->
     io:format("~p.~n", [String]),
-    {error,einval} = inet_parse:Func(String),
+    {error,einval} = inet:Func(String),
     t_parse_address(Func, L).
 
-
+parse_strict_address(Config) when is_list(Config) ->
+    {ok, Ipv4} = inet:parse_strict_address("127.0.0.1"),
+    {ok, Ipv6} = inet:parse_strict_address("c11:0c22:5c33:c440:55c0:c66c:77:0088").
 
 t_gethostnative(suite) ->[];
 t_gethostnative(doc) ->[];
-- 
cgit v1.2.3