inets: httpd - Add possibility to specify socket options for HTTP

Was already possible for HTTPS. Also remove use of legacy option
inet6fb4. IPv6 standard moved away from beeing able to fallback to IPv4
so this option makes little sense, will use inet (Ipv4) as default instead of
inet6fb4.

4 files changed, 94 insertions, 139 deletions

diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl
index 484e07cd84..e3d7382043 100644
--- a/lib/inets/src/http_lib/http_transport.erl
+++ b/lib/inets/src/http_lib/http_transport.erl
@@ -53,7 +53,8 @@
 %%-------------------------------------------------------------------------
 start(ip_comm) ->
     do_start_ip_comm();
-
+start({ip_comm, _}) ->
+    do_start_ip_comm();
 %% This is just for backward compatibillity
 start({ssl, _}) ->
     do_start_ssl();
@@ -97,10 +98,8 @@ do_start_ssl() ->
 
 connect(SocketType, Address, Opts) ->
     connect(SocketType, Address, Opts, infinity).
-
-connect(ip_comm = _SocketType, {Host, Port}, Opts0, Timeout) 
-  when is_list(Opts0) ->
-    Opts = [binary, {packet, 0}, {active, false}, {reuseaddr, true} | Opts0],
+connect(ip_comm, {Host, Port}, Opts0, Timeout) ->
+    Opts = [binary, {packet, 0}, {active, false}, {reuseaddr, true} | Opts0 ],
     try gen_tcp:connect(Host, Port, Opts, Timeout) of
 	{ok, _} = OK ->
 	    OK;
@@ -168,83 +167,30 @@ listen({essl, SSLConfig}, Addr, Port, IpFamily) ->
 		end,
     listen_ssl(Addr, Port, undefined, SSLConfig2, IpFamily, ExtraOpts).
 
-listen_ip_comm(Addr, Port, Fd, IpFamily) ->
-    case (catch do_listen_ip_comm(Addr, Port, Fd, IpFamily)) of
+listen_ip_comm(Addr, Port, SockOpts, Fd, IpFamily) ->
+    case (catch do_listen_ip_comm(Addr, Port, SockOpts, Fd, IpFamily)) of
 	{'EXIT', Reason} ->
 	    {error, {exit, Reason}};
 	Else ->
 	    Else
     end.
 
-do_listen_ip_comm(Addr, Port, Fd, IpFamily) ->
-    {NewPort, Opts} = get_socket_info(Addr, Port, Fd),
-    case IpFamily of
-	inet6fb4 -> 
-	    Opts2 = [inet6 | Opts], 
-	    ?hlrt("try ipv6 listen", [{port, NewPort}, {opts, Opts2}]),
-	    case (catch gen_tcp:listen(NewPort, Opts2)) of
-		{error, Reason} when ((Reason =:= nxdomain) orelse 
-				      (Reason =:= eafnosupport)) ->
-		    Opts3 = [inet | Opts], 
-		    ?hlrt("ipv6 listen failed - try ipv4 instead", 
-			  [{reason, Reason}, {port, NewPort}, {opts, Opts3}]),
-		    gen_tcp:listen(NewPort, Opts3);
-
-		%% This is when a given hostname has resolved to a 
-		%% IPv4-address. The inet6-option together with a 
-		%% {ip, IPv4} option results in badarg
-		{'EXIT', Reason} -> 
-		    Opts3 = [inet | Opts], 
-		    ?hlrt("ipv6 listen exit - try ipv4 instead", 
-			  [{reason, Reason}, {port, NewPort}, {opts, Opts3}]),
-		    gen_tcp:listen(NewPort, Opts3); 
-
-		Other ->
-		    ?hlrt("ipv6 listen done", [{other, Other}]),
-		    Other
-	    end;
-	_ ->
-	    Opts2 = [IpFamily | Opts],
-	    ?hlrt("listen", [{port, NewPort}, {opts, Opts2}]),
-	    gen_tcp:listen(NewPort, Opts2)
-    end.
+do_listen_ip_comm(Addr, Port, SockOpts, Fd, IpFamily) ->
+    Backlog = proplists:get_value(backlog, SockOpts, 128),
+    {NewPort, Opts} = get_socket_info(Addr, Port, Fd,
+				      [{backlog, Backlog}, {reuseaddr, true} | SockOpts]),
+    Opts2 = [IpFamily | Opts],
+    gen_tcp:listen(NewPort, Opts2).
 
 listen_ssl(Addr, Port, Fd, Opts0, IpFamily, ExtraOpts) ->
-    {NewPort, SockOpt} = get_socket_info(Addr, Port, Fd),
+    Backlog = proplists:get_value(backlog, Opts0, 128),
+    {NewPort, SockOpt} = get_socket_info(Addr, Port, Fd, 
+					 [{backlog, Backlog}, {reuseaddr, true}]),
     Opts = SockOpt ++ Opts0,
-    case IpFamily of
-	inet6fb4 -> 
-	    Opts2 = [inet6 | Opts] ++ ExtraOpts, 
-	    ?hlrt("try ipv6 listen", [{opts, Opts2}]),
-	    case (catch ssl:listen(Port, Opts2)) of
-		{error, Reason} when ((Reason =:= nxdomain) orelse 
-				      (Reason =:= eafnosupport)) ->
-		    Opts3 = [inet | Opts] ++ ExtraOpts, 
-		    ?hlrt("ipv6 listen failed - try ipv4 instead", 
-			  [{reason, Reason}, {opts, Opts3}]),
-		    ssl:listen(NewPort, Opts3);
-		
-		{'EXIT', Reason} -> 
-		    Opts3 = [inet | Opts] ++ ExtraOpts, 
-		    ?hlrt("ipv6 listen exit - try ipv4 instead", 
-			  [{reason, Reason}, {opts, Opts3}]),
-		    ssl:listen(NewPort, Opts3); 
-		
-		Other ->
-		    ?hlrt("ipv6 listen done", [{other, Other}]),
-		    Other
-	    end;
-	
-	_ ->
-	    Opts2 = [IpFamily | Opts],
-	    ?hlrt("listen", [{opts, Opts2}]),
-	    ssl:listen(NewPort, Opts2 ++ ExtraOpts)
-    end.
+    Opts2 = [IpFamily | Opts],
+    ssl:listen(NewPort, Opts2 ++ ExtraOpts).
 
-
-
-get_socket_info(Addr, Port, Fd) ->
-    BaseOpts        = [{backlog, 128}, {reuseaddr, true}], 
+get_socket_info(Addr, Port, Fd, BaseOpts) ->
     %% The presence of a file descriptor takes precedence
     case Fd of
 	undefined ->
@@ -269,6 +215,8 @@ accept(SocketType, ListenSocket) ->
 
 accept(ip_comm, ListenSocket, Timeout) ->
     gen_tcp:accept(ListenSocket, Timeout);
+accept({ip_comm, _}, ListenSocket, Timeout) ->
+    gen_tcp:accept(ListenSocket, Timeout);
 
 %% Wrapper for backaward compatibillity
 accept({ssl, SSLConfig}, ListenSocket, Timeout) ->
@@ -288,6 +236,8 @@ accept({essl, _SSLConfig}, ListenSocket, Timeout) ->
 %%-------------------------------------------------------------------------
 controlling_process(ip_comm, Socket, NewOwner) ->
     gen_tcp:controlling_process(Socket, NewOwner);
+controlling_process({ip_comm, _}, Socket, NewOwner) ->
+    gen_tcp:controlling_process(Socket, NewOwner);
 
 %% Wrapper for backaward compatibillity
 controlling_process({ssl, SSLConfig}, Socket, NewOwner) ->
@@ -307,16 +257,15 @@ controlling_process({essl, _}, Socket, NewOwner) ->
 %%-------------------------------------------------------------------------
 setopts(ip_comm, Socket, Options) ->
     inet:setopts(Socket, Options);
+setopts({ip_comm, _}, Socket, Options) ->
+    inet:setopts(Socket, Options);
 
 %% Wrapper for backaward compatibillity
 setopts({ssl, SSLConfig}, Socket, Options) ->
     setopts({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, Options);
 
 setopts({essl, _}, Socket, Options) ->
-    ?hlrt("[e]ssl setopts", [{socket, Socket}, {options, Options}]),
-    Reason = (catch ssl:setopts(Socket, Options)),
-    ?hlrt("[e]ssl setopts result", [{reason, Reason}]),
-    Reason.
+    (catch ssl:setopts(Socket, Options)).
 
 
 %%-------------------------------------------------------------------------
@@ -330,6 +279,9 @@ getopts(SocketType, Socket) ->
     Opts = [packet, packet_size, recbuf, sndbuf, priority, tos, send_timeout], 
     getopts(SocketType, Socket, Opts).
 
+getopts({ip_comm, _}, Socket, Options) ->
+    getopts(ip_comm, Socket, Options);
+
 getopts(ip_comm, Socket, Options) ->
     case inet:getopts(Socket, Options) of
 	{ok, SocketOpts} ->
@@ -386,6 +338,8 @@ getstat({essl, _} = _SocketType, _Socket) ->
 %%-------------------------------------------------------------------------
 send(ip_comm, Socket, Message) ->
     gen_tcp:send(Socket, Message);
+send({ip_comm, _}, Socket, Message) ->
+    gen_tcp:send(Socket, Message);
 
 %% Wrapper for backaward compatibillity
 send({ssl, SSLConfig}, Socket, Message) ->
@@ -394,7 +348,6 @@ send({ssl, SSLConfig}, Socket, Message) ->
 send({essl, _}, Socket, Message) ->
     ssl:send(Socket, Message).
 
-
 %%-------------------------------------------------------------------------
 %% close(SocketType, Socket) -> ok | {error, Reason}
 %%     SocketType = ip_comm | {ssl, _}
@@ -404,6 +357,8 @@ send({essl, _}, Socket, Message) ->
 %%-------------------------------------------------------------------------
 close(ip_comm, Socket) ->
     gen_tcp:close(Socket);
+close({ip_comm, []}, Socket) ->
+    gen_tcp:close(Socket);
 
 %% Wrapper for backaward compatibillity
 close({ssl, SSLConfig}, Socket) ->
@@ -425,6 +380,8 @@ close({essl, _}, Socket) ->
 %%-------------------------------------------------------------------------
 peername(ip_comm, Socket) ->
     do_peername(inet:peername(Socket));
+peername({ip_comm, _}, Socket) ->
+    do_peername(inet:peername(Socket));
 
 %% Wrapper for backaward compatibillity
 peername({ssl, SSLConfig}, Socket) ->
@@ -457,7 +414,8 @@ do_peername({error, _}) ->
 %%-------------------------------------------------------------------------
 sockname(ip_comm, Socket) ->
     do_sockname(inet:sockname(Socket));
-
+sockname({ip_comm, _}, Socket) ->
+    do_sockname(inet:sockname(Socket));
 %% Wrapper for backaward compatibillity
 sockname({ssl, SSLConfig}, Socket) ->
     sockname({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket);
@@ -533,6 +491,8 @@ sock_opts(Opts) ->
 %% -- negotiate --
 negotiate(ip_comm,_,_) ->
     ok;
+negotiate({ip_comm, _},_,_) ->
+    ok;
 negotiate({ssl, SSLConfig}, Socket, Timeout) ->
     negotiate({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, Timeout);
 negotiate({essl, _}, Socket, Timeout) ->
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index 7d31989244..62e8a95b19 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -156,7 +156,7 @@ load("BindAddress " ++ Address0, []) ->
 		case string:tokens(Address0, [$|]) of
 		    [Address1] ->
 			?hdrv("load BindAddress", [{address1, Address1}]),
-			{clean_address(Address1), inet6fb4};
+			{clean_address(Address1), inet};
 		    [Address1, IpFamilyStr] ->
 			?hdrv("load BindAddress", 
 			      [{address1, Address1}, 
@@ -353,14 +353,21 @@ clean_address(Addr) ->
 
 
 make_ipfamily(IpFamilyStr) ->
-    IpFamily = list_to_atom(IpFamilyStr),
-    case lists:member(IpFamily, [inet, inet6, inet6fb4]) of
-	true ->
-	    IpFamily;
-	false ->
-	    throw({error, {bad_ipfamily, IpFamilyStr}})
-    end.
-
+    validate_ipfamily(list_to_atom(IpFamilyStr)).
+    
+validate_ipfamily(inet) ->
+    inet;
+validate_ipfamily(inet6) ->
+    inet6;
+%% Backwards compatibility wrapper, 
+%% fallback to the default, IPV4,
+%% as it will most proably work.
+%% IPv6 standard moved away from 
+%% beeing able to fallback to ipv4
+validate_ipfamily(inet6fb4) ->
+    inet;
+validate_ipfamily(IpFamilyStr) ->
+    throw({error, {bad_ipfamily, IpFamilyStr}}).
 
 %%
 %% load_mime_types/1 -> {ok, MimeTypes} | {error, Reason}
@@ -393,20 +400,16 @@ validate_properties2(Properties) ->
 	undefined ->
 	    case proplists:get_value(sock_type, Properties, ip_comm) of
 		ip_comm ->
-		    case proplists:get_value(ipfamily, Properties) of
-			undefined ->
-			    [{bind_address, any}, 
-			     {ipfamily, inet6fb4} | Properties];
-			_ ->
-			    [{bind_address, any} | Properties]
-		    end;
+		   add_inet_defaults(Properties);
+		{ip_comm, _} ->
+		    add_inet_defaults(Properties);
 		_ ->
 		    [{bind_address, any} | Properties]
 	    end;
 	any ->
 	    Properties;
 	Address0 ->
-	    IpFamily = proplists:get_value(ipfamily, Properties, inet6fb4),
+	    IpFamily = proplists:get_value(ipfamily, Properties, inet),
 	    case httpd_util:ip_address(Address0, IpFamily) of
 		{ok, Address} ->
 		    Properties1 = proplists:delete(bind_address, Properties),
@@ -418,6 +421,16 @@ validate_properties2(Properties) ->
 		    throw(Error)
 	    end
     end.
+
+add_inet_defaults(Properties) ->
+    case proplists:get_value(ipfamily, Properties) of
+	undefined ->
+	    [{bind_address, any}, 
+	     {ipfamily, inet} | Properties];
+	_ ->
+	    [{bind_address, any} | Properties]
+    end.
+
 check_minimum_bytes_per_second(Properties) ->
     case proplists:get_value(minimum_bytes_per_second, Properties, false) of
 	false ->
@@ -487,12 +500,11 @@ validate_config_params([{server_tokens, Value} | _]) ->
 validate_config_params([{socket_type, ip_comm} | Rest]) ->
     validate_config_params(Rest);
 
-validate_config_params([{socket_type, Value} | Rest]) 
-  when Value == ssl; Value == essl ->
-    validate_config_params(Rest);
-
-validate_config_params([{socket_type, {Value, _}} | Rest])
-  when Value == essl orelse Value == ssl ->
+validate_config_params([{socket_type, {Value, Opts}} | Rest]) when Value == ip_comm; 
+								   Value == ssl; 
+								   Value == essl ->
+    %% Make sure not to set socket values used internaly
+    validate_config_params(Opts), 
     validate_config_params(Rest);
 
 validate_config_params([{socket_type, Value} | _]) ->
@@ -622,21 +634,32 @@ validate_config_params([{disable_chunked_transfer_encoding_send, Value} |
 validate_config_params([{disable_chunked_transfer_encoding_send, Value} |
 			_ ]) ->
     throw({disable_chunked_transfer_encoding_send, Value});
+validate_config_params([{Name, _} = Opt | _]) when Name == packet;
+						   Name == mode;
+						   Name == active;
+						   Name == reuseaddr ->
+    throw({internaly_handled_opt_can_not_be_set, Opt});
 validate_config_params([_| Rest]) ->
     validate_config_params(Rest).
 
-%% It is actually pointless to check bind_address in this way since
-%% we need ipfamily to do it properly...
 is_bind_address(any) ->
     true;
 is_bind_address(Value) ->
-    case httpd_util:ip_address(Value, inet6fb4) of
+    case is_bind_address(Value, inet) of
+	false ->
+	    is_bind_address(Value, inet6);
+	True ->
+	    True
+    end.
+
+is_bind_address(Value, IpFamily) ->
+    case httpd_util:ip_address(Value, IpFamily) of
 	{ok, _} ->
 	    true;
 	_ ->
 	    false
     end.
-
+ 
 store(ConfigList0) -> 
     ?hdrd("store", []),
     try validate_config_params(ConfigList0) of
@@ -776,28 +799,6 @@ remove(ConfigDB) ->
     ets:delete(ConfigDB),
     ok.
 
-%% config(ConfigDB) ->
-%%     case httpd_util:lookup(ConfigDB, socket_type, ip_comm) of
-%% 	ssl ->
-%% 	    case ssl_certificate_file(ConfigDB) of
-%% 		undefined ->
-%% 		    {error,
-%% 		     "Directive SSLCertificateFile "
-%% 		     "not found in the config file"};
-%% 		SSLCertificateFile ->
-%% 		    {ssl,
-%% 		     SSLCertificateFile++
-%% 		     ssl_certificate_key_file(ConfigDB)++
-%% 		     ssl_verify_client(ConfigDB)++
-%% 		     ssl_ciphers(ConfigDB)++
-%% 		     ssl_password(ConfigDB)++
-%% 		     ssl_verify_depth(ConfigDB)++
-%% 		     ssl_ca_certificate_file(ConfigDB)}
-%% 	    end;
-%% 	ip_comm ->
-%% 	    ip_comm
-%%     end.
-
 
 get_config(Address, Port, Profile) ->    
     Tab = httpd_util:make_name("httpd_conf", Address, Port, Profile),
@@ -836,6 +837,8 @@ lookup_socket_type(ConfigDB) ->
     case httpd_util:lookup(ConfigDB, socket_type, ip_comm) of
 	ip_comm ->
 	    ip_comm;
+	{ip_comm, _} = Type ->
+	    Type;
 	{Tag, Conf} ->
 	    {Tag, Conf};
 	SSL when (SSL =:= ssl) orelse (SSL =:= essl) ->
diff --git a/lib/inets/src/http_server/httpd_sup.erl b/lib/inets/src/http_server/httpd_sup.erl
index f0b1942e2f..bf40cedd5c 100644
--- a/lib/inets/src/http_server/httpd_sup.erl
+++ b/lib/inets/src/http_server/httpd_sup.erl
@@ -241,7 +241,7 @@ listen(Address, Port, Config)  ->
 	    case http_transport:start(SocketType) of
 		ok ->
 		    {ok, Fd} = get_fd(Port),
-		    IpFamily =  proplists:get_value(ipfamily, Config, inet6fb4),
+		    IpFamily =  proplists:get_value(ipfamily, Config, inet),
 		    case http_transport:listen(SocketType, Address, Port, Fd, IpFamily) of
 			{ok, ListenSocket} ->
 			    NewConfig = proplists:delete(port, Config),
@@ -286,6 +286,8 @@ socket_type(Config) ->
 
 socket_type(ip_comm = SocketType, _) ->
     SocketType;
+socket_type({ip_comm, _} = SocketType, _) ->
+    SocketType;
 socket_type({essl, _} = SocketType, _) ->
     SocketType;
 socket_type(_, Config) ->
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl
index fc69baf829..0387d71911 100644
--- a/lib/inets/src/http_server/httpd_util.erl
+++ b/lib/inets/src/http_server/httpd_util.erl
@@ -42,17 +42,7 @@ ip_address({_,_,_,_,_,_,_,_} = Address, _IpFamily) ->
     {ok, Address};
 ip_address(Host, IpFamily) 
   when ((IpFamily =:= inet) orelse (IpFamily =:= inet6)) ->
-    inet:getaddr(Host, IpFamily);
-ip_address(Host, inet6fb4 = _IpFamily) ->
-    Inet = case gen_tcp:listen(0, [inet6]) of
-	       {ok, Dummyport} ->
-		   gen_tcp:close(Dummyport),
-		   inet6;
-	       _ ->
-		   inet
-	   end,
-    inet:getaddr(Host, Inet).
-
+    inet:getaddr(Host, IpFamily).
 
 %% lookup