diff options
| author | Zandra <[email protected]> | 2016-02-04 15:38:26 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2016-02-04 15:38:26 +0100 |
| commit | a1c497746ca98034890043be316d93dfdfdf8626 (patch) | |
| tree | b46fa987eb3ebb08d42ed53bba38dcea09bf2d83 | |
| parent | 66fc5eda45507c637571b2baa97e0fa4aab8033f (diff) | |
| parent | 1be4f6f84f36ad8a84ddcf211336aa4b266661d8 (diff) | |
| download | otp-a1c497746ca98034890043be316d93dfdfdf8626.tar.gz otp-a1c497746ca98034890043be316d93dfdfdf8626.tar.bz2 otp-a1c497746ca98034890043be316d93dfdfdf8626.zip | |
Merge branch 'legoscia/tls-dist-listen-ip' into maint
* legoscia/tls-dist-listen-ip:
TLS distribution: bind erts socket to localhost
OTP-13300
| -rw-r--r-- | lib/ssl/src/ssl_tls_dist_proxy.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl index 1e6c6e726a..211badef56 100644 --- a/lib/ssl/src/ssl_tls_dist_proxy.erl +++ b/lib/ssl/src/ssl_tls_dist_proxy.erl @@ -109,7 +109,7 @@ init([]) -> {ok, #state{}}. handle_call({listen, Name}, _From, State) -> - case gen_tcp:listen(0, [{active, false}, {packet,?PPRE}]) of + case gen_tcp:listen(0, [{active, false}, {packet,?PPRE}, {ip, loopback}]) of {ok, Socket} -> {ok, World} = do_listen([{active, false}, binary, {packet,?PPRE}, {reuseaddr, true}]), {ok, TcpAddress} = get_tcp_address(Socket), @@ -268,7 +268,7 @@ setup_proxy(Ip, Port, Parent) -> Opts = connect_options(get_ssl_options(client)), case ssl:connect(Ip, Port, [{active, true}, binary, {packet,?PPRE}, nodelay()] ++ Opts) of {ok, World} -> - {ok, ErtsL} = gen_tcp:listen(0, [{active, true}, {ip, {127,0,0,1}}, binary, {packet,?PPRE}]), + {ok, ErtsL} = gen_tcp:listen(0, [{active, true}, {ip, loopback}, binary, {packet,?PPRE}]), {ok, #net_address{address={_,LPort}}} = get_tcp_address(ErtsL), Parent ! {self(), go_ahead, LPort}, case gen_tcp:accept(ErtsL) of |