diff options
| author | Sverker Eriksson <[email protected]> | 2016-08-19 14:33:26 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-08-19 14:33:26 +0200 |
| commit | 04e925591e26c25fcdf8185324664135378f9291 (patch) | |
| tree | 8e2be7ddb6d2a7daba1355862d984d7b76a00f6d /bootstrap/lib/kernel | |
| parent | 2bb55f7bb6c8aa534d84087da18736e431bb482b (diff) | |
| parent | 74eea0fbb2cb5d0bb211dad19891d2aae31e170d (diff) | |
| download | otp-04e925591e26c25fcdf8185324664135378f9291.tar.gz otp-04e925591e26c25fcdf8185324664135378f9291.tar.bz2 otp-04e925591e26c25fcdf8185324664135378f9291.zip | |
Merge branch 'maint'
Diffstat (limited to 'bootstrap/lib/kernel')
| -rw-r--r-- | bootstrap/lib/kernel/ebin/dist_util.beam | bin | 10664 -> 11220 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam | bin | 768 -> 872 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/inet_tcp_dist.beam | bin | 7216 -> 7616 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/net_kernel.beam | bin | 22980 -> 24856 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/include/dist_util.hrl | 8 |
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 Binary files differindex e5d0f66e6e..bf3572fe23 100644 --- a/bootstrap/lib/kernel/ebin/dist_util.beam +++ b/bootstrap/lib/kernel/ebin/dist_util.beam diff --git a/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam b/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam Binary files differindex 1be1dc1c57..98f70db13c 100644 --- a/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam +++ b/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam diff --git a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam Binary files differindex 5fd6b3e909..087274e89d 100644 --- a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam +++ b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam Binary files differindex 6cf6916fe6..1197b4f681 100644 --- a/bootstrap/lib/kernel/ebin/net_kernel.beam +++ b/bootstrap/lib/kernel/ebin/net_kernel.beam 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 }). |