From 9a1a6206d0920112df40ec7c682b3a481c52df84 Mon Sep 17 00:00:00 2001
From: Abtin Keshavarzian <abtink@nestlabs.com>
Date: Fri, 29 Jul 2016 17:53:40 -0700
Subject: [PATCH] NcpBase: Change/Fix the set/get property handlers for
 NET_STAT (#305)

This commit addresses some issues with the set/get property handlers
of `NET_STAT` to ensure that wpantund/wpanctl commands "join"/"leave"
operate as expected.
---
 src/ncp/ncp_base.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp
index 4fbdd9f76..d17f6afd3 100644
--- a/src/ncp/ncp_base.cpp
+++ b/src/ncp/ncp_base.cpp
@@ -1354,7 +1354,7 @@ void NcpBase::GetPropertyHandler_NET_STATE(uint8_t header, spinel_prop_key_t key
 {
     spinel_net_state_t state(SPINEL_NET_STATE_OFFLINE);
 
-    if (!otInterfaceUp())
+    if (!otIsInterfaceUp())
     {
         state = SPINEL_NET_STATE_OFFLINE;
     }
@@ -2267,6 +2267,11 @@ void NcpBase::SetPropertyHandler_NET_STATE(uint8_t header, spinel_prop_key_t key
                 errorCode = otInterfaceDown();
             }
 
+            if ((errorCode == kThreadError_None) && (otGetDeviceRole() != kDeviceRoleDisabled))
+            {
+                errorCode = otThreadStop();
+            }
+
             break;
 
         case SPINEL_NET_STATE_DETACHED:
@@ -2289,9 +2294,18 @@ void NcpBase::SetPropertyHandler_NET_STATE(uint8_t header, spinel_prop_key_t key
                 errorCode = otInterfaceUp();
             }
 
-            if ((errorCode == kThreadError_None) && (otGetDeviceRole() == kDeviceRoleDetached))
+            if ((errorCode == kThreadError_None) &&
+                ((otGetDeviceRole() == kDeviceRoleDisabled) || (otGetDeviceRole() == kDeviceRoleDetached)))
             {
-                errorCode = otThreadStart();
+                if (otGetDeviceRole() == kDeviceRoleDetached)
+                {
+                    errorCode = otThreadStop();
+                }
+
+                if (errorCode == kThreadError_None)
+                {
+                    errorCode = otThreadStart();
+                }
 
                 if (errorCode == kThreadError_None)
                 {