diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-07-26 10:28:59 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-07-26 10:28:59 +0200 |
| commit | 915628f0545a86033a7e07f9937d0e3d92c16907 (patch) | |
| tree | c8913649db24ea7aed9d7525d91631a903d563a9 /lib/kernel/src | |
| parent | 825145898d7bf69147c1e6a6ad66c3454e7ec8f1 (diff) | |
| parent | 84549af1c996657aedee1263afec28b21bfa42a4 (diff) | |
| download | otp-915628f0545a86033a7e07f9937d0e3d92c16907.tar.gz otp-915628f0545a86033a7e07f9937d0e3d92c16907.tar.bz2 otp-915628f0545a86033a7e07f9937d0e3d92c16907.zip | |
Merge branch 'lemenkov/kernel/fix-register_ipv6_epmd/PR-1129/OTP-13770' into maint
* lemenkov/kernel/fix-register_ipv6_epmd/PR-1129/OTP-13770:
Respect -proto_dist switch while connection to EPMD
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 -> |