|
|
4627cfd |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
4627cfd |
Date: Thu, 14 Jul 2016 17:51:16 +0300
|
|
|
4627cfd |
Subject: [PATCH] Respect -proto_dist switch while connection to EPMD
|
|
|
4627cfd |
|
|
|
4627cfd |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
4627cfd |
|
|
|
4627cfd |
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
|
|
|
4627cfd |
index 21a3dec..0ba695c 100644
|
|
|
4627cfd |
--- a/lib/kernel/src/erl_epmd.erl
|
|
|
4627cfd |
+++ b/lib/kernel/src/erl_epmd.erl
|
|
|
4627cfd |
@@ -107,6 +107,10 @@ names1(HostName) ->
|
|
|
4627cfd |
|
|
|
4627cfd |
register_node(Name, PortNo) ->
|
|
|
4627cfd |
register_node(Name, PortNo, inet).
|
|
|
4627cfd |
+register_node(Name, PortNo, inet_tcp) ->
|
|
|
4627cfd |
+ register_node(Name, PortNo, inet);
|
|
|
4627cfd |
+register_node(Name, PortNo, inet6_tcp) ->
|
|
|
4627cfd |
+ register_node(Name, PortNo, inet6);
|
|
|
4627cfd |
register_node(Name, PortNo, Family) ->
|
|
|
4627cfd |
gen_server:call(erl_epmd, {register, Name, PortNo, Family}, infinity).
|
|
|
4627cfd |
|
|
|
4627cfd |
diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
|
|
|
4627cfd |
index 0739cf3..c64ddc8 100644
|
|
|
4627cfd |
--- a/lib/kernel/src/inet_tcp_dist.erl
|
|
|
4627cfd |
+++ b/lib/kernel/src/inet_tcp_dist.erl
|
|
|
4627cfd |
@@ -72,7 +72,7 @@ gen_listen(Driver, Name) ->
|
|
|
4627cfd |
{ok, Socket} ->
|
|
|
4627cfd |
TcpAddress = get_tcp_address(Driver, Socket),
|
|
|
4627cfd |
{_,Port} = TcpAddress#net_address.address,
|
|
|
4627cfd |
- case erl_epmd:register_node(Name, Port) of
|
|
|
4627cfd |
+ case erl_epmd:register_node(Name, Port, Driver) of
|
|
|
4627cfd |
{ok, Creation} ->
|
|
|
4627cfd |
{ok, {Socket, TcpAddress, Creation}};
|
|
|
4627cfd |
Error ->
|