Ver. 18.3.4.1
- Ver. 18.3.4.1 - Allow node registration via IPv6 (PR erlang/otp#1129) Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
parent
7baa91a725
commit
f866398479
1
.gitignore
vendored
1
.gitignore
vendored
@ -63,3 +63,4 @@ otp_src_R14A.tar.gz
|
||||
/otp-OTP-18.3.2.tar.gz
|
||||
/otp-OTP-18.3.3.tar.gz
|
||||
/otp-OTP-18.3.4.tar.gz
|
||||
/otp-OTP-18.3.4.1.tar.gz
|
||||
|
10
erlang.spec
10
erlang.spec
@ -68,7 +68,7 @@
|
||||
|
||||
|
||||
Name: erlang
|
||||
Version: 18.3.4
|
||||
Version: 18.3.4.1
|
||||
Release: 1%{?dist}
|
||||
Summary: General-purpose programming language and runtime environment
|
||||
|
||||
@ -131,6 +131,9 @@ Patch9: otp-0009-Don-t-send-unasked-for-systemd-notifications.patch
|
||||
# Fedora specific patch
|
||||
# Fix decoding of LLONG_MIN in erl_decode
|
||||
Patch10: otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch
|
||||
# Fedora specific patch
|
||||
# Respect -proto_dist switch while connection to EPMD
|
||||
Patch11: otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch
|
||||
# end of autogenerated patch tag list
|
||||
|
||||
BuildRequires: flex
|
||||
@ -1029,6 +1032,7 @@ Erlang mode for XEmacs (source lisp files).
|
||||
%patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution
|
||||
%patch9 -p1 -b .Don_t_send_unasked_for_systemd_notifications
|
||||
%patch10 -p1 -b .Fix_decoding_of_LLONG_MIN_in_erl_decode
|
||||
%patch11 -p1 -b .Respect_proto_dist_switch_while_connection_to_EPMD
|
||||
# end of autogenerated prep patch list
|
||||
|
||||
# FIXME we should come up with a better solution
|
||||
@ -2449,6 +2453,10 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 15 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3.4.1-1
|
||||
- Ver. 18.3.4.1
|
||||
- Allow node registration via IPv6 (PR erlang/otp#1129)
|
||||
|
||||
* Tue Jun 14 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3.4-1
|
||||
- Ver. 18.3.4
|
||||
|
||||
|
@ -0,0 +1,34 @@
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Thu, 14 Jul 2016 17:51:16 +0300
|
||||
Subject: [PATCH] Respect -proto_dist switch while connection to EPMD
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
|
||||
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
|
||||
index c6202dd..ec2e330 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 64b28bb..ffbd5d5 100644
|
||||
--- a/lib/kernel/src/inet_tcp_dist.erl
|
||||
+++ b/lib/kernel/src/inet_tcp_dist.erl
|
||||
@@ -73,7 +73,7 @@ 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
|
||||
+ case erl_epmd:register_node(Name, Port, Driver) of
|
||||
{ok, Creation} ->
|
||||
{ok, {Socket, TcpAddress, Creation}};
|
||||
Error ->
|
Loading…
x
Reference in New Issue
Block a user