diff options
| author | Peter Lemenkov <[email protected]> | 2016-07-14 17:51:16 +0300 |
|---|---|---|
| committer | Peter Lemenkov <[email protected]> | 2016-07-17 16:12:46 +0300 |
| commit | 84549af1c996657aedee1263afec28b21bfa42a4 (patch) | |
| tree | d420ace805b7297bddcb99833c321b32761e61fb /lib/kernel/src | |
| parent | b67da3610ace6d4e998bdfb458343165e205fae8 (diff) | |
| download | otp-84549af1c996657aedee1263afec28b21bfa42a4.tar.gz otp-84549af1c996657aedee1263afec28b21bfa42a4.tar.bz2 otp-84549af1c996657aedee1263afec28b21bfa42a4.zip | |
Respect -proto_dist switch while connection to EPMD
Signed-off-by: Peter Lemenkov <[email protected]>
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/erl_epmd.erl | 4 | ||||
| -rw-r--r-- | lib/kernel/src/inet_tcp_dist.erl | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl index f8ef4a475d..79a026ab67 100644 --- a/lib/kernel/src/erl_epmd.erl +++ b/lib/kernel/src/erl_epmd.erl @@ -103,6 +103,10 @@ names(EpmdAddr) -> register_node(Name, PortNo) -> register_node(Name, PortNo, inet). +register_node(Name, PortNo, inet_tcp) -> + register_node(Name, PortNo, inet); +register_node(Name, PortNo, inet6_tcp) -> + register_node(Name, PortNo, inet6); register_node(Name, PortNo, Family) -> gen_server:call(erl_epmd, {register, Name, PortNo, Family}, infinity). diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl index f91d7ef7c3..94bde55133 100644 --- a/lib/kernel/src/inet_tcp_dist.erl +++ b/lib/kernel/src/inet_tcp_dist.erl @@ -74,7 +74,7 @@ gen_listen(Driver, Name) -> TcpAddress = get_tcp_address(Driver, Socket), {_,Port} = TcpAddress#net_address.address, ErlEpmd = net_kernel:epmd_module(), - case ErlEpmd:register_node(Name, Port) of + case ErlEpmd:register_node(Name, Port, Driver) of {ok, Creation} -> {ok, {Socket, TcpAddress, Creation}}; Error -> |