File 1838-erts-kernel-Make-DFLAG_HANDSHAKE_23-mandat... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1838-erts-kernel-Make-DFLAG_HANDSHAKE_23-mandatory.patch of Package erlang (Revision 0e04b8d79a55adf8ba49c177393a4846)

Currently displaying revision 0e04b8d79a55adf8ba49c177393a4846 , Show latest

From c051d743dec99a1cfae4e3bc5c7190ab5fb571df Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 3 Nov 2021 20:31:10 +0100
Subject: [PATCH 8/8] erts,kernel: Make DFLAG_HANDSHAKE_23 mandatory

ToDo: Cleanup old handshake code.
---
 erts/emulator/beam/dist.h                     |  4 ++--
 lib/kernel/include/dist.hrl                   |  3 ++-
 lib/kernel/test/erl_distribution_wb_SUITE.erl | 12 ++++--------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index afd8bc889c..a91e5e01ea 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -81,7 +81,8 @@
                                 | DFLAG_NEW_FLOATS                \
                                 | DFLAG_MAP_TAG                   \
                                 | DFLAG_EXPORT_PTR_TAG            \
-                                | DFLAG_BIT_BINARIES)
+                                | DFLAG_BIT_BINARIES              \
+                                | DFLAG_HANDSHAKE_23)
 
 /* Mandatory flags for distribution. */
 #define DFLAG_DIST_MANDATORY DFLAG_DIST_MANDATORY_25
@@ -106,7 +107,6 @@
                             | DFLAG_BIG_SEQTRACE_LABELS       \
                             | DFLAG_EXIT_PAYLOAD              \
                             | DFLAG_FRAGMENTS                 \
-                            | DFLAG_HANDSHAKE_23              \
                             | DFLAG_SPAWN                     \
                             | DFLAG_V4_NC		      \
                             | DFLAG_ALIAS		      \
diff --git a/lib/kernel/include/dist.hrl b/lib/kernel/include/dist.hrl
index 7080b60f2e..5860496394 100644
--- a/lib/kernel/include/dist.hrl
+++ b/lib/kernel/include/dist.hrl
@@ -69,7 +69,8 @@
              ?DFLAG_NEW_FLOATS bor
              ?DFLAG_UTF8_ATOMS bor
              ?DFLAG_MAP_TAG bor
-             ?DFLAG_BIG_CREATION)).
+             ?DFLAG_BIG_CREATION bor
+             ?DFLAG_HANDSHAKE_23)).
 
 %% Also update dflag2str() in ../src/dist_util.erl
 %% when adding flags...
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index 12c8d0afef..4984d46233 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -140,6 +140,7 @@ whitebox(Config) when is_list(Config) ->
     {ok, Node} = start_node(?MODULE,""),
     Cookie = erlang:get_cookie(),
     {_,Host} = split(node()),
+    OurVersion = ?DIST_VER_HIGH,
     [begin
          io:format("Test OurVersion=~p and TrustEpmd=~p\n",
                    [OurVersion, TrustEpmd]),
@@ -150,8 +151,7 @@ whitebox(Config) when is_list(Config) ->
          ok = simultaneous_md5(Node, join(zzzzzzzzzzzzzz,Host),
                                OurVersion, TrustEpmd, Cookie)
      end
-     || OurVersion <- lists:seq(?DIST_VER_LOW, ?DIST_VER_HIGH),
-        TrustEpmd <- [true, false]],
+     || TrustEpmd <- [true, false]],
     stop_node(Node),
     ok.
 
@@ -411,7 +411,7 @@ missing_compulsory_dflags(Config) when is_list(Config) ->
                                          [{active,false},
                                           {packet,2}]),
          BadNode = list_to_atom(atom_to_list(Name2)++"@"++atom_to_list(NB)),
-         send_name(SocketA,BadNode, Version, Version, 0),
+         send_name(SocketA,BadNode, ?DIST_VER_HIGH, Version, 0),
          not_allowed = recv_status(SocketA),
          gen_tcp:close(SocketA)
      end
@@ -663,13 +663,11 @@ send_name(Socket, MyNode0, OurVersion, AssumedVersion) ->
 
 send_name(Socket, MyNode0, OurVersion, AssumedVersion, Flags) ->
     MyNode = atom_to_list(MyNode0),
-    if (OurVersion =:= ?DIST_VER_LOW) or
-       (AssumedVersion =:= ?DIST_VER_LOW) ->
+    if (AssumedVersion =:= ?DIST_VER_LOW) ->
             OurFlags = our_flags(Flags,OurVersion),
             ok = ?to_port(Socket, [<<$n,OurVersion:16,OurFlags:32>>|MyNode]),
             $n;
 
-       (OurVersion > ?DIST_VER_LOW) and
        (AssumedVersion > ?DIST_VER_LOW) ->
             Creation = erts_internal:get_creation(),
             NameLen = length(MyNode),
@@ -678,8 +676,6 @@ send_name(Socket, MyNode0, OurVersion, AssumedVersion, Flags) ->
             $N
     end.
 
-our_flags(Flags, ?DIST_VER_LOW) ->
-    Flags;
 our_flags(Flags, OurVersion) when OurVersion > ?DIST_VER_LOW ->
     Flags bor ?DFLAG_HANDSHAKE_23.
 
-- 
2.31.1

Places

File 1838-erts-kernel-Make-DFLAG_HANDSHAKE_23-mandatory.patch of Package erlang (Revision 0e04b8d79a55adf8ba49c177393a4846)

Places