Merge pull request #250 from particle-iot/feature/mesh/pubsub_compat

Feature/mesh/pubsub compat

Author: avtolstoy

hal/network/lwip/openthread/lwip_openthreadif.cpp

@@ -303,11 +303,15 @@ err_t OpenThreadNetif::mldMacFilterCb(netif* netif, const ip6_addr_t *group,
 
     int ret = OT_ERROR_FAILED;
 
+    // A very hacky solution: keep the list of subscriptions on loopback
     if (action == NETIF_ADD_MAC_FILTER) {
+        mld6_joingroup_netif(netif_get_by_index(1), group);
         ret = otIp6SubscribeMulticastAddress(self->ot_, &addr);
     } else if (action == NETIF_DEL_MAC_FILTER) {
+        mld6_leavegroup_netif(netif_get_by_index(1), group);
         ret = otIp6UnsubscribeMulticastAddress(self->ot_, &addr);
     }
+
     return ret == OT_ERROR_NONE ? ERR_OK : ERR_VAL;
 }
 
@@ -464,6 +468,12 @@ void OpenThreadNetif::stateChanged(uint32_t flags) {
             LOG_DEBUG(TRACE, "Subscribed to %s", tmp);
 #endif // DEBUG_BUILD
         }
+        // Go through the list of subscriptions on LwIP side and add them if needed
+        for (struct mld_group* g = netif_mld6_data(netif_get_by_index(1)); g != nullptr; g = g->next) {
+            otIp6Address addr = {};
+            ip6AddrToOtIp6Address(g->group_address, &addr);
+            otIp6SubscribeMulticastAddress(ot_, &addr);
+        }
         interface()->mld_mac_filter = mldMacFilterCb;
     }
 

system/inc/system_dynalib.h

@@ -98,7 +98,6 @@ DYNALIB_FN(BASE_IDX + 13, system, system_pool_alloc, void*(size_t, void*))
 DYNALIB_FN(BASE_IDX + 14, system, system_pool_free, void(void*, void*))
 DYNALIB_FN(BASE_IDX + 15, system, system_sleep_pins, int32_t(const uint16_t*, size_t, const InterruptMode*, size_t, long, uint32_t, void*))
 DYNALIB_FN(BASE_IDX + 16, system, system_invoke_event_handler, int(uint16_t handlerInfoSize, FilteringEventHandler* handlerInfo, const char* event_name, const char* event_data, void* reserved))
-DYNALIB_FN(BASE_IDX + 17, system, system_task_loop, int(system_task_fn fn, void*))
 
 
 DYNALIB_END(system)

system/inc/system_task.h

@@ -109,7 +109,6 @@ int system_invoke_event_handler(uint16_t handlerInfoSize, FilteringEventHandler*
                 const char* event_name, const char* event_data, void* reserved);
 
 typedef int (*system_task_fn)();
-int system_task_loop(system_task_fn fn, void*);
 
 #ifdef __cplusplus
 }

system/src/system_task.cpp

@@ -427,8 +427,6 @@ static void process_isr_task_queue()
     SystemISRTaskQueue.process();
 }
 
-system_task_fn background_task;
-
 #if Wiring_SetupButtonUX
 extern void system_handle_button_clicks(bool isIsr);
 #endif
@@ -457,9 +455,6 @@ void Spark_Idle_Events(bool force_events/*=false*/)
 
         CLOUD_FN(manage_cloud_connection(force_events), (void)0);
 
-        if (background_task) {
-        	background_task();
-        }
         particle::system::fetchAndExecuteCommand(millis());
     }
     else
@@ -662,8 +657,3 @@ int system_invoke_event_handler(uint16_t handlerInfoSize, FilteringEventHandler*
 	invokeEventHandler(handlerInfoSize, handlerInfo, event_name, event_data, reserved);
 	return SYSTEM_ERROR_NONE;
 }
-
-int system_task_loop(system_task_fn fn, void*) {
-	background_task = fn;
-	return SYSTEM_ERROR_NONE;
-}

wiring/inc/spark_wiring_mesh.h

@@ -124,10 +124,9 @@ class MeshPublish {
         // RX packet buffer pool may easily get exhausted, because nobody is reading the data
         // out of the socket. Create a separate thread here with a higher priority than application
         // and system.
-    // system_task_loop(mesh_loop, nullptr);
     }
 
-    int publish(const char* topic, const char* data);
+    int publish(const char* topic, const char* data = nullptr);
 
     int subscribe(const char* prefix, EventHandler handler);