Added support for multiple registrations in one message

Loop all registrations and fill one message with registrations

Send BMLR req to backbone for every registration inside message

Fixed dua response if error code sent in registration

allow setting of timeout parameters before pbbr is started

Author: Mika Tervonen

source/6LoWPAN/Thread/thread_address_registration_client.c

@@ -100,15 +100,7 @@ void thread_address_registration_timer(protocol_interface_info_entry_t *interfac
         mlr_timer -= seconds;
     } else {
         mlr_timer = mlr_timeout - randLIB_get_random_in_range(30,50);
-        ns_list_foreach(if_group_entry_t, cur, &interface->ip_groups) {
-            if (addr_ipv6_multicast_scope(cur->group) < IPV6_SCOPE_ADMIN_LOCAL) {
-                continue;
-            }
-            if (addr_ipv6_equal(cur->group, ADDR_SITE_LOCAL_ALL_ROUTERS)) {
-                continue;
-            }
-            thread_extension_mcast_subscrition_change(interface, cur, true);
-        }
+        thread_extension_mcast_subscrition_change(interface);
     }
     /* Update global scope addresses (children's as well) */
     if (addr_notificastion_timer > seconds) {

source/6LoWPAN/Thread/thread_extension.c

@@ -328,22 +328,16 @@ void thread_extension_init(int8_t interface_id, int8_t coap_service_id)
     cur->thread_info->extension_info->coap_service_id = coap_service_id;
 }
 
-static int thread_extension_mlr_req_send(protocol_interface_info_entry_t *cur, const uint8_t br_addr[16], const uint8_t address[16])
+static int thread_extension_mlr_req_send(protocol_interface_info_entry_t *cur, const uint8_t br_addr[16], const uint8_t *address, uint8_t address_len)
 {
-    uint8_t payload[2 + 16 + 2 + 4 + 2 + 8];
-    uint8_t *ptr;
 
-    if (!br_addr || !address) {
+    if (!br_addr || !address ) {
         return -1;
     }
-
-    ptr = payload;
-    ptr = thread_meshcop_tlv_data_write(ptr, TMFCOP_TLV_IPV6_ADDRESS, 16, address);
-
     tr_debug("thread MLR.req send");
 
     coap_service_request_send(thread_management_client_service_id_get(cur->id), COAP_REQUEST_OPTIONS_NONE, br_addr, THREAD_MANAGEMENT_PORT,
-                              COAP_MSG_TYPE_CONFIRMABLE, COAP_MSG_CODE_REQUEST_POST, THREAD_URI_BBR_MCAST_LISTENER_REPORT, COAP_CT_OCTET_STREAM, payload, ptr - payload, thread_comercial_mlr_cb);
+                              COAP_MSG_TYPE_CONFIRMABLE, COAP_MSG_CODE_REQUEST_POST, THREAD_URI_BBR_MCAST_LISTENER_REPORT, COAP_CT_OCTET_STREAM, address, address_len, thread_comercial_mlr_cb);
     return 0;
 }
 
@@ -485,22 +479,54 @@ bool thread_extension_aloc_map(protocol_interface_info_entry_t *cur, uint16_t *a
     }
     return false;
 }
+// Amount of Addressess in MLR message 4 fits in one fragment
+#define ADDR_PER_MSG 4
 
-void thread_extension_mcast_subscrition_change(protocol_interface_info_entry_t *interface, if_group_entry_t *group, bool added)
+void thread_extension_mcast_subscrition_change(protocol_interface_info_entry_t *interface)
 {
-    (void) added;
+    uint8_t *addr;
+    uint8_t *ptr;
+    uint8_t addr_len;
     uint8_t br_ml_addr[16];
     uint32_t mlr_timer;
 
-    if (addr_ipv6_multicast_scope(group->group) < IPV6_SCOPE_ADMIN_LOCAL) {
+    if (0 != thread_extension_primary_bbr_get(interface, br_ml_addr, NULL, &mlr_timer, NULL )) {
         return;
     }
-
-    if (0 != thread_extension_primary_bbr_get(interface, br_ml_addr, NULL, &mlr_timer, NULL )) {
+    addr = ns_dyn_mem_temporary_alloc(16*ADDR_PER_MSG + 2);
+    if (!addr) {
         return;
     }
     // MLR is sent only for primary BBR for now, but this might change
-    thread_extension_mlr_req_send(interface, br_ml_addr, group->group);
+    ptr = addr;
+    addr_len = 0;
+    *ptr++ = TMFCOP_TLV_IPV6_ADDRESS;
+    *ptr++ = 0; // Length will be updated later
+    ns_list_foreach(if_group_entry_t, cur, &interface->ip_groups) {
+        if (addr_ipv6_multicast_scope(cur->group) < IPV6_SCOPE_ADMIN_LOCAL) {
+            continue;
+        }
+        if (addr_ipv6_equal(cur->group, ADDR_SITE_LOCAL_ALL_ROUTERS)) {
+            continue;
+        }
+        memcpy(ptr, cur->group,16);
+        ptr +=16;
+        addr_len = ptr - addr;
+        addr[1] = addr_len - 2;// Fill in the length
+        if (addr_len > 16*ADDR_PER_MSG) {
+            // Send first patch
+            thread_extension_mlr_req_send(interface, br_ml_addr, addr, addr_len);
+            // Reset the packet to start
+            ptr = addr;
+            ptr += 2;
+            addr_len = 0;
+        }
+    }
+    if (addr_len != 0) {
+        // Send rest
+        thread_extension_mlr_req_send(interface, br_ml_addr, addr, addr_len);
+    }
+    ns_dyn_mem_free(addr);
 
 #if 0
     ns_list_foreach(thread_network_data_prefix_cache_entry_t, cur, &interface->thread_info->networkDataStorage.localPrefixList) {

source/6LoWPAN/Thread/thread_extension.h

@@ -52,7 +52,7 @@ void thread_extension_address_registration(struct protocol_interface_info_entry
 void thread_extension_address_generate(protocol_interface_info_entry_t *cur);
 void thread_extension_aloc_generate(struct protocol_interface_info_entry *cur);
 bool thread_extension_aloc_map(protocol_interface_info_entry_t *cur, uint16_t *addr16);
-void thread_extension_mcast_subscrition_change(protocol_interface_info_entry_t *interface, if_group_entry_t *group, bool added);
+void thread_extension_mcast_subscrition_change(protocol_interface_info_entry_t *interface);
 void thread_extension_address_registration_trigger(protocol_interface_info_entry_t *interface);
 void thread_extension_route_set(protocol_interface_info_entry_t *cur);
 void thread_extension_activate(protocol_interface_info_entry_t *cur);
@@ -84,7 +84,7 @@ uint8_t *thread_extension_discover_response_write(protocol_interface_info_entry_
 #define thread_extension_address_generate(cur)
 #define thread_extension_aloc_generate(cur)
 #define thread_extension_aloc_map(cur, addr16) false
-#define thread_extension_mcast_subscrition_change(interface, group, added)
+#define thread_extension_mcast_subscrition_change(interface)
 #define thread_extension_route_set(cur)
 #define thread_extension_activate(cur)
 #define thread_extension_enabled(cur) (false)

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -721,18 +721,18 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
     while (remaining > 0) {
         //Go through all addresses
         if (timeout_value == 0) {
-            tr_debug("Multicast address: %s delete", trace_ipv6(addr_ptr));
+            //tr_debug("Multicast address: %s delete", trace_ipv6(addr_ptr));
             addr_multicast_fwd_remove(cur, addr_ptr);
         } else {
-            tr_debug("Multicast address: %s Timeout value: %"PRIu32, trace_ipv6(addr_ptr),timeout_value);
+            //tr_debug("Multicast address: %s Timeout value: %"PRIu32, trace_ipv6(addr_ptr),timeout_value);
             multicast_fwd_add(this->interface_id, addr_ptr, timeout_value);
+            // send BMLR.ntf message to backend
+            thread_extension_bbr_bmlr_req_send(this->br_bb_service_id, this->pbbr_multicast_address, addr_data_ptr, 16, timeout_value);
         }
         addr_ptr += 16;
         remaining -= 16;
     }
 
-    // send BMLR.ntf message to backend
-    thread_extension_bbr_bmlr_req_send(this->br_bb_service_id, this->pbbr_multicast_address, addr_data_ptr, addr_len, timeout_value);
 
 send_response:
 
@@ -760,7 +760,7 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
 {
     (void)source_port;
     uint16_t addr_len, ml_eid_len;
-    uint8_t *addr_data_ptr;
+    uint8_t *addr_data_ptr = NULL;
     uint8_t *ml_eid_ptr;
     uint8_t payload[2 + 16 + 2 + 2 + 1 + 8];
     uint8_t domain_prefix[8];
@@ -872,7 +872,9 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
 
     ptr = payload;
     ptr = thread_tmfcop_tlv_data_write_uint8(ptr, TMFCOP_TLV_STATUS, bbr_status);
-    ptr = thread_meshcop_tlv_data_write(ptr, TMFCOP_TLV_TARGET_EID, 16, addr_data_ptr);
+    if (addr_data_ptr) {
+        ptr = thread_meshcop_tlv_data_write(ptr, TMFCOP_TLV_TARGET_EID, 16, addr_data_ptr);
+    }
     coap_service_response_send(this->coap_service_id, COAP_REQUEST_OPTIONS_NONE, request_ptr, response_code, COAP_CT_OCTET_STREAM, payload, ptr - payload);
     return 0;
 }
@@ -1255,7 +1257,7 @@ int thread_extension_bbr_timeout_set(int8_t interface_id, uint32_t timeout_a, ui
     if(delay) {
         this->delay_timer = delay;
     }
-    if(this->backbone_interface_id < 0) {
+    if(this->backbone_interface_id < 0 || !this->pbbr_started) {
         // it is ok to change default values before the start of pbbr
         return 0;
     }

test/nanostack/unittest/stub/thread_extension_stub.c

@@ -115,11 +115,9 @@ void thread_extension_address_registration(struct protocol_interface_info_entry
     (void)addr;
     (void)child_mac64;
 }
-void thread_extension_mcast_subscrition_change(protocol_interface_info_entry_t *interface, if_group_entry_t *group, bool added)
+void thread_extension_mcast_subscrition_change(protocol_interface_info_entry_t *interface)
 {
     (void)interface;
-    (void)group;
-    (void)added;
 }
 void thread_extension_address_generate(protocol_interface_info_entry_t *cur)
 {