From 5a2bd5648ced26ed5a8ba8009603908f5226538d Mon Sep 17 00:00:00 2001
From: Tom Briden <tom.briden@eckoh.com>
Date: Thu, 26 Mar 2015 13:22:19 +0000
Subject: TLS Dist: Use inet_dist_ options

The inet_dist_ options, such as min/max port numbers aren't used
with TLS distribution. This commits uses those settings in the
same way as they're used in inet_tcp_dist.erl
---
 lib/ssl/src/ssl_tls_dist_proxy.erl | 62 ++++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 10 deletions(-)

(limited to 'lib/ssl/src/ssl_tls_dist_proxy.erl')

diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
index 273d3b5521..3a0990e8b6 100644
--- a/lib/ssl/src/ssl_tls_dist_proxy.erl
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
@@ -48,6 +48,48 @@ accept(Listen) ->
 connect(Ip, Port) ->
     gen_server:call(?MODULE, {connect, Ip, Port}, infinity).
 
+
+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,
+                                                    inet_dist_listen_max) of
+                               {ok,M} when is_integer(M) ->
+                                   {N,M};
+                               _ ->
+                                   {N,N}
+                            end;
+                        _ ->
+                            {0,0}
+                   end,
+    do_listen(First, Last, listen_options([{backlog,128}|Options])).
+
+do_listen(First,Last,_) when First > Last ->
+    {error,eaddrinuse};
+do_listen(First,Last,Options) ->
+    case gen_tcp:listen(First, Options) of
+        {error, eaddrinuse} ->
+            do_listen(First+1,Last,Options);
+        Other ->
+            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.
+
 %%====================================================================
 %% gen_server callbacks
 %%====================================================================
@@ -61,16 +103,16 @@ init([]) ->
 
 handle_call({listen, Name}, _From, State) ->
     case gen_tcp:listen(0, [{active, false}, {packet,?PPRE}]) of
-	{ok, Socket} ->
-	    {ok, World} = gen_tcp:listen(0, [{active, false}, binary, {packet,?PPRE}]),
-	    {ok, TcpAddress} = get_tcp_address(Socket),
-	    {ok, WorldTcpAddress} = get_tcp_address(World),
-	    {_,Port} = WorldTcpAddress#net_address.address,
-	    {ok, Creation} = erl_epmd:register_node(Name, Port),
-	    {reply, {ok, {Socket, TcpAddress, Creation}},
-	     State#state{listen={Socket, World}}};
-	Error ->
-	    {reply, Error, State}
+       {ok, Socket} ->
+           {ok, World} = do_listen([{active, false}, binary, {packet,?PPRE}, {reuseaddr, true}]),
+           {ok, TcpAddress} = get_tcp_address(Socket),
+           {ok, WorldTcpAddress} = get_tcp_address(World),
+           {_,Port} = WorldTcpAddress#net_address.address,
+           {ok, Creation} = erl_epmd:register_node(Name, Port),
+           {reply, {ok, {Socket, TcpAddress, Creation}},
+            State#state{listen={Socket, World}}};
+       Error ->
+           {reply, Error, State}
     end;
 
 handle_call({accept, Listen}, {From, _}, State = #state{listen={_, World}}) ->
-- 
cgit v1.2.3


From 991d3fa399154b6166a4974406fc2bdda02a2668 Mon Sep 17 00:00:00 2001
From: Magnus Henoch <magnus@erlang-solutions.com>
Date: Tue, 17 Nov 2015 13:40:54 +0000
Subject: Test socket listen options for TLS distribution

Add test that checks that the option inet_dist_listen_options is used
when starting a node with TLS distribution.

This test was adapted from inet_dist_options_options in
erl_distribution_SUITE.
---
 lib/ssl/src/ssl_tls_dist_proxy.erl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/ssl/src/ssl_tls_dist_proxy.erl')

diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
index 3a0990e8b6..c8f29cee4b 100644
--- a/lib/ssl/src/ssl_tls_dist_proxy.erl
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
@@ -84,7 +84,6 @@ listen_options(Opts0) ->
         end,
     case application:get_env(kernel, inet_dist_listen_options) of
         {ok,ListenOpts} ->
-            erlang:display({inet_dist_listen_options, ListenOpts}),
             ListenOpts ++ Opts1;
         _ ->
             Opts1
-- 
cgit v1.2.3