inets httpd: Handle ipfamily option correctly when listning to port 0

Conflicts:

	lib/inets/src/http_lib/http_transport.erl

5 files changed, 66 insertions, 109 deletions

diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl
index 1692dcad78..6ac95a9572 100644
--- a/lib/inets/src/http_lib/http_transport.erl
+++ b/lib/inets/src/http_lib/http_transport.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -23,7 +23,7 @@
 -export([
 	 start/1, 
 	 connect/3, connect/4, 
-	 listen/2, listen/3, listen/4, 
+	 listen/4, listen/5,
 	 accept/2, accept/3, 
 	 close/2,
 	 send/3, 
@@ -155,21 +155,25 @@ connect({essl, SslConfig}, {Host, Port}, Opts0, Timeout) ->
 %% reason for this to enable a HTTP-server not running as root to use
 %% port 80.
 %%-------------------------------------------------------------------------
-listen(SocketType, Port) ->
-    listen(SocketType, undefined, Port).
+listen(ip_comm = _SocketType, Addr, Port, Fd, IpFamily) ->
+    listen_ip_comm(Addr, Port, Fd, IpFamily);
 
-listen(ip_comm = _SocketType, Addr, Port) ->
-    listen_ip_comm(Addr, Port, undefined);
+listen({essl, SSLConfig}, Addr, Port, Fd, IpFamily) ->
+    listen_ssl(Addr, Port, Fd, SSLConfig, IpFamily).
+
+listen(ip_comm = _SocketType, Addr, Port, IpFamily) ->
+    listen_ip_comm(Addr, Port, undefined, IpFamily);
 
 %% Wrapper for backaward compatibillity
-listen({ssl, SSLConfig}, Addr, Port) ->
+listen({ssl, SSLConfig}, Addr, Port, IpFamily) ->
     ?hlrt("listen (wrapper)", 
 	  [{addr,       Addr}, 
 	   {port,       Port}, 
 	   {ssl_config, SSLConfig}]),
-    listen({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Addr, Port);
+    listen({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Addr, Port, IpFamily);
+
 
-listen({essl, SSLConfig}, Addr, Port) ->
+listen({essl, SSLConfig}, Addr, Port, IpFamily) ->
     ?hlrt("listen (essl)", 
 	  [{addr,       Addr}, 
 	   {port,       Port}, 
@@ -180,24 +184,18 @@ listen({essl, SSLConfig}, Addr, Port) ->
 		    LogAlert ->
 			{proplists:delete(log_alert, SSLConfig), [{log_alert, LogAlert}]}
 		end,
-    listen_ssl(Addr, Port, [{ssl_imp, new}, {reuseaddr, true} | SSLConfig2], ExtraOpts).
-
+    listen_ssl(Addr, Port, undefined, SSLConfig2, IpFamily, ExtraOpts).
 
-listen(ip_comm, Addr, Port, Fd) ->
-    listen_ip_comm(Addr, Port, Fd);
-listen({_, SSLConfig}, Addr, Port, _Fd) ->
-    listen_ssl(Addr, Port, SSLConfig).
-
-listen_ip_comm(Addr, Port, Fd) ->
-    case (catch do_listen_ip_comm(Addr, Port, Fd)) of
+listen_ip_comm(Addr, Port, Fd, IpFamily) ->
+    case (catch do_listen_ip_comm(Addr, Port, Fd, IpFamily)) of
 	{'EXIT', Reason} ->
 	    {error, {exit, Reason}};
 	Else ->
 	    Else
     end.
 
-do_listen_ip_comm(Addr, Port, Fd) ->
-    {NewPort, Opts, IpFamily} = get_socket_info(Addr, Port, Fd),
+do_listen_ip_comm(Addr, Port, Fd, IpFamily) ->
+    {NewPort, Opts} = get_socket_info(Addr, Port, Fd),
     case IpFamily of
 	inet6fb4 -> 
 	    Opts2 = [inet6 | Opts], 
@@ -229,11 +227,9 @@ do_listen_ip_comm(Addr, Port, Fd) ->
 	    gen_tcp:listen(NewPort, Opts2)
     end.
 
-
-listen_ssl(Addr, Port, Opts0, ExtraOpts) ->
-    IpFamily = ipfamily_default(Addr, Port), 
-    BaseOpts = [{backlog, 128}, {reuseaddr, true} | Opts0], 
-    Opts     = sock_opts(Addr, BaseOpts),
+listen_ssl(Addr, Port, Fd, Opts0, IpFamily, ExtraOpts) ->
+    {NewPort, SockOpt} = get_socket_info(Addr, Port, Fd),
+    Opts = SockOpt ++ Opts0,
     case IpFamily of
 	inet6fb4 -> 
 	    Opts2 = [inet6 | Opts] ++ ExtraOpts, 
@@ -244,13 +240,13 @@ listen_ssl(Addr, Port, Opts0, ExtraOpts) ->
 		    Opts3 = [inet | Opts] ++ ExtraOpts, 
 		    ?hlrt("ipv6 listen failed - try ipv4 instead", 
 			  [{reason, Reason}, {opts, Opts3}]),
-		    ssl:listen(Port, Opts3);
+		    ssl:listen(NewPort, Opts3);
 		
 		{'EXIT', Reason} -> 
 		    Opts3 = [inet | Opts] ++ ExtraOpts, 
 		    ?hlrt("ipv6 listen exit - try ipv4 instead", 
 			  [{reason, Reason}, {opts, Opts3}]),
-		    ssl:listen(Port, Opts3); 
+		    ssl:listen(NewPort, Opts3);
 		
 		Other ->
 		    ?hlrt("ipv6 listen done", [{other, Other}]),
@@ -260,61 +256,19 @@ listen_ssl(Addr, Port, Opts0, ExtraOpts) ->
 	_ ->
 	    Opts2 = [IpFamily | Opts],
 	    ?hlrt("listen", [{opts, Opts2}]),
-	    ssl:listen(Port, Opts2 ++ ExtraOpts)
+	    ssl:listen(NewPort, Opts2 ++ ExtraOpts)
     end.
 
-
-ipfamily_default(Addr, Port) ->
-    httpd_conf:lookup(Addr, Port, ipfamily, inet6fb4).
-
-get_socket_info(Addr, Port, Fd0) ->
+get_socket_info(Addr, Port, Fd) ->
     BaseOpts        = [{backlog, 128}, {reuseaddr, true}], 
-    IpFamilyDefault = ipfamily_default(Addr, Port), 
     %% The presence of a file descriptor takes precedence
-    case get_fd(Port, Fd0, IpFamilyDefault) of
-	{Fd, IpFamily} -> 
-	    {0, sock_opts(Addr, [{fd, Fd} | BaseOpts]), IpFamily};
+    case Fd of
 	undefined ->
-	    {Port, sock_opts(Addr, BaseOpts), IpFamilyDefault}
+	    {Port, sock_opts(Addr, BaseOpts)};
+	Fd ->
+	    {0, sock_opts(Addr, [{fd, Fd} | BaseOpts])}
     end.
 	    
-get_fd(Port, undefined = _Fd, IpFamilyDefault) ->
-    FdKey = list_to_atom("httpd_" ++ integer_to_list(Port)),
-    case init:get_argument(FdKey) of
-	{ok, [[Value]]} ->
-	    case string:tokens(Value, [$|]) of
-		[FdStr, IpFamilyStr] ->
-		    {fd_of(FdStr), ip_family_of(IpFamilyStr)};
-		[FdStr] ->
-		    {fd_of(FdStr), IpFamilyDefault};
-		_ ->
-		    throw({error, {bad_descriptor, Value}})
-	    end;
-	error ->
-	    undefined
-    end;
-get_fd(_Port, Fd, IpFamilyDefault) ->
-    {Fd, IpFamilyDefault}.
-
-    
-fd_of(FdStr) ->
-    case (catch list_to_integer(FdStr)) of
-	Fd when is_integer(Fd) ->
-	    Fd;
-	_ ->
-	    throw({error, {bad_descriptor, FdStr}})
-    end.
-
-ip_family_of(IpFamilyStr) ->
-    IpFamily = list_to_atom(IpFamilyStr),
-    case lists:member(IpFamily, [inet, inet6, inet6fb4]) of
-	true ->
-	    IpFamily;
-	false ->
-	    throw({error, {bad_ipfamily, IpFamilyStr}})
-    end.
-
-
 %%-------------------------------------------------------------------------
 %% accept(SocketType, ListenSocket) -> {ok, Socket} | {error, Reason}
 %% accept(SocketType, ListenSocket, Timeout) -> ok | {error, Reason}
diff --git a/lib/inets/src/http_server/httpd_acceptor.erl b/lib/inets/src/http_server/httpd_acceptor.erl
index 08ee9ee0d0..e79dfce0cb 100644
--- a/lib/inets/src/http_server/httpd_acceptor.erl
+++ b/lib/inets/src/http_server/httpd_acceptor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -24,10 +24,10 @@
 -include("inets_internal.hrl").
 
 %% Internal application API
--export([start_link/5, start_link/6]).
+-export([start_link/6, start_link/7]).
 
 %% Other exports (for spawn's etc.)
--export([acceptor_init/6, acceptor_init/7, acceptor_loop/5]).
+-export([acceptor_init/7, acceptor_init/8, acceptor_loop/6]).
 
 %%
 %% External API
@@ -35,27 +35,27 @@
 
 %% start_link
 
-start_link(Manager, SocketType, Addr, Port, ConfigDb, AcceptTimeout) ->
+start_link(Manager, SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout) ->
     ?hdrd("start link", 
 	  [{manager, Manager}, 
 	   {socket_type, SocketType}, 
 	   {address, Addr}, 
 	   {port, Port}, 
 	   {timeout, AcceptTimeout}]),
-    Args = [self(), Manager, SocketType, Addr, Port, ConfigDb, AcceptTimeout],
+    Args = [self(), Manager, SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout],
     proc_lib:start_link(?MODULE, acceptor_init, Args).
 
-start_link(Manager, SocketType, ListenSocket, ConfigDb, AcceptTimeout) ->
+start_link(Manager, SocketType, ListenSocket, IpFamily, ConfigDb, AcceptTimeout) ->
     ?hdrd("start link", 
 	  [{manager, Manager}, 
 	   {socket_type, SocketType}, 
 	   {listen_socket, ListenSocket}, 
 	   {timeout, AcceptTimeout}]),
-    Args = [self(), Manager, SocketType, ListenSocket, 
+    Args = [self(), Manager, SocketType, ListenSocket, IpFamily,
 	    ConfigDb, AcceptTimeout],
     proc_lib:start_link(?MODULE, acceptor_init, Args).
 
-acceptor_init(Parent, Manager, SocketType, {ListenOwner, ListenSocket}, 
+acceptor_init(Parent, Manager, SocketType, {ListenOwner, ListenSocket}, IpFamily,
 	      ConfigDb, AcceptTimeout) ->
     ?hdrd("acceptor init", 
 	  [{parent, Parent}, 
@@ -66,9 +66,9 @@ acceptor_init(Parent, Manager, SocketType, {ListenOwner, ListenSocket},
 	   {timeout, AcceptTimeout}]),
     link(ListenOwner),
     proc_lib:init_ack(Parent, {ok, self()}),
-    acceptor_loop(Manager, SocketType, ListenSocket, ConfigDb, AcceptTimeout).
+    acceptor_loop(Manager, SocketType, ListenSocket, IpFamily, ConfigDb, AcceptTimeout).
 
-acceptor_init(Parent, Manager, SocketType, Addr, Port, 
+acceptor_init(Parent, Manager, SocketType, Addr, Port, IpFamily,
 	      ConfigDb, AcceptTimeout) ->
     ?hdrd("acceptor init", 
 	  [{parent, Parent}, 
@@ -77,20 +77,20 @@ acceptor_init(Parent, Manager, SocketType, Addr, Port,
 	   {address, Addr}, 
 	   {port, Port}, 
 	   {timeout, AcceptTimeout}]),
-    case (catch do_init(SocketType, Addr, Port)) of
+    case (catch do_init(SocketType, Addr, Port, IpFamily)) of
 	{ok, ListenSocket} ->
 	    proc_lib:init_ack(Parent, {ok, self()}),
 	    acceptor_loop(Manager, SocketType, 
-			  ListenSocket, ConfigDb, AcceptTimeout);
+			  ListenSocket, IpFamily,ConfigDb, AcceptTimeout);
 	Error ->
 	    proc_lib:init_ack(Parent, Error),
 	    error
     end.
    
-do_init(SocketType, Addr, Port) ->
+do_init(SocketType, Addr, Port, IpFamily) ->
     ?hdrt("do init", []),
     do_socket_start(SocketType),
-    ListenSocket = do_socket_listen(SocketType, Addr, Port),
+    ListenSocket = do_socket_listen(SocketType, Addr, Port, IpFamily),
     {ok, ListenSocket}.
 
 
@@ -105,9 +105,9 @@ do_socket_start(SocketType) ->
     end.
 
 
-do_socket_listen(SocketType, Addr, Port) ->
+do_socket_listen(SocketType, Addr, Port, IpFamily) ->
     ?hdrt("do socket listen", []),
-    case http_transport:listen(SocketType, Addr, Port) of
+    case http_transport:listen(SocketType, Addr, Port, IpFamily) of
 	{ok, ListenSocket} ->
 	    ListenSocket;
 	{error, Reason} ->
@@ -121,7 +121,7 @@ do_socket_listen(SocketType, Addr, Port) ->
 
 %% acceptor 
 
-acceptor_loop(Manager, SocketType, ListenSocket, ConfigDb, AcceptTimeout) ->
+acceptor_loop(Manager, SocketType, ListenSocket, IpFamily, ConfigDb, AcceptTimeout) ->
     ?hdrd("awaiting accept", 
 	  [{manager, Manager}, 
 	   {socket_type, SocketType}, 
@@ -133,12 +133,12 @@ acceptor_loop(Manager, SocketType, ListenSocket, ConfigDb, AcceptTimeout) ->
 	    handle_connection(Manager, ConfigDb, AcceptTimeout, 
 			      SocketType, Socket),
 	    ?MODULE:acceptor_loop(Manager, SocketType, 
-				  ListenSocket, ConfigDb,AcceptTimeout);
+				  ListenSocket, IpFamily, ConfigDb,AcceptTimeout);
 	{error, Reason} ->
 	    ?hdri("accept failed", [{reason, Reason}]),
 	    handle_error(Reason, ConfigDb),
 	    ?MODULE:acceptor_loop(Manager, SocketType, ListenSocket, 
-				  ConfigDb, AcceptTimeout);
+				  IpFamily, ConfigDb, AcceptTimeout);
 	{'EXIT', Reason} ->
 	    ?hdri("accept exited", [{reason, Reason}]),
 	    ReasonString = 
diff --git a/lib/inets/src/http_server/httpd_acceptor_sup.erl b/lib/inets/src/http_server/httpd_acceptor_sup.erl
index 8b1e4b6c4f..0cae8dbe47 100644
--- a/lib/inets/src/http_server/httpd_acceptor_sup.erl
+++ b/lib/inets/src/http_server/httpd_acceptor_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -27,7 +27,7 @@
 -behaviour(supervisor).
 
 %% API
--export([start_link/2, start_acceptor/5, start_acceptor/6, stop_acceptor/2]).
+-export([start_link/2, start_acceptor/6, start_acceptor/7, stop_acceptor/2]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -43,11 +43,11 @@ start_link(Addr, Port) ->
 %% Function: [start|stop]_acceptor/5
 %% Description: Starts/stops an [auth | security] worker (child) process
 %%----------------------------------------------------------------------
-start_acceptor(SocketType, Addr, Port, ConfigDb, AcceptTimeout) ->
-    start_worker(httpd_acceptor, SocketType, Addr, Port,
+start_acceptor(SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout) ->
+    start_worker(httpd_acceptor, SocketType, Addr, Port, IpFamily,
 		 ConfigDb, AcceptTimeout, self(), []).
-start_acceptor(SocketType, Addr, Port, ConfigDb, AcceptTimeout, ListenSocket) ->
-    start_worker(httpd_acceptor, SocketType, Addr, Port,
+start_acceptor(SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout, ListenSocket) ->
+    start_worker(httpd_acceptor, SocketType, Addr, Port, IpFamily,
 		 ConfigDb, AcceptTimeout, ListenSocket, self(), []).
 
 
@@ -69,18 +69,18 @@ init(_) ->
 make_name(Addr,Port) ->
     httpd_util:make_name("httpd_acc_sup", Addr, Port).
 
-start_worker(M, SocketType, Addr, Port, ConfigDB, AcceptTimeout, Manager, Modules) ->
+start_worker(M, SocketType, Addr, Port, IpFamily, ConfigDB, AcceptTimeout, Manager, Modules) ->
     SupName = make_name(Addr, Port),
-    Args    = [Manager, SocketType, Addr, Port, ConfigDB, AcceptTimeout],
+    Args    = [Manager, SocketType, Addr, Port, IpFamily, ConfigDB, AcceptTimeout],
     Spec    = {{M, Addr, Port},
 	       {M, start_link, Args}, 
 	       permanent, timer:seconds(1), worker, [M] ++ Modules},
     supervisor:start_child(SupName, Spec).
 
-start_worker(M, SocketType, Addr, Port, ConfigDB, AcceptTimeout, ListenSocket,
+start_worker(M, SocketType, Addr, Port, IpFamily, ConfigDB, AcceptTimeout, ListenSocket,
 	     Manager, Modules) ->
     SupName = make_name(Addr, Port),
-    Args    = [Manager, SocketType, ListenSocket, ConfigDB, AcceptTimeout],
+    Args    = [Manager, SocketType, ListenSocket, IpFamily, ConfigDB, AcceptTimeout],
     Spec    = {{M, Addr, Port},
 	       {M, start_link, Args}, 
 	       permanent, timer:seconds(1), worker, [M] ++ Modules},
diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl
index 7bafc3f7f3..524e579ec0 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -264,11 +264,12 @@ init([ConfigFile, ConfigList, AcceptTimeout, Addr, Port, ListenInfo]) ->
     end.
 
 do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port) ->
+    IpFamily = proplists:get_value(ipfamily, ConfigList, inet6fb4),
     NewConfigFile = proplists:get_value(file, ConfigList, ConfigFile),
     ConfigDB      = do_initial_store(ConfigList),
     SocketType    = httpd_conf:lookup_socket_type(ConfigDB),
     case httpd_acceptor_sup:start_acceptor(SocketType, Addr,
-					   Port, ConfigDB, AcceptTimeout) of
+					   Port, IpFamily, ConfigDB, AcceptTimeout) of
 	{ok, _Pid} ->
 	    Status = [{max_conn,        0}, 
 		      {last_heavy_load, never}, 
@@ -284,11 +285,12 @@ do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port) ->
     end.
 
 do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port, ListenInfo) ->
+    IpFamily = proplists:get_value(ipfamily, ConfigList, inet6fb4),
     NewConfigFile = proplists:get_value(file, ConfigList, ConfigFile),
     ConfigDB   = do_initial_store(ConfigList),
     SocketType = httpd_conf:lookup_socket_type(ConfigDB),
     case httpd_acceptor_sup:start_acceptor(SocketType, Addr,
-					   Port, ConfigDB, 
+					   Port, IpFamily, ConfigDB,
 					   AcceptTimeout, ListenInfo) of
 	{ok, _Pid} ->
 	    Status = [{max_conn,0}, {last_heavy_load,never}, 
diff --git a/lib/inets/src/http_server/httpd_sup.erl b/lib/inets/src/http_server/httpd_sup.erl
index 4be298939f..da641cf533 100644
--- a/lib/inets/src/http_server/httpd_sup.erl
+++ b/lib/inets/src/http_server/httpd_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -248,7 +248,8 @@ listen(Address, Port, Config)  ->
 	    case http_transport:start(SocketType) of
 		ok ->
 		    Fd = proplists:get_value(fd, Config),
-		    case http_transport:listen(SocketType, Address, Port, Fd) of
+		    IpFamily =  proplists:get_value(ipfamily, Config, inet6fb4),
+		    case http_transport:listen(SocketType, Address, Port, Fd, IpFamily) of
 			{ok, ListenSocket} ->
 			    NewConfig = proplists:delete(port, Config),
 			    {NewPort, _} = http_transport:sockname(SocketType, ListenSocket),