From 2fdb720afae539971a644daf999f230c141f3bbb Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Tue, 19 Nov 2024 17:40:04 +0100 Subject: [PATCH 1/3] [erts] Fixed admin state type (for mib_if_row()) OTP-19366 --- erts/preloaded/ebin/prim_net.beam | Bin 11604 -> 11608 bytes erts/preloaded/src/prim_net.erl | 7 +------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/erts/preloaded/ebin/prim_net.beam b/erts/preloaded/ebin/prim_net.beam index 0495ec0d779be666c496f153be7d7ae05f60615b..f61f99a380cf1abde318d59f70eb8f990e87e0f2 100644 GIT binary patch delta 8838 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 T8d3v+g9btUp#M^Y*vbD7@~7pv delta 8817 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 CXu}Ku diff --git a/erts/preloaded/src/prim_net.erl b/erts/preloaded/src/prim_net.erl index d70201d12902..26b26981d0ff 100644 --- a/erts/preloaded/src/prim_net.erl +++ b/erts/preloaded/src/prim_net.erl @@ -109,12 +109,7 @@ -type if_type() :: other | ethernet_csmacd | iso88025_tokenring | fddi | ppp | software_loopback | atm | ieee80211 | tunnel | ieee1394 | ieee80216_wman | wwanpp | wwanpp2. --type if_admin_status() :: non_operational | - unreachable | - disconnected | - connecting | connected | - operational | - non_neg_integer(). +-type if_admin_status() :: enabled | disabled. -type internal_if_oper_status() :: non_operational | unreachable | disconnected | From 4f0a5742c79e07915b518b8e520acd2ee4b613b2 Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Tue, 19 Nov 2024 17:04:38 +0100 Subject: [PATCH 2/3] [erts,kernel] Fized admin status encoding OTP-19366 --- erts/emulator/nifs/common/prim_net_nif.c | 26 ++---------- lib/kernel/src/net.erl | 50 +++++++++++++----------- 2 files changed, 32 insertions(+), 44 deletions(-) diff --git a/erts/emulator/nifs/common/prim_net_nif.c b/erts/emulator/nifs/common/prim_net_nif.c index 8655c561e394..10c487ae8c96 100644 --- a/erts/emulator/nifs/common/prim_net_nif.c +++ b/erts/emulator/nifs/common/prim_net_nif.c @@ -3334,28 +3334,10 @@ ERL_NIF_TERM encode_if_admin_status(ErlNifEnv* env, { ERL_NIF_TERM estatus; - switch (status) { - case IF_OPER_STATUS_NON_OPERATIONAL: - estatus = atom_non_operational; - break; - case IF_OPER_STATUS_UNREACHABLE: - estatus = atom_unreachable; - break; - case IF_OPER_STATUS_DISCONNECTED: - estatus = atom_disconnected; - break; - case IF_OPER_STATUS_CONNECTING: - estatus = esock_atom_connecting; - break; - case IF_OPER_STATUS_CONNECTED: - estatus = esock_atom_connected; - break; - case IF_OPER_STATUS_OPERATIONAL: - estatus = atom_operational; - break; - default: - estatus = MKUI(env, status); - break; + if (status) { + estatus = atom_enabled; + } else { + estatus = atom_disabled; } return estatus; diff --git a/lib/kernel/src/net.erl b/lib/kernel/src/net.erl index 1da565ac6972..7901b88e5c3d 100644 --- a/lib/kernel/src/net.erl +++ b/lib/kernel/src/net.erl @@ -443,7 +443,7 @@ win_getifaddrs_iat3(Name, bcast_addr := _BCastAddr} = _IpAddr, #{type := Type, admin_status := AStatus, - internal_oper_status := _OStatus, + internal_oper_status := OStatus, phys_addr := PhysAddr, index := Idx} = _IfEntry) -> Flags1 = case Type of @@ -455,16 +455,19 @@ win_getifaddrs_iat3(Name, [] end, Flags2 = case AStatus of - non_operational -> - []; - connecting -> - [up, pointtopoint]; - connected -> - [up, runnning, pointtopoint]; - operational -> - [up, running]; - _ -> - [up] + enabled -> + case OStatus of + connecting -> + [up, pointtopoint]; + connected -> + [up, runnning, pointtopoint]; + operational -> + [up, running]; + _ -> + [up] + end; + disabled -> + [] end, Flags = lists:sort(Flags1 ++ Flags2), HaType = type2hatype(Type), @@ -540,7 +543,7 @@ win_getifaddrs_aa3(Name, prefixes := Prefixes} = _AdAddrs, #{type := Type, admin_status := AStatus, - internal_oper_status := _OStatus, + internal_oper_status := OStatus, phys_addr := PhysAddr, index := Idx} = _IfEntry) -> Flags1 = @@ -558,16 +561,19 @@ win_getifaddrs_aa3(Name, [] end, Flags3 = case AStatus of - non_operational -> - []; - connecting -> - [up, pointtopoint]; - connected -> - [up, runnning, pointtopoint]; - operational -> - [up, running]; - _ -> - [up] + enabled -> + case OStatus of + connecting -> + [up, pointtopoint]; + connected -> + [up, runnning, pointtopoint]; + operational -> + [up, running]; + _ -> + [up] + end; + disabled -> + [] end, Flags = lists:sort(Flags1 ++ Flags2 ++ Flags3), HaType = type2hatype(Type), From 99ba814974a6ec7fe84c8faf0652d2a1796f1493 Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Fri, 22 Nov 2024 09:50:06 +0100 Subject: [PATCH 3/3] [erts|esock] Add creation of atoms enabled and disabled OTP-19366 --- erts/emulator/nifs/common/prim_net_nif.c | 4 ++-- erts/emulator/nifs/common/prim_socket_nif.c | 2 ++ erts/emulator/nifs/common/socket_int.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/erts/emulator/nifs/common/prim_net_nif.c b/erts/emulator/nifs/common/prim_net_nif.c index 10c487ae8c96..edb4a3653da6 100644 --- a/erts/emulator/nifs/common/prim_net_nif.c +++ b/erts/emulator/nifs/common/prim_net_nif.c @@ -3335,9 +3335,9 @@ ERL_NIF_TERM encode_if_admin_status(ErlNifEnv* env, ERL_NIF_TERM estatus; if (status) { - estatus = atom_enabled; + estatus = esock_atom_enabled; } else { - estatus = atom_disabled; + estatus = esock_atom_disabled; } return estatus; diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c index b80f7bea5f6f..d28152797971 100644 --- a/erts/emulator/nifs/common/prim_socket_nif.c +++ b/erts/emulator/nifs/common/prim_socket_nif.c @@ -2003,6 +2003,7 @@ static const struct in6_addr in6addr_loopback = GLOBAL_ATOM_DECL(default_send_params); \ GLOBAL_ATOM_DECL(delayed_ack_time); \ GLOBAL_ATOM_DECL(dgram); \ + GLOBAL_ATOM_DECL(disabled); \ GLOBAL_ATOM_DECL(disable_fragments); \ GLOBAL_ATOM_DECL(dlci); \ GLOBAL_ATOM_DECL(dma); \ @@ -2021,6 +2022,7 @@ static const struct in6_addr in6addr_loopback = GLOBAL_ATOM_DECL(eether); \ GLOBAL_ATOM_DECL(efile); \ GLOBAL_ATOM_DECL(egp); \ + GLOBAL_ATOM_DECL(enabled); \ GLOBAL_ATOM_DECL(enotsup); \ GLOBAL_ATOM_DECL(eor); \ GLOBAL_ATOM_DECL(error); \ diff --git a/erts/emulator/nifs/common/socket_int.h b/erts/emulator/nifs/common/socket_int.h index 0d0dbc059e96..5514ae48e35e 100644 --- a/erts/emulator/nifs/common/socket_int.h +++ b/erts/emulator/nifs/common/socket_int.h @@ -281,6 +281,7 @@ typedef long ssize_t; GLOBAL_ATOM_DEF(default_send_params); \ GLOBAL_ATOM_DEF(delayed_ack_time); \ GLOBAL_ATOM_DEF(dgram); \ + GLOBAL_ATOM_DEF(disabled); \ GLOBAL_ATOM_DEF(disable_fragments); \ GLOBAL_ATOM_DEF(dlci); \ GLOBAL_ATOM_DEF(dma); \ @@ -299,6 +300,7 @@ typedef long ssize_t; GLOBAL_ATOM_DEF(eether); \ GLOBAL_ATOM_DEF(efile); \ GLOBAL_ATOM_DEF(egp); \ + GLOBAL_ATOM_DEF(enabled); \ GLOBAL_ATOM_DEF(enotsup); \ GLOBAL_ATOM_DEF(eor); \ GLOBAL_ATOM_DEF(error); \