aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/inet_tcp_dist.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-05-27 08:53:33 +0200
committerLukas Larsson <[email protected]>2016-05-27 08:53:33 +0200
commitea8064b1bbda0ef59420ec8a805f3ee52630d704 (patch)
treefd8351867db2f6038002d13970ff385838e1bf73 /lib/kernel/src/inet_tcp_dist.erl
parente5f436615f0649a4d19b03762c016e91e0dce0eb (diff)
parent8ff06daa90c7c3c599c9e8cbc93fe98c2ed5ebfa (diff)
downloadotp-ea8064b1bbda0ef59420ec8a805f3ee52630d704.tar.gz
otp-ea8064b1bbda0ef59420ec8a805f3ee52630d704.tar.bz2
otp-ea8064b1bbda0ef59420ec8a805f3ee52630d704.zip
Merge branch 'legoscia/erts/epmd-module-option/OTP-13627'
* legoscia/erts/epmd-module-option/OTP-13627: Add tests for -start_epmd and -epmd_module options Use the -epmd_module flag consistently Add -start_epmd command line option
Diffstat (limited to 'lib/kernel/src/inet_tcp_dist.erl')
-rw-r--r--lib/kernel/src/inet_tcp_dist.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
index 64b28bb49b..f91d7ef7c3 100644
--- a/lib/kernel/src/inet_tcp_dist.erl
+++ b/lib/kernel/src/inet_tcp_dist.erl
@@ -73,7 +73,8 @@ gen_listen(Driver, Name) ->
{ok, Socket} ->
TcpAddress = get_tcp_address(Driver, Socket),
{_,Port} = TcpAddress#net_address.address,
- case erl_epmd:register_node(Name, Port) of
+ ErlEpmd = net_kernel:epmd_module(),
+ case ErlEpmd:register_node(Name, Port) of
{ok, Creation} ->
{ok, {Socket, TcpAddress, Creation}};
Error ->
@@ -280,7 +281,8 @@ do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
case inet:getaddr(Address, AddressFamily) of
{ok, Ip} ->
Timer = dist_util:start_timer(SetupTime),
- case erl_epmd:port_please(Name, Ip) of
+ ErlEpmd = net_kernel:epmd_module(),
+ case ErlEpmd:port_please(Name, Ip) of
{port, TcpPort, Version} ->
?trace("port_please(~p) -> version ~p~n",
[Node,Version]),