Move new|abort_connection_id to erts_internal

and drop _id suffix.

7 files changed, 28 insertions, 28 deletions

diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 5a591caac9..f739f414de 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -694,6 +694,6 @@ bif erlang:iolist_to_iovec/1
 # New in 21.0
 #
 
-bif erlang:new_connection_id/1
-bif erlang:abort_connection_id/2
+bif erts_internal:new_connection/1
+bif erts_internal:abort_connection/2
 
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index ae64f394c8..16a7bd9eb3 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -3480,7 +3480,7 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
     goto done;
 }
 
-BIF_RETTYPE new_connection_id_1(BIF_ALIST_1)
+BIF_RETTYPE erts_internal_new_connection_1(BIF_ALIST_1)
 {
     DistEntry* dep;
     Uint32 conn_id;
@@ -3580,7 +3580,7 @@ static Sint abort_connection(DistEntry* dep, Uint32 conn_id)
     return 0;
 }
 
-BIF_RETTYPE abort_connection_id_2(BIF_ALIST_2)
+BIF_RETTYPE erts_internal_abort_connection_2(BIF_ALIST_2)
 {
     DistEntry* dep;
     Eterm* tp;
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 18137fd53c..01ed412562 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index 5416826f19..cb8e6b6d69 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index ed9b7d9785..2be053575b 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -164,8 +164,6 @@
 -export([registered/0, resume_process/1, round/1, self/0]).
 -export([seq_trace/2, seq_trace_print/1, seq_trace_print/2, setnode/2]).
 -export([setnode/3, size/1, spawn/3, spawn_link/3, split_binary/2]).
--export([new_connection_id/1]).
--export([abort_connection_id/2]).
 -export([suspend_process/2, system_monitor/0]).
 -export([system_monitor/1, system_monitor/2, system_profile/0]).
 -export([system_profile/2, throw/1, time/0, trace/3, trace_delivered/1]).
@@ -1663,20 +1661,6 @@ setnode(_P1, _P2) ->
 setnode(_P1, _P2, _P3) ->
     erlang:nif_error(undefined).
 
-%% new_connection_id/1
--spec erlang:new_connection_id(Node) -> ConnId when
-      Node :: atom(),
-      ConnId :: {integer(), dist_handle()}.
-new_connection_id(_Node) ->
-    erlang:nif_error(undefined).
-
-%% abort_connection_id/2
--spec erlang:abort_connection_id(Node, ConnId) -> boolean() when
-      Node :: atom(),
-      ConnId :: {integer(), dist_handle()}.
-abort_connection_id(_Node, _ConnId) ->
-    erlang:nif_error(undefined).
-
 %% size/1
 %% Shadowed by erl_bif_types: erlang:size/1
 -spec size(Item) -> non_neg_integer() when
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index bb1824ecd4..1f5c88c4b9 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -63,6 +63,9 @@
 
 -export([dist_ctrl_put_data/2]).
 
+-export([new_connection/1]).
+-export([abort_connection/2]).
+
 %% Auto import name clash
 -export([check_process_code/1]).
 
@@ -498,3 +501,16 @@ dist_ctrl_put_data(DHandle, IoList) ->
                           | RootST],
 	    erlang:raise(Class, Reason, StackTrace)
     end.
+
+
+-spec erts_internal:new_connection(Node) -> ConnId when
+      Node :: atom(),
+      ConnId :: {integer(), erlang:dist_handle()}.
+new_connection(_Node) ->
+    erlang:nif_error(undefined).
+
+-spec erts_internal:abort_connection(Node, ConnId) -> boolean() when
+      Node :: atom(),
+      ConnId :: {integer(), erlang:dist_handle()}.
+abort_connection(_Node, _ConnId) ->
+    erlang:nif_error(undefined).
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index 3c4e8df88f..cdb10a7b12 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -456,7 +456,7 @@ handle_call({passive_cnct, Node}, From, State) ->
     verbose({passive_cnct, Node}, 1, State),
     Type = normal,
     WaitForBarred = true,
-    R = case (catch erlang:new_connection_id(Node)) of
+    R = case (catch erts_internal:new_connection(Node)) of
             {Nr,_DHandle}=ConnId when is_integer(Nr) ->
                 do_auto_connect(Type, Node, ConnId, WaitForBarred, From, State);
 
@@ -477,7 +477,7 @@ handle_call({connect, _, Node, _, _}, From, State) when Node =:= node() ->
 handle_call({connect, Type, Node}, From, State) ->
     verbose({connect, Type, Node}, 1, State),
     ConnLookup = ets:lookup(sys_dist, Node),
-    R = case (catch erlang:new_connection_id(Node)) of
+    R = case (catch erts_internal:new_connection(Node)) of
             {Nr,_DHandle}=ConnId when is_integer(Nr) ->
                 do_explicit_connect(ConnLookup, Type, Node, ConnId, From, State);
                     
@@ -708,7 +708,7 @@ handle_info({auto_connect,Node, Nr, DHandle}, State) ->
                 S;
 
             {reply, false, S} -> %% Connection refused
-                erlang:abort_connection_id(Node, ConnId),
+                erts_internal:abort_connection(Node, ConnId),
                 S
         end,
     {noreply, NewState};
@@ -793,7 +793,7 @@ handle_info({AcceptPid, {accept_pending,MyNode,Node,Address,Type}}, State) ->
 	    AcceptPid ! {self(), {accept_pending, already_pending}},
 	    {noreply, State};
 	_ ->
-            case (catch erlang:new_connection_id(Node)) of
+            case (catch erts_internal:new_connection(Node)) of
                 {Nr,_DHandle}=ConnId when is_integer(Nr) ->
                     ets:insert(sys_dist, #connection{node = Node,
                                                      conn_id = ConnId,
@@ -995,7 +995,7 @@ pending_nodedown(Conn, Node, Type, State) ->
     % Don't bar connections that have never been alive
     %mark_sys_dist_nodedown(Node),
     % - instead just delete the node:
-    erlang:abort_connection_id(Node, Conn#connection.conn_id),
+    erts_internal:abort_connection(Node, Conn#connection.conn_id),
     ets:delete(sys_dist, Node),
     reply_waiting(Node,Conn#connection.waiting, false),
     case Type of
@@ -1010,9 +1010,9 @@ up_pending_nodedown(Conn, Node, _Reason, _Type, State) ->
     AcceptPid = Conn#connection.pending_owner,
     Owners = State#state.conn_owners,
     Pend = lists:keydelete(AcceptPid, 1, State#state.pend_owners),
-    erlang:abort_connection_id(Node, Conn#connection.conn_id),    
+    erts_internal:abort_connection(Node, Conn#connection.conn_id),
     Conn1 = Conn#connection { owner = AcceptPid,
-                              conn_id = erlang:new_connection_id(Node),
+                              conn_id = erts_internal:new_connection(Node),
 			      pending_owner = undefined,
 			      state = pending },
     ets:insert(sys_dist, Conn1),
@@ -1029,7 +1029,7 @@ up_nodedown(Conn, Node, _Reason, Type, State) ->
     State.
 
 mark_sys_dist_nodedown(Conn, Node) ->
-    erlang:abort_connection_id(Node, Conn#connection.conn_id),
+    erts_internal:abort_connection(Node, Conn#connection.conn_id),
     case application:get_env(kernel, dist_auto_connect) of
 	{ok, once} ->
 	    ets:insert(sys_dist, #barred_connection{node = Node});