aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorSverker Eriksson <sverker@erlang.org>2016-08-19 14:30:52 +0200
committerSverker Eriksson <sverker@erlang.org>2016-08-19 14:30:52 +0200
commit74eea0fbb2cb5d0bb211dad19891d2aae31e170d (patch)
treecf599434e94471c94b49196758fff1462e542996 /bootstrap
parent2757590a9d7e092dcbaf15c15354f7ccd0154219 (diff)
parentaa12cfd7a35434f6da89b5c3aaafdc99189f5a98 (diff)
downloadotp-74eea0fbb2cb5d0bb211dad19891d2aae31e170d.tar.gz
otp-74eea0fbb2cb5d0bb211dad19891d2aae31e170d.tar.bz2
otp-74eea0fbb2cb5d0bb211dad19891d2aae31e170d.zip
Merge branch 'sverker/net_kernel-setopts/OTP-13564' into maint
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/lib/kernel/ebin/dist_util.beambin10664 -> 11220 bytes
-rw-r--r--bootstrap/lib/kernel/ebin/inet6_tcp_dist.beambin768 -> 872 bytes
-rw-r--r--bootstrap/lib/kernel/ebin/inet_tcp_dist.beambin7216 -> 7616 bytes
-rw-r--r--bootstrap/lib/kernel/ebin/net_kernel.beambin22980 -> 24856 bytes
-rw-r--r--bootstrap/lib/kernel/include/dist_util.hrl8
5 files changed, 6 insertions, 2 deletions
diff --git a/bootstrap/lib/kernel/ebin/dist_util.beam b/bootstrap/lib/kernel/ebin/dist_util.beam
index e5d0f66e6e..bf3572fe23 100644
--- a/bootstrap/lib/kernel/ebin/dist_util.beam
+++ b/bootstrap/lib/kernel/ebin/dist_util.beam
Binary files differ
diff --git a/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam b/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam
index 1be1dc1c57..98f70db13c 100644
--- a/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam
+++ b/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam
Binary files differ
diff --git a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
index 5fd6b3e909..087274e89d 100644
--- a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
+++ b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
Binary files differ
diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam
index 6cf6916fe6..1197b4f681 100644
--- a/bootstrap/lib/kernel/ebin/net_kernel.beam
+++ b/bootstrap/lib/kernel/ebin/net_kernel.beam
Binary files differ
diff --git a/bootstrap/lib/kernel/include/dist_util.hrl b/bootstrap/lib/kernel/include/dist_util.hrl
index 43e50d4325..320e916c04 100644
--- a/bootstrap/lib/kernel/include/dist_util.hrl
+++ b/bootstrap/lib/kernel/include/dist_util.hrl
@@ -63,7 +63,7 @@
f_getll, %% Get low level port or pid.
f_address, %% The address of the "socket",
%% generated from Socket,Node
- %% These two are used in the tick loop,
+ %% These three are used in the tick loop,
%% so they are not fun's to avoid holding old code.
mf_tick, %% Takes the socket as parameters and
%% sends a tick, this is no fun, it
@@ -74,7 +74,11 @@
%% {ok, RecvCnt, SendCnt, SendPend} for
%% a given socket. This is a {M,F},
%% returning {error, Reason on failure}
- request_type = normal
+ request_type = normal,
+
+ %% New in kernel-5.1 (OTP 19.1):
+ mf_setopts, %% netkernel:setopts on active connection
+ mf_getopts %% netkernel:getopts on active connection
}).