Move thread commercial code to own file (#1470)

Separate thread 1.2 code from 1.1 code.

Author: Tero Heinonen

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -45,6 +45,7 @@
 #include "6LoWPAN/Thread/thread_border_router_api_internal.h"
 #include "6LoWPAN/Thread/thread_beacon.h"
 #include "6LoWPAN/Thread/thread_nvm_store.h"
+#include "6LoWPAN/Thread/thread_commercial_bootstrap.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 #include "6LoWPAN/Thread/thread_mle_message_handler.h"
 #include "mac_api.h"
@@ -88,11 +89,6 @@ static void thread_neighbor_remove(int8_t interface_id, mle_neigh_table_entry_t
 static void thread_bootsrap_network_join_start(struct protocol_interface_info_entry *cur_interface, discovery_response_list_t *nwk_info);
 static int8_t thread_child_keep_alive(int8_t interface_id, const uint8_t *mac64);
 
-static int stringlen(const char *s, int n)
-{
-    char *end = memchr(s, 0, n);
-    return end?end-s:n;
-}
 
 int thread_bootstrap_reset_child_info(protocol_interface_info_entry_t *cur, mle_neigh_table_entry_t *child)
 {
@@ -1942,33 +1938,7 @@ static void thread_network_select_by_steering_data(device_configuration_s *devic
 
 static void thread_network_select(struct protocol_interface_info_entry *interface_prt, device_configuration_s *device_configuration_ptr, thread_nwk_discovery_response_list_t *discover_response)
 {
-    discovery_response_list_t *discovered_network_ptr = NULL;
-
-    if (thread_info(interface_prt)->version == THREAD_VERSION_1_2 && thread_info(interface_prt)->ccm_ptr) {
-        /* If we have domain certificate, search for domain to join */
-        if (thread_info(interface_prt)->ccm_ptr->domain_certificate_ptr) {
-            ns_list_foreach_safe(discovery_response_list_t, cur_class, discover_response) {
-                if ((stringlen((const char*) cur_class->thread_domain, 16)) &&
-                        (!memcmp(cur_class->thread_domain, thread_info(interface_prt)->ccm_ptr->domain_name, stringlen((const char*) cur_class->thread_domain, 16))))
-                {
-                    discovered_network_ptr = cur_class;
-                    break;
-                }
-            }
-        }
-
-        /* No domain, use device certificate*/
-        if (!discovered_network_ptr) {
-            ns_list_foreach_safe(discovery_response_list_t, cur_class, discover_response) {
-                if (cur_class->ccm_supported)
-                {
-                    discovered_network_ptr = cur_class;
-                    break;
-                }
-            }
-        }
-    }
-
+    discovery_response_list_t *discovered_network_ptr = thread_commercial_bootstrap_network_select(interface_prt, discover_response);
 
     /* If network found */
     if (discovered_network_ptr) {
@@ -2169,17 +2139,7 @@ static void thread_bootsrap_network_join_start(struct protocol_interface_info_en
     tr_debug("Start commission with %s", trace_ipv6(parentLLAddress));
     cur_interface->bootsrap_state_machine_cnt = 0;
 
-    if (thread_info(cur_interface)->version == THREAD_VERSION_1_2 && thread_info(cur_interface)->ccm_ptr) {
-        if (thread_info(cur_interface)->ccm_ptr->domain_certificate_ptr && nwk_info->nmk_port) {
-            thread_joiner_application_nmkp_commission_start(cur_interface->id, parentLLAddress, nwk_info->nmk_port, thread_bootstrap_joiner_application_commission_done_cb);
-        } else if (thread_info(cur_interface)->ccm_ptr->device_certificate_ptr && nwk_info->ae_port) {
-            thread_joiner_application_ae_commission_start(cur_interface->id, parentLLAddress, nwk_info->ae_port, thread_bootstrap_joiner_application_commission_done_cb);
-        } else if (nwk_info->joiner_port) {
-            thread_joiner_application_pskd_commission_start(cur_interface->id, parentLLAddress, nwk_info->joiner_port, nwk_info->pan_id, nwk_info->extented_pan_id, nwk_info->channel, thread_bootstrap_joiner_application_commission_done_cb);
-        } else {
-            return;
-        }
-    } else {
+    if (0 > thread_commercial_bootstrap_commission_start(cur_interface, parentLLAddress, nwk_info, thread_bootstrap_joiner_application_commission_done_cb)) {
         thread_joiner_application_pskd_commission_start(cur_interface->id, parentLLAddress, nwk_info->joiner_port, nwk_info->pan_id, nwk_info->extented_pan_id, nwk_info->channel, thread_bootstrap_joiner_application_commission_done_cb);
     }
     ns_dyn_mem_free(nwk_info);

source/6LoWPAN/Thread/thread_commercial.c

@@ -24,6 +24,8 @@
 #include "6LoWPAN/Thread/thread_management_internal.h"
 #include "6LoWPAN/Thread/thread_management_server.h"
 #include "6LoWPAN/Thread/thread_address_registration_client.h"
+#include "6LoWPAN/Thread/thread_discovery.h"
+#include "6LoWPAN/Thread/thread_commercial_bootstrap.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
@@ -49,11 +51,6 @@ typedef struct thread_commercial_info {
     bool update_needed:1;
 } thread_commercial_info_t;
 
-static int stringlen(const char *s, int n)
-{
-    char *end = memchr(s, 0, n);
-    return end?end-s:n;
-}
 
 static int thread_commercial_dua_registration_cb(int8_t service_id, uint8_t source_address[static 16], uint16_t source_port, sn_coap_hdr_s *response_ptr)
 {
@@ -746,6 +743,7 @@ bool thread_commercial_joining_enabled(int8_t interface_id)
 uint8_t thread_commercial_discover_response_len(protocol_interface_info_entry_t *cur)
 {
     uint8_t length = 0;
+    uint8_t domain_name_len;
     // AE port
     if (!cur || !cur->thread_info->commercial_info) {
         return 0;
@@ -761,8 +759,9 @@ uint8_t thread_commercial_discover_response_len(protocol_interface_info_entry_t
     if (cur->thread_info->version == THREAD_VERSION_1_2 && thread_info(cur)->ccm_ptr) {
         // Calculate also following optional TLV's:
         // Thread domain name TLV
-        if (stringlen((const char *)thread_info(cur)->ccm_ptr->domain_name, 16)) {
-            length += (stringlen((const char *)thread_info(cur)->ccm_ptr->domain_name, 16)) + 2;
+        domain_name_len = thread_commercial_bootstrap_domain_name_length_get(cur);
+        if (domain_name_len) {
+            length += domain_name_len + 2;
         }
         // AE steering data
         // NMKP Steering Data
@@ -785,8 +784,8 @@ uint8_t *thread_commercial_discover_response_write(protocol_interface_info_entry
     /* Thread 1.2 CCM add-ons */
     if (cur->thread_info->version == THREAD_VERSION_1_2 && thread_info(cur)->ccm_ptr) {
         // Thread domain name TLV
-        if (stringlen((const char *)thread_info(cur)->ccm_ptr->domain_name, 16)) {
-            ptr = thread_meshcop_tlv_data_write(ptr, MESHCOP_TLV_DOMAIN_NAME, stringlen((const char *)thread_info(cur)->ccm_ptr->domain_name, 16), thread_info(cur)->ccm_ptr->domain_name);
+        if (thread_commercial_bootstrap_domain_name_length_get(cur)) {
+            ptr = thread_meshcop_tlv_data_write(ptr, MESHCOP_TLV_DOMAIN_NAME, thread_commercial_bootstrap_domain_name_length_get(cur), thread_commercial_bootstrap_domain_name_ptr_get(cur));
         }
         // Build also following optional TLV's, when supported:
         // AE steering data

source/6LoWPAN/Thread/thread_commercial_bbr.c

@@ -23,6 +23,8 @@
 #include "6LoWPAN/Thread/thread_joiner_application.h"
 #include "6LoWPAN/Thread/thread_management_internal.h"
 #include "6LoWPAN/Thread/thread_address_registration_client.h"
+#include "6LoWPAN/Thread/thread_discovery.h"
+#include "6LoWPAN/Thread/thread_commercial_bootstrap.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
 
@@ -757,12 +759,7 @@ static int thread_commercial_bbr_pbbr_start(thread_pbbr_t *this)
     // 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);
     // SET certificates
-    if (cur->thread_info->ccm_ptr && cur->thread_info->ccm_ptr->domain_certificate_ptr) {
-        if(0 > coap_service_certificate_set(this->coap_nmkp_virtual_service_id, cur->thread_info->ccm_ptr->domain_certificate_ptr, cur->thread_info->ccm_ptr->domain_certificate_len,
-                cur->thread_info->ccm_ptr->domain_pk_ptr, cur->thread_info->ccm_ptr->domain_pk_len)) {
-            tr_debug("pBBR certificate set failed");
-        }
-    }
+    thread_commercial_bootstrap_domain_certificate_enable(cur, this->coap_nmkp_virtual_service_id);
     coap_service_register_uri(this->coap_nmkp_virtual_service_id, THREAD_URI_BBR_NMKP_REQ, COAP_SERVICE_ACCESS_POST_ALLOWED, thread_pbbr_nmkp_req_recv_cb);
     coap_service_virtual_socket_set_cb(this->coap_nmkp_virtual_service_id, thread_pbbr_nmkp_virtual_socket_send_cb);
     // Set the partition weight to be 72