File 6631-kernel-Change-net_kernel-get_state-return-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 6631-kernel-Change-net_kernel-get_state-return-value.patch of Package erlang

From 97f2b291f6fe28caa8138d4dabcbc56b20c38510 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 15 Feb 2022 21:42:25 +0100
Subject: [PATCH 1/3] kernel: Change net_kernel:get_state return value

Change 'domain_type' to 'name_domain'.
---
 lib/kernel/src/net_kernel.erl              |  4 ++--
 lib/kernel/test/erl_distribution_SUITE.erl | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index e614e12108..8252b6ebcf 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -861,14 +861,14 @@ handle_call(get_state, From, State) ->
                           {dynamic_node_name, Node} ->
                               {dynamic, Node}
                       end,
-    DomainType = case get(longnames) of
+    NameDomain = case get(longnames) of
                      true -> long;
                      false -> short
                  end,
     Return = #{started => Started,
                name_type => NameType,
                name => Name,
-               domain_type => DomainType},
+               name_domain => NameDomain},
     async_reply({reply, Return, State}, From);
 
 handle_call(_Msg, _From, State) ->
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index 34015dadbf..551b1f39dc 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -581,24 +581,24 @@ dyn_node_name(Config) when is_list(Config) ->
     dyn_node_name("", Config).
 
 dyn_node_name(DCfg, _Config) ->
-    DomainType = case net_kernel:get_state() of
-                     #{domain_type := short} -> "short";
-                     #{domain_type := long} -> "long"
+    NameDomain = case net_kernel:get_state() of
+                     #{name_domain := short} -> "short";
+                     #{name_domain := long} -> "long"
                  end,
     {_N1F,Port1} = start_node_unconnected(DCfg ++ " -dist_listen false",
                                           undefined, ?MODULE, run_remote_test,
                                           ["dyn_node_name_do", atom_to_list(node()),
-                                           DomainType]),
+                                           NameDomain]),
     0 = wait_for_port_exit(Port1),
     ok.
 
-dyn_node_name_do(TestNode, [DomainTypeStr]) ->
+dyn_node_name_do(TestNode, [NameDomainStr]) ->
     nonode@nohost = node(),
     [] = nodes(),
     [] = nodes(hidden),
-    DomainType = list_to_atom(DomainTypeStr),
+    NameDomain = list_to_atom(NameDomainStr),
     #{started := static, name_type := dynamic, name := undefined,
-     domain_type := DomainType} = net_kernel:get_state(),
+     name_domain := NameDomain} = net_kernel:get_state(),
     net_kernel:monitor_nodes(true, [{node_type,all}]),
     net_kernel:connect_node(TestNode),
     [] = nodes(),
-- 
2.34.1

Places

File 6631-kernel-Change-net_kernel-get_state-return-value.patch of Package erlang

Places