commit 8b5ce64c2f5bbf106cabfd015bcb3bdb2e0248d3
author Li Cao <irvingcl@google.com> Tue Jan 09 14:47:13 2024 +0800
committer GitHub <noreply@github.com> Mon Jan 08 22:47:13 2024 -0800
tree c9141bf3f932aecf16950b77ced1d29cc0a77da5
parent d6b2b9e67f4f9afeaf4de1dbe9d98c93af387a11

[spinel] handle new spinel net role DISABLED (#517)

src/ncp-spinel/SpinelNCPInstance.cpp

diff --git a/src/ncp-spinel/SpinelNCPInstance.cpp b/src/ncp-spinel/SpinelNCPInstance.cpp
index d45530b..0ec5e89 100644
--- a/src/ncp-spinel/SpinelNCPInstance.cpp
+++ b/src/ncp-spinel/SpinelNCPInstance.cpp
@@ -5767,6 +5767,7 @@
 
 			if (ncp_state_is_joining_or_joined(get_ncp_state())
 			  && (value != SPINEL_NET_ROLE_DETACHED)
+                          && (value != SPINEL_NET_ROLE_DISABLED)
 			) {
 				change_ncp_state(ASSOCIATED);
 			}
@@ -5784,7 +5785,7 @@
 			} else if (value == SPINEL_NET_ROLE_LEADER) {
 				update_node_type(LEADER);
 
-			} else if (value == SPINEL_NET_ROLE_DETACHED) {
+                        } else if (value == SPINEL_NET_ROLE_DETACHED || value == SPINEL_NET_ROLE_DISABLED) {
 				update_node_type(UNKNOWN);
 				if (ncp_state_is_associated(get_ncp_state())) {
 					change_ncp_state(ISOLATED);

third_party/openthread/src/ncp/spinel.h

diff --git a/third_party/openthread/src/ncp/spinel.h b/third_party/openthread/src/ncp/spinel.h
index 9c192d9..0d988b5 100644
--- a/third_party/openthread/src/ncp/spinel.h
+++ b/third_party/openthread/src/ncp/spinel.h
@@ -504,6 +504,7 @@
     SPINEL_NET_ROLE_CHILD    = 1,
     SPINEL_NET_ROLE_ROUTER   = 2,
     SPINEL_NET_ROLE_LEADER   = 3,
+    SPINEL_NET_ROLE_DISABLED = 4,
 } spinel_net_role_t;
 
 typedef enum
@@ -2090,6 +2091,7 @@
      *  SPINEL_NET_ROLE_CHILD    = 1,
      *  SPINEL_NET_ROLE_ROUTER   = 2,
      *  SPINEL_NET_ROLE_LEADER   = 3,
+     *  SPINEL_NET_ROLE_DISABLED = 4,
      *
      */
     SPINEL_PROP_NET_ROLE = SPINEL_PROP_NET__BEGIN + 3,