Merge pull request #10434 from michalpasztamobica/nanostack_network_handler_fix

adbridge · web-flow · commit 016ce322b44d · 2019-04-26T13:33:46.000+01:00
Nanostack network handle does not always call status cb for BOOTSTRAP events
diff --git a/features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp b/features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
@@ -149,8 +149,9 @@ void Nanostack::Interface::network_handler(mesh_connection_status_t status)
         _connect_status = NSAPI_STATUS_DISCONNECTED;
     }
 
-    if (_connection_status_cb && _previous_connection_status != _connect_status) {
-
+    if (_connection_status_cb && _previous_connection_status != _connect_status
+            && (_previous_connection_status != NSAPI_STATUS_GLOBAL_UP || status != MESH_BOOTSTRAP_STARTED)
+            && (_previous_connection_status != NSAPI_STATUS_CONNECTING || status != MESH_BOOTSTRAP_START_FAILED)) {
         _connection_status_cb(NSAPI_EVENT_CONNECTION_STATUS_CHANGE, _connect_status);
     }
     _previous_connection_status = _connect_status;

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,9 @@ void Nanostack::Interface::network_handler(mesh_connection_status_t status)`
`149`	`149`	`_connect_status = NSAPI_STATUS_DISCONNECTED;`
`150`	`150`	`}`
`151`	`151`
`152`		`- if (_connection_status_cb && _previous_connection_status != _connect_status) {`
`153`		`-`
	`152`	`+ if (_connection_status_cb && _previous_connection_status != _connect_status`
	`153`	`+ && (_previous_connection_status != NSAPI_STATUS_GLOBAL_UP \|\| status != MESH_BOOTSTRAP_STARTED)`
	`154`	`+ && (_previous_connection_status != NSAPI_STATUS_CONNECTING \|\| status != MESH_BOOTSTRAP_START_FAILED)) {`
`154`	`155`	`_connection_status_cb(NSAPI_EVENT_CONNECTION_STATUS_CHANGE, _connect_status);`
`155`	`156`	`}`
`156`	`157`	`_previous_connection_status = _connect_status;`