Merge branch 'maint'

3 files changed, 120 insertions, 18 deletions

diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index 00c6bc33d6..96e3651140 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1996</year><year>2014</year>
+      <year>1996</year><year>2015</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -188,6 +188,18 @@
         <p>Define the <c>First..Last</c> port range for the listener
           socket of a distributed Erlang node.</p>
       </item>
+      <tag><c>{inet_dist_listen_options, Opts}</c></tag>
+      <item>
+        <p>Define a list of extra socket options to be used when opening the
+	  listening socket for a distributed Erlang node.
+	  See <seealso marker="gen_tcp#listen/2">gen_tcp:listen/2</seealso></p>
+      </item>
+      <tag><c>{inet_dist_connect_options, Opts}</c></tag>
+      <item>
+        <p>Define a list of extra socket options to be used when connecting to
+	  other distributed Erlang nodes.
+	  See <seealso marker="gen_tcp#connect/4">gen_tcp:connect/4</seealso></p>
+      </item>
       <tag><c>inet_parse_error_log = silent</c></tag>
       <item>
         <p>If this configuration parameter is set, no
diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
index 63f236b069..835dcf2705 100644
--- a/lib/kernel/src/inet_tcp_dist.erl
+++ b/lib/kernel/src/inet_tcp_dist.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. 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
@@ -77,7 +77,7 @@ listen(Name) ->
 	    Error
     end.
 
-do_listen(Options0) ->
+do_listen(Options) ->
     {First,Last} = case application:get_env(kernel,inet_dist_listen_min) of
 		       {ok,N} when is_integer(N) ->
 			   case application:get_env(kernel,
@@ -90,13 +90,7 @@ do_listen(Options0) ->
 		       _ ->
 			   {0,0}
 		   end,
-    Options = case application:get_env(kernel, inet_dist_use_interface) of
-		   {ok, Ip} ->
-		       [{ip, Ip} | Options0];
-		   _ ->
-		       Options0
-	       end,
-    do_listen(First, Last, [{backlog,128}|Options]).
+    do_listen(First, Last, listen_options([{backlog,128}|Options])).
 
 do_listen(First,Last,_) when First > Last ->
     {error,eaddrinuse};
@@ -108,6 +102,23 @@ do_listen(First,Last,Options) ->
 	    Other
     end.
 
+listen_options(Opts0) ->
+    Opts1 =
+	case application:get_env(kernel, inet_dist_use_interface) of
+	    {ok, Ip} ->
+		[{ip, Ip} | Opts0];
+	    _ ->
+		Opts0
+	end,
+    case application:get_env(kernel, inet_dist_listen_options) of
+	{ok,ListenOpts} ->
+	    erlang:display({inet_dist_listen_options, ListenOpts}),
+	    ListenOpts ++ Opts1;
+	_ ->
+	    Opts1
+    end.
+
+
 %% ------------------------------------------------------------
 %% Accepts new connection attempts from other Erlang nodes.
 %% ------------------------------------------------------------
@@ -219,7 +230,7 @@ nodelay() ->
 	_ ->
 	    {nodelay, true}
     end.
-	    
+
 
 %% ------------------------------------------------------------
 %% Get remote information about a Socket.
@@ -260,9 +271,11 @@ do_setup(Kernel, Node, Type, MyNode, LongOrShortNames,SetupTime) ->
 		    ?trace("port_please(~p) -> version ~p~n", 
 			   [Node,Version]),
 		    dist_util:reset_timer(Timer),
-		    case inet_tcp:connect(Ip, TcpPort, 
-					  [{active, false}, 
-					   {packet,2}]) of
+		    case
+			inet_tcp:connect(
+			  Ip, TcpPort,
+			  connect_options([{active, false}, {packet, 2}]))
+		    of
 			{ok, Socket} ->
 			    HSData = #hs_data{
 			      kernel_pid = Kernel,
@@ -324,6 +337,15 @@ do_setup(Kernel, Node, Type, MyNode, LongOrShortNames,SetupTime) ->
 	    ?shutdown(Node)
     end.
 
+connect_options(Opts) ->
+    case application:get_env(kernel, inet_dist_connect_options) of
+	{ok,ConnectOpts} ->
+	    erlang:display({inet_dist_listen_options, ConnectOpts}),
+	    ConnectOpts ++ Opts;
+	_ ->
+	    Opts
+    end.
+
 %%
 %% Close a socket.
 %%
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index 9cccdab76b..15c2adc957 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. 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
@@ -26,7 +26,8 @@
 
 -export([tick/1, tick_change/1, illegal_nodenames/1, hidden_node/1,
 	 table_waste/1, net_setuptime/1,
-	
+	 inet_dist_options_options/1,
+
 	 monitor_nodes_nodedown_reason/1,
 	 monitor_nodes_complex_nodedown_reason/1,
 	 monitor_nodes_node_type/1,
@@ -38,7 +39,8 @@
 	 monitor_nodes_many/1]).
 
 %% Performs the test at another node.
--export([tick_cli_test/1, tick_cli_test1/1,
+-export([get_socket_priorities/0,
+	 tick_cli_test/1, tick_cli_test1/1,
 	 tick_serv_test/2, tick_serv_test1/1,
 	 keep_conn/1, time_ping/1]).
 
@@ -62,7 +64,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [tick, tick_change, illegal_nodenames, hidden_node,
-     table_waste, net_setuptime, {group, monitor_nodes}].
+     table_waste, net_setuptime, inet_dist_options_options,
+     {group, monitor_nodes}].
 
 groups() -> 
     [{monitor_nodes, [],
@@ -554,6 +557,71 @@ check_monitor_nodes_res(Pid, Node) ->
     end.
 
 
+
+inet_dist_options_options(suite) -> [];
+inet_dist_options_options(doc) ->
+    ["Check the kernel inet_dist_{listen,connect}_options options"];
+inet_dist_options_options(Config) when is_list(Config) ->
+    Prio = 1,
+    case gen_udp:open(0, [{priority,Prio}]) of
+	{ok,Socket} ->
+	    case inet:getopts(Socket, [priority]) of
+		{ok,[{priority,Prio}]} ->
+		    ok = gen_udp:close(Socket),
+		    do_inet_dist_options_options(Prio);
+		      _ ->
+		    ok = gen_udp:close(Socket),
+		    {skip,
+		     "Can not set priority "++integer_to_list(Prio)++
+			 " on socket"}
+	    end;
+	{error,_} ->
+	    {skip, "Can not set priority on socket"}
+    end.
+
+do_inet_dist_options_options(Prio) ->
+    PriorityString0 = "[{priority,"++integer_to_list(Prio)++"}]",
+    PriorityString =
+	case os:cmd("echo [{a,1}]") of
+	    "[{a,1}]"++_ ->
+		PriorityString0;
+	    _ ->
+		%% Some shells need quoting of [{}]
+		"'"++PriorityString0++"'"
+	end,
+    InetDistOptions =
+	"-hidden "
+	"-kernel inet_dist_connect_options "++PriorityString++" "
+	"-kernel inet_dist_listen_options "++PriorityString,
+    ?line {ok,Node1} =
+	start_node(inet_dist_options_1, InetDistOptions),
+    ?line {ok,Node2} =
+	start_node(inet_dist_options_2, InetDistOptions),
+    %%
+    ?line pong =
+	rpc:call(Node1, net_adm, ping, [Node2]),
+    ?line PrioritiesNode1 =
+	rpc:call(Node1, ?MODULE, get_socket_priorities, []),
+    ?line PrioritiesNode2 =
+	rpc:call(Node2, ?MODULE, get_socket_priorities, []),
+    ?line ?t:format("PrioritiesNode1 = ~p", [PrioritiesNode1]),
+    ?line ?t:format("PrioritiesNode2 = ~p", [PrioritiesNode2]),
+    ?line Elevated = [P || P <- PrioritiesNode1, P =:= Prio],
+    ?line Elevated = [P || P <- PrioritiesNode2, P =:= Prio],
+    ?line [_|_] = Elevated,
+    %%
+    ?line stop_node(Node2),
+    ?line stop_node(Node1),
+    ok.
+
+get_socket_priorities() ->
+    [Priority ||
+	{ok,[{priority,Priority}]} <-
+	    [inet:getopts(Port, [priority]) ||
+		Port <- erlang:ports(),
+		element(2, erlang:port_info(Port, name)) =:= "tcp_inet"]].
+
+
 	    
 %%
 %% Testcase: