Thread code cleanup (ARMmbed#1475)

Code and defines moved to commercial code.

Author: Tero Heinonen

nanostack/net_thread_test.h

@@ -483,15 +483,15 @@ int thread_test_mle_message_send(int8_t interface_id, uint8_t *dst_address, uint
 
 
 /**
- * \brief Set thread domain name.
+ * \brief Set extension name.
  *
  * \param interface_id               Network Interface
- * \param domain_name                Thread domain name string
+ * \param extension_name             Extension name string
  *
  * \return 0                         OK
  * \return <0                        Failure
  */
-int thread_test_domain_name_set(int8_t interface_id, char domain_name[16]);
+int thread_test_extension_name_set(int8_t interface_id, char extension_name[16]);
 #ifdef __cplusplus
 }
 #endif

nanostack/thread_management_if.h

@@ -75,7 +75,6 @@ typedef struct link_configuration {
 #define SECURITY_POLICY_ALL_ROUTERS_JOIN_ALLOWED                0x20       /**< Thread 1.x Routers are enabled when this is set. */
 #define SECURITY_POLICY_EXTERNAL_COMMISSIONER_ALLOWED           0x10       /**< This indicates that external Commissioner authentication is allowed using PSKc. */
 #define SECURITY_POLICY_BEACON_PAYLOAD_ENABLED                  0x08       /**< Thread 1.x Beacons are enabled when this is set. */
-#define SECURITY_POLICY_CCM_ENABLED                             0x04       /**< Thread Commercial Commissioning Mode is enabled when this bit is set. This is Thread 1.2 feature. */
 
 /*
  * Mandatory device information
@@ -346,7 +345,7 @@ int thread_management_get_commissioner_address(int8_t interface_id, uint8_t *add
 /**
  * Set device certificate.
  *
- * This function sets device certificates to be used with Thread CCM Autonomous Enrollment
+ * This function sets device certificate
  *
  * \param interface_id Network interface ID.
  * \param device_certificate_ptr A pointer to the device certificate.
@@ -360,20 +359,20 @@ int thread_management_get_commissioner_address(int8_t interface_id, uint8_t *add
 int thread_management_device_certificate_set(int8_t interface_id, const unsigned char *device_certificate_ptr, uint16_t device_certificate_len, const unsigned char *priv_key_ptr, uint16_t priv_key_len);
 
 /**
- * Set domain certificate.
+ * Set network certificate.
  *
- * This function sets domain certificates to be used with Thread CCM Network Master Key (NMK) Provisioning
+ * This function sets network certificate
  *
  * \param interface_id Network interface ID.
- * \param domain_certificate_ptr A pointer array to the domain certificate chain.
- * \param domain_certificate_len An array of lengths of domain certificates in chain.
+ * \param network_certificate_ptr A pointer array to the network certificate chain.
+ * \param network_certificate_len An array of lengths of network certificates in chain.
  * \param priv_key_ptr A private key
  * \param priv_key_len Length of a private key
  *
  * \return 0, OK.
  * \return <0 fail.
  */
-int thread_management_domain_certificate_set(int8_t interface_id, const unsigned char *domain_certificate_ptr, uint16_t domain_certificate_len, const unsigned char *priv_key_ptr, uint16_t priv_key_len);
+int thread_management_network_certificate_set(int8_t interface_id, const unsigned char *network_certificate_ptr, uint16_t network_certificate_len, const unsigned char *priv_key_ptr, uint16_t priv_key_len);
 
 #ifdef __cplusplus
 }

nanostack/thread_meshcop_lib.h

@@ -128,36 +128,6 @@
 /** Discovery response TLV. */
 #define MESHCOP_TLV_DISCOVERY_RESPONSE                     129
 
-/** @defgroup Thread 1.2 experimental */
-
-/** Timeout TLV. */
-#define MESHCOP_TLV_TIMEOUT                                58
-
-/** Thread domain name TLV. */
-#define MESHCOP_TLV_DOMAIN_NAME                            59
-
-/** Domain prefix TLV TLV.*/
-#define MESHCOP_TLV_DOMAIN_PREFIX                          60
-
-/** AE Steering Data TLV. */
-#define MESHCOP_TLV_AE_STEERING_DATA                       61
-
-/** NMKP Steering Data TLV. */
-#define MESHCOP_TLV_NMKP_STEERING_DATA                     62
-
-/** Commissioner Token TLV. */
-#define MESHCOP_TLV_COMM_TOKEN                             63
-
-/** Commissioner Signature TLV. */
-#define MESHCOP_TLV_COMM_SIGNATURE                         64
-
-/** NMKP Steering Data TLV. */
-#define MESHCOP_TLV_AE_PORT                                65
-
-/** NMKP Steering Data TLV. */
-#define MESHCOP_TLV_NMKP_PORT                              66
-
-
 /**
  * Write array TLV.
  *

source/6LoWPAN/Thread/thread_common.h

@@ -222,8 +222,8 @@ typedef struct thread_router_select {
     timeout_t *reedAdvertisementTimeout;
 } thread_router_select_t;
 
-struct thread_commercial_info;
-struct thread_ccm_credentials;
+struct thread_extension_info;
+struct thread_extension_credentials;
 
 typedef struct thread_previous_partition_info_s {
     uint32_t partitionId; //partition ID of the previous partition
@@ -249,8 +249,8 @@ typedef struct thread_info_s {
     thread_commissioning_native_select_cb *native_commissioner_cb;
     thread_network_data_tlv_cb *network_data_tlv_cb;
     thread_announcement_t *announcement_info;
-    struct thread_commercial_info *commercial_info;
-    struct thread_ccm_credentials *ccm_ptr;
+    struct thread_extension_info *extension_info;
+    struct thread_extension_credentials *extension_credentials_ptr;
     thread_attach_device_mode_e thread_device_mode;
     thread_attach_state_e thread_attached_state; //Indicate Thread stack state
     thread_registered_mcast_addr_list_t child_mcast_list;

source/6LoWPAN/Thread/thread_discovery.c

@@ -952,7 +952,7 @@ static void thread_discovery_response_msg_handler(thread_discovery_class_t * dis
 
     if (discovery_class->discovery_request->joiner_flag && (!joiner_port_valid || steerin_data_length == 0)) {
         if (thread_extension_version_check(discovery_class->interface->thread_info->version)) {
-            if (!discovery_class->interface->thread_info->ccm_ptr) {
+            if (!discovery_class->interface->thread_info->extension_credentials_ptr) {
                 tr_debug("Dropped, no joiner info");
             }
         } else {