Primary BBR fixes from interop (ARMmbed#1512)

Add support for multible address
add support for commissioner deregister and permanent register

Removed extra coap service and started using the correct

Author: Mika Tervonen

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -80,7 +80,6 @@ typedef struct {
     int8_t interface_id;
     int8_t coap_service_id;
     int8_t coap_nmkp_virtual_service_id;
-    int8_t br_service_id;
     int8_t backbone_interface_id;
     int8_t br_bb_service_id;
     bool pbbr_started:1;
@@ -146,7 +145,7 @@ static thread_pbbr_t *thread_border_router_find_by_service(int8_t service_id)
 {
     thread_pbbr_t *this = NULL;
     ns_list_foreach(thread_pbbr_t, cur_br, &pbbr_instance_list) {
-        if (cur_br->coap_service_id == service_id || cur_br->br_service_id == service_id ||
+        if (cur_br->coap_service_id == service_id ||
             cur_br->br_bb_service_id == service_id || cur_br->coap_nmkp_virtual_service_id == service_id) {
             this = cur_br;
             break;
@@ -547,17 +546,17 @@ static int thread_pbbr_bb_ans_cb(int8_t service_id, uint8_t source_address[16],
     // If delayed DUA registration entry is present send duplicate error code to DUA.response
     return 0;
 }
-static int thread_extension_bbr_bmlr_req_send(int8_t service_id, const uint8_t br_addr[16], const uint8_t address[16], uint32_t timeout)
+static int thread_extension_bbr_bmlr_req_send(int8_t service_id, const uint8_t br_addr[16], const uint8_t *address_ptr, uint8_t addr_len, uint32_t timeout)
 {
     uint8_t payload[2 + 16 + 2 + 4 + 2];
     uint8_t *ptr;
 
-    if (!br_addr || !address) {
+    if (!br_addr || !address_ptr) {
         return -1;
     }
 
     ptr = payload;
-    ptr = thread_meshcop_tlv_data_write(ptr, TMFCOP_TLV_IPV6_ADDRESS, 16, address);
+    ptr = thread_meshcop_tlv_data_write(ptr, TMFCOP_TLV_IPV6_ADDRESS, addr_len, address_ptr);
     ptr = thread_meshcop_tlv_data_write_uint32(ptr, TMFCOP_TLV_TIMEOUT, timeout);
 
     tr_debug("thread BMLR.ntf send; timeout: %"PRIu32, timeout);
@@ -573,6 +572,7 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
     (void)source_port;
 
     uint16_t addr_len;
+    uint16_t session_id;
     uint8_t *addr_data_ptr;
     uint32_t timeout_value;
     uint8_t bbr_rloc_addr[16];
@@ -595,8 +595,6 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
     timeout_value = this->mlr_timeout;
 
     addr_len = thread_meshcop_tlv_find(request_ptr->payload_ptr, request_ptr->payload_len, TMFCOP_TLV_IPV6_ADDRESS, &addr_data_ptr);
-    //TODO in future check if commissioner
-    //thread_meshcop_tlv_data_get_uint32(request_ptr->payload_ptr, request_ptr->payload_len, TMFCOP_TLV_TIMEOUT, &timeout_value);
 
     // check if we are not primary bbr respond status 5
     if (0 != thread_extension_primary_bbr_get(cur, bbr_rloc_addr, NULL, NULL, NULL) ||
@@ -605,21 +603,45 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
         bbr_status = THREAD_BBR_STATUS_NOT_PRIMARY_BBR;
         goto send_response;
     }
+    if (2 <= thread_meshcop_tlv_data_get_uint16(request_ptr->payload_ptr, request_ptr->payload_len, MESHCOP_TLV_COMMISSIONER_SESSION_ID, &session_id)) {
+        //check if commissioner
+        // Session id present must be valid
+        tr_info("message from commissioner");
+        if (cur->thread_info->registered_commissioner.session_id != session_id) {
+            tr_warn("Invalid commissioner session id");
+            bbr_status = THREAD_BBR_STATUS_NOT_SPECIFIED;
+            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");
+        }
+    }
 
-    // TODO this can have multiple address please process all
-    if ( addr_len != 16) {
+    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;
         goto send_response;
     }
-
-    tr_debug("Multicast address: %s Timeout value: %"PRIu32, trace_ipv6(addr_data_ptr),timeout_value);
-
-    // TODO do not decrease the timeout value, but only applies if commissioner support added
-    multicast_fwd_add(this->interface_id, addr_data_ptr, timeout_value);
+    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);
+        } 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);
+        }
+        addr_ptr += 16;
+        remaining -= 16;
+    }
 
     // send BMLR.ntf message to backend
-    thread_extension_bbr_bmlr_req_send(this->br_service_id, this->pbbr_multicast_address, addr_data_ptr, timeout_value);
+    thread_extension_bbr_bmlr_req_send(this->br_bb_service_id, this->pbbr_multicast_address, addr_data_ptr, addr_len, timeout_value);
 
 send_response: