Thread extension commissioning updates (ARMmbed#1828)

Author: Tero Heinonen

source/6LoWPAN/Thread/thread_extension.c

@@ -53,6 +53,7 @@
 #include "6LoWPAN/Thread/thread_extension_bootstrap.h"
 #include "6LoWPAN/Thread/thread_extension_constants.h"
 #include "6LoWPAN/Thread/thread_neighbor_class.h"
+#include "6LoWPAN/Thread/thread_nvm_store.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 #include "Common_Protocols/icmpv6.h"
 #include "NWK_INTERFACE/Include/protocol.h"
@@ -74,6 +75,7 @@ typedef struct thread_extension_info {
     uint8_t sequence_number;
     uint32_t delay_timer;
     uint32_t mlr_timer;
+    timeout_t *reset_timeout;
     uint16_t rloc;
     uint16_t relay_port_ae;
     uint16_t relay_port_nmkp;
@@ -195,6 +197,114 @@ static int thread_extension_mtd_dua_ntf_cb(int8_t service_id, uint8_t source_add
     return 0;
 }
 
+static void thread_extension_reset_timeout_cb(void *arg)
+{
+    protocol_interface_info_entry_t *cur = (protocol_interface_info_entry_t *)arg;
+
+    if (!cur) {
+        return;
+    }
+
+    // Delete all domain stuff and start discovery.
+    thread_extension_bootstrap_network_certificate_set(cur, NULL, 0);
+    thread_extension_bootstrap_network_private_key_set(cur, NULL, 0);
+    thread_nvm_store_active_configuration_remove();
+    thread_nvm_store_mleid_rloc_map_remove();
+    thread_nvm_store_pending_configuration_remove();
+    thread_nvm_store_link_info_clear();
+    thread_joiner_application_link_configuration_delete(cur->id);
+    thread_bootstrap_connection_error(cur->id, CON_ERROR_NETWORK_KICK, NULL);
+}
+
+/*
+ * Commissioner requests to leave this domain
+*/
+static int thread_extension_reset_req_cb(int8_t service_id, uint8_t source_address[static 16], uint16_t source_port, sn_coap_hdr_s *request_ptr)
+{
+    (void) source_address;
+    (void) source_port;
+
+    uint8_t payload[3] = {0};
+    uint8_t *ptr = payload;
+    uint8_t *signature_ptr = NULL;
+    uint16_t session_id = 0;
+    protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(thread_management_server_interface_id_get(service_id));
+
+    if (!cur || !request_ptr) {
+        return -1;
+    }
+
+    tr_debug("Received MGMT_RESET.req");
+
+    // Verify request TLV's: Commissioner Session ID TLV -  Commissioner Token TLV (optional) - Commissioner Signature TLV
+    thread_meshcop_tlv_data_get_uint16(request_ptr->payload_ptr, request_ptr->payload_len, MESHCOP_TLV_COMMISSIONER_SESSION_ID, &session_id);
+    thread_meshcop_tlv_find(request_ptr->payload_ptr, request_ptr->payload_len, MESHCOP_TLV_COMM_SIGNATURE, &signature_ptr);
+
+    if ((session_id != thread_info(cur)->registered_commissioner.session_id) /*|| (signature_ptr == NULL)*/) {  // todo: signature may not come in this early phase of implementors
+        tr_debug("Request parse failed");
+        ptr = thread_meshcop_tlv_data_write_uint8(ptr, MESHCOP_TLV_STATE, -1);
+    }
+
+    // Downgrade if router
+    if (thread_am_router(cur)) {
+        thread_bootstrap_attached_downgrade_router(cur);
+    }
+
+    // Delete all data and start reattach
+    // Get some time to send response and keep the Commissioner happy
+    cur->thread_info->extension_info->reset_timeout = eventOS_timeout_ms(thread_extension_reset_timeout_cb, 5000, cur);
+
+    // Send response
+    coap_service_response_send(service_id, COAP_REQUEST_OPTIONS_NONE, request_ptr, COAP_MSG_CODE_RESPONSE_CHANGED, COAP_CT_NONE, payload, ptr - payload);
+
+    return 0;
+}
+
+
+/*
+ * Commissioner requests to get new certificate from Registrar, but to stay in the same domain
+ */
+static int thread_extension_reenroll_req_cb(int8_t service_id, uint8_t source_address[static 16], uint16_t source_port, sn_coap_hdr_s *request_ptr)
+{
+    (void) source_address;
+    (void) source_port;
+
+    uint8_t pbbr_addr[16] = {0};
+    uint8_t status_tlv[3] = {0};
+    uint8_t *ptr = status_tlv;
+    uint8_t *signature_ptr = NULL;
+    uint16_t session_id = 0;
+    protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(thread_management_server_interface_id_get(service_id));
+
+    if (!cur || !request_ptr) {
+        return -1;
+    }
+
+    tr_debug("Received MGMT_REENROLL.req");
+
+    // Verify request TLV's: Commissioner Session ID TLV -  Commissioner Token TLV (optional) - Commissioner Signature TLV
+    thread_meshcop_tlv_data_get_uint16(request_ptr->payload_ptr, request_ptr->payload_len, MESHCOP_TLV_COMMISSIONER_SESSION_ID, &session_id);
+    thread_meshcop_tlv_find(request_ptr->payload_ptr, request_ptr->payload_len, MESHCOP_TLV_COMM_SIGNATURE, &signature_ptr);
+
+    if ((session_id != thread_info(cur)->registered_commissioner.session_id) ||/* (signature_ptr == NULL) || */
+            thread_extension_primary_bbr_get(cur, pbbr_addr, NULL, NULL, NULL)) {
+        tr_debug("Request parse failed");
+        ptr = thread_meshcop_tlv_data_write_uint8(ptr, MESHCOP_TLV_STATE, -1);
+        goto send_response;
+    }
+
+
+
+    thread_extension_bootstrap_reenrollment_start(cur, service_id, pbbr_addr);
+
+send_response:
+
+    // send response
+    coap_service_response_send(service_id, COAP_REQUEST_OPTIONS_NONE, request_ptr, COAP_MSG_CODE_RESPONSE_CHANGED, COAP_CT_NONE, status_tlv, ptr-status_tlv);
+    return 0;
+}
+
+
 static int thread_extension_primary_bbr_update_needed(struct protocol_interface_info_entry *cur, uint16_t rloc, uint8_t seq)
 {
     if (!cur->thread_info->extension_info) {
@@ -444,6 +554,8 @@ void thread_extension_init(int8_t interface_id, int8_t coap_service_id)
         return;
     }
     cur->thread_info->extension_info->coap_service_id = coap_service_id;
+    coap_service_register_uri(thread_info(cur)->extension_info->coap_service_id, THREAD_URI_RESET_REQ, COAP_SERVICE_ACCESS_POST_ALLOWED, thread_extension_reset_req_cb);
+    coap_service_register_uri(thread_info(cur)->extension_info->coap_service_id, THREAD_URI_REENROLL_REQ, COAP_SERVICE_ACCESS_POST_ALLOWED, thread_extension_reenroll_req_cb);
 }
 
 void thread_extension_mtd_service_register(protocol_interface_info_entry_t *cur)

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -311,6 +311,38 @@ static int thread_pbbr_relay_to_tri_cb(int8_t service_id, uint8_t source_address
     return 0;
 }
 
+static int thread_pbbr_data_req_recv_cb(int8_t service_id, uint8_t source_address[static 16], uint16_t source_port, sn_coap_hdr_s *request_ptr)
+{
+    (void) source_address;
+    (void) source_port;
+
+    uint8_t payload_ptr[18] = {0};
+    uint8_t *request_tlv_ptr;
+    uint16_t request_tlv_len;
+    uint8_t *ptr = payload_ptr;
+    thread_pbbr_t *this = thread_border_router_find_by_service(service_id);
+
+    if (!this || !request_ptr) {
+        return -1;
+    }
+
+    request_tlv_len = thread_tmfcop_tlv_find(request_ptr->payload_ptr, request_ptr->payload_len, MESHCOP_TLV_GET, &request_tlv_ptr);
+
+    if (0 == request_tlv_len) {
+        //error handling
+        return 0;
+    }
+
+    if (thread_meshcop_tlv_list_type_available(request_tlv_ptr, request_tlv_len, MESHCOP_TLV_REGISTRAR_IPV6_ADDRESS)) {
+        tr_debug("Registrar IPv6 address requested");
+        ptr = thread_meshcop_tlv_data_write(ptr, MESHCOP_TLV_REGISTRAR_IPV6_ADDRESS, 16, this->tri_address);
+    }
+
+    coap_service_response_send(this->coap_service_id, COAP_REQUEST_OPTIONS_NONE,request_ptr, COAP_MSG_CODE_RESPONSE_CHANGED, COAP_CT_OCTET_STREAM, payload_ptr, ptr - payload_ptr);
+
+    return 0;
+}
+
 static int thread_pbbr_nmkp_relay_rx_recv_cb(int8_t service_id, uint8_t source_address[static 16], uint16_t source_port, sn_coap_hdr_s *request_ptr)
 {
     thread_pbbr_t *this = thread_border_router_find_by_service(service_id);
@@ -1032,6 +1064,7 @@ static int thread_extension_bbr_pbbr_stop(thread_pbbr_t *this)
     coap_service_unregister_uri(this->coap_service_id, THREAD_URI_BBR_NMK_RX_NTF);
     coap_service_unregister_uri(this->coap_service_id, THREAD_URI_BBR_DOMAIN_ADDRESS_REGISTRATION);
     coap_service_unregister_uri(this->coap_service_id, THREAD_URI_BBR_MCAST_LISTENER_REPORT);
+    coap_service_unregister_uri(this->coap_service_id, THREAD_URI_BBR_DATA_REQ);
 
     coap_service_delete(this->br_bb_service_id);
     this->br_bb_service_id = -1;
@@ -1108,6 +1141,8 @@ static int thread_extension_bbr_pbbr_start(thread_pbbr_t *this)
     // Register Mesh side relay URI
     coap_service_register_uri(this->coap_service_id, THREAD_URI_BBR_TRI_RX_NTF, COAP_SERVICE_ACCESS_POST_ALLOWED, thread_pbbr_relay_to_tri_cb);
     coap_service_register_uri(this->coap_service_id, THREAD_URI_BBR_NMK_RX_NTF, COAP_SERVICE_ACCESS_POST_ALLOWED, thread_pbbr_nmkp_relay_rx_recv_cb);
+    // Register BBR data request URI
+    coap_service_register_uri(this->coap_service_id, THREAD_URI_BBR_DATA_REQ, COAP_SERVICE_ACCESS_GET_ALLOWED, thread_pbbr_data_req_recv_cb);
 
     // create secure service for Network master key provisioning
     this->coap_nmkp_virtual_service_id = coap_service_initialize(this->interface_id, THREAD_MANAGEMENT_PORT, COAP_SERVICE_OPTIONS_SECURE | COAP_SERVICE_OPTIONS_VIRTUAL_SOCKET, thread_pbbr_pskd_security_start_cb, NULL);