aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-05-17 09:33:58 +0200
committerGitHub <[email protected]>2018-05-17 09:33:58 +0200
commitdb191170ace56ac32708d2554a308eff9926d85f (patch)
tree1319898a3e3f6e79003bef5e9179ffa989d26be1 /erts/emulator
parent9211638268fac2da26dbcb159e8b538eb18c8804 (diff)
parent662f3c7ba50ff8ec13d86171bcfc61fd3da9deed (diff)
downloadotp-db191170ace56ac32708d2554a308eff9926d85f.tar.gz
otp-db191170ace56ac32708d2554a308eff9926d85f.tar.bz2
otp-db191170ace56ac32708d2554a308eff9926d85f.zip
tverlaan/add_dns_alternative_to_tcp_dist/PR-1694/OTP-15086
epmd: allow alternative to dns resolving for nodename
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/distribution_SUITE.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 0e383ee879..45dd922ff0 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -73,7 +73,7 @@
dist_evil_parallel_receiver/0]).
%% epmd_module exports
--export([start_link/0, register_node/2, register_node/3, port_please/2]).
+-export([start_link/0, register_node/2, register_node/3, port_please/2, address_please/3]).
suite() ->
[{ct_hooks,[ts_install_cth]},
@@ -2086,6 +2086,11 @@ port_please(_Name, _Ip) ->
{port, Port, Version}
end.
+address_please(_Name, _Address, _AddressFamily) ->
+ %% Use localhost.
+ IP = {127,0,0,1},
+ {ok, IP}.
+
%%% Utilities
timestamp() ->