Fix MLR message handling

Respond to MLR message with address TLV if failure

Check that address is multicast scope
Add correct scope for Commissioner session ID in MLR message

Author: Mika Tervonen

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -672,7 +672,7 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
     uint32_t timeout_value;
     uint8_t bbr_rloc_addr[16];
     uint8_t bbr_status = THREAD_BBR_STATUS_SUCCESS;
-    uint8_t payload[4];
+    uint8_t payload[4 + 18];
     uint8_t *ptr;
 
     tr_info("Thread BBR MLR.ntf receive");
@@ -703,7 +703,7 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
     }
 
     //check if commissioner
-    if (2 <= thread_meshcop_tlv_data_get_uint16(request_ptr->payload_ptr, request_ptr->payload_len, MESHCOP_TLV_COMMISSIONER_SESSION_ID, &session_id)) {
+    if (2 <= thread_meshcop_tlv_data_get_uint16(request_ptr->payload_ptr, request_ptr->payload_len, TMFCOP_TLV_COMMISSIONER_SESSION_ID, &session_id)) {
         // Session id present must be valid
         tr_info("message from commissioner");
         if (cur->thread_info->registered_commissioner.session_id != session_id) {
@@ -712,32 +712,45 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
             goto send_response;
         }
         thread_meshcop_tlv_data_get_uint32(request_ptr->payload_ptr, request_ptr->payload_len, TMFCOP_TLV_TIMEOUT, &timeout_value);
-        if (timeout_value == 0xffffffff) {
-            tr_info("Store multicast address to NVM");
-        }
     }
 
+    int16_t remaining = addr_len;
+    uint8_t *addr_ptr = addr_data_ptr;
+    uint8_t *invalid_addr_ptr = NULL;
+
     if ( addr_len < 16 ||
          addr_len % 16 != 0 ) {
         // Address must be more than 16 and can be multible
         tr_err("Invalid /n/mr message");
-        response_code = COAP_MSG_CODE_RESPONSE_BAD_REQUEST;
+        if(addr_len >= 16) {
+            invalid_addr_ptr = addr_ptr;
+        }
+        bbr_status = THREAD_BBR_STATUS_TARGET_EID_NOT_VALID;
         goto send_response;
     }
 
-    int16_t remaining = addr_len;
-    uint8_t *addr_ptr = addr_data_ptr;
-
     while (remaining > 0) {
         //Go through all addresses
-        if (timeout_value == 0) {
-            //tr_debug("Multicast address: %s delete", trace_ipv6(addr_ptr));
-            addr_multicast_fwd_remove(cur, addr_ptr);
+        if (!addr_is_ipv6_multicast(addr_ptr)) {
+            bbr_status = THREAD_BBR_STATUS_TARGET_EID_NOT_VALID;
+            if (!invalid_addr_ptr) {
+                invalid_addr_ptr = addr_ptr;
+            }
         } else {
-            //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);
+            if (timeout_value == 0) {
+                //tr_debug("Multicast address: %s delete", trace_ipv6(addr_ptr));
+                addr_multicast_fwd_remove(cur, addr_ptr);
+                // TODO remove address from NVM
+                tr_info("delete multicast address from NVM");
+            } else {
+                //tr_debug("Multicast address: %s Timeout value: %"PRIu32, trace_ipv6(addr_ptr),timeout_value);
+                multicast_fwd_add(this->interface_id, addr_ptr, timeout_value);
+                if (timeout_value == 0xffffffff) {
+                    tr_info("Store multicast address to NVM");
+                }
+                // 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;
@@ -748,6 +761,9 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
 
     if (request_ptr->msg_type == COAP_MSG_TYPE_CONFIRMABLE) {
         ptr = thread_tmfcop_tlv_data_write_uint8(ptr, TMFCOP_TLV_STATUS, bbr_status);
+        if (invalid_addr_ptr) {
+            ptr = thread_meshcop_tlv_data_write(ptr, TMFCOP_TLV_IPV6_ADDRESS, 16, invalid_addr_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;
     }

source/6LoWPAN/Thread/thread_extension_constants.h

@@ -106,6 +106,7 @@ typedef struct discovery_additional_info {
 #define TMFCOP_TLV_NETWORK_NAME                            12
 #define TMFCOP_TLV_SEQUENCE_NUMBER                         13
 #define TMFCOP_TLV_IPV6_ADDRESS                            14
+#define TMFCOP_TLV_COMMISSIONER_SESSION_ID                 15
 
 #define THREAD_CONTENT_FORMAT_AUDITNONCE                   (sn_coap_content_format_e)65000
 #define THREAD_CONTENT_FORMAT_PKCS10                       (sn_coap_content_format_e)65003