Thread BH code cleanup (ARMmbed#1478)

Author: Tero Heinonen

nanostack/thread_bbr_api.h

@@ -25,10 +25,6 @@
  *    Publishes Default route with DHCP addressing
  *    Enables ND proxy
  *
- * if Commercial mode primary BBR activated publishes the commercial primary backbone information to Leader.
- *    Enables the Backbone address resolution.
- *    Enables the DUA, MLR registrations.
- *
  * \param interface_id Thread network interface id.
  * \param backbone_interface_id backbone interface id.
  *
@@ -45,29 +41,28 @@ int thread_bbr_start(int8_t interface_id, int8_t backbone_interface_id);
  * refreshing of registrations.
  *
  * \param interface_id interface ID of the Thread network.
- * \param mlr_timeout Multicast registration timeout. 0 do not change.
- * \param dua_timeout Timeout when BBR updates the sequence number for network data. 0 do not change
- * \param dua_delay Jitter delay value for Domain Unicast Address (DUA) registrations. 0 do not change
+ * \param timeout_a timeout a set. 0 = do not change.
+ * \param timeout_b timeout_b set. 0 = do not change
+ * \param delay Jitter delay value. 0 do not change
  *
  * \return 0 on success
  * \return <0 in case of errors
  *
  */
-int thread_bbr_timeout_set(int8_t interface_id, uint32_t mlr_timeout, uint32_t dua_timeout, uint32_t dua_delay);
+int thread_bbr_timeout_set(int8_t interface_id, uint32_t timeout_a, uint32_t timeout_b, uint32_t delay);
 
 /**
- * Set the Thread registration interface (TRI) destination address.
- * TRI address must be set to enable TRI relay.
+ * Set the Thread validation interface destination address.
  *
  * \param interface_id interface ID of the Thread network.
- * \param tri_addr_ptr IPv6 address of the TRI server.
- * \param tri_port UDP port of the TRI server.
+ * \param addr_ptr IPv6 address.
+ * \param port UDP port.
  *
  * \return 0 on success
  * \return <0 in case of errors
  *
  */
-int thread_bbr_tri_address_set(int8_t interface_id, const uint8_t *tri_addr_ptr, uint16_t tri_port);
+int thread_bbr_validation_interface_address_set(int8_t interface_id, const uint8_t *addr_ptr, uint16_t port);
 
 /**
  * Stop backbone Border router.

source/6LoWPAN/Thread/thread_bbr_api.c

@@ -54,7 +54,7 @@ typedef struct {
     uint8_t br_count;
     int8_t interface_id;
     int8_t coap_service_id;
-    int8_t coap_nmkp_virtual_service_id;
+    int8_t coap_extension_virtual_service_id;
     int8_t br_service_id;
     int8_t backbone_interface_id;
     int8_t udp_proxy_socket; /* socket to relay messages between BA and nodes */
@@ -65,15 +65,6 @@ typedef struct {
     ns_list_link_t link;
 } thread_bbr_t;
 
-
-typedef struct {
-    int8_t interface_id;
-    uint8_t target_eid[16];
-    uint16_t request_msg_id;
-    uint16_t ttl;
-    ns_list_link_t link;
-} duplicate_dua_tr_t;
-
 /* Neighbor discovery options according to RFC6106 (rfc4861) */
 #define RFC6106_RECURSIVE_DNS_SERVER_OPTION     25
 #define RFC6106_DNS_SEARCH_LIST_OPTION          31
@@ -977,6 +968,8 @@ int thread_bbr_proxy_state_update(int8_t caller_interface_id , int8_t handler_in
 /*Public API control*/
 int thread_bbr_start(int8_t interface_id, int8_t backbone_interface_id)
 {
+    (void) interface_id;
+    (void) backbone_interface_id;
 #ifdef HAVE_THREAD_BORDER_ROUTER
     thread_bbr_t *this = thread_bbr_find_by_interface(interface_id);
     link_configuration_s *link_configuration_ptr = thread_joiner_application_get_config(interface_id);
@@ -1009,42 +1002,41 @@ int thread_bbr_start(int8_t interface_id, int8_t backbone_interface_id)
     thread_extension_bbr_init(interface_id,backbone_interface_id);
     return 0;
 #else
-    (void) interface_id;
-    (void) backbone_interface_id;
     return -1;
 #endif // HAVE_THREAD_BORDER_ROUTER
 }
 
-int thread_bbr_timeout_set(int8_t interface_id, uint32_t mlr_timeout, uint32_t dua_timeout, uint32_t dua_delay)
+int thread_bbr_timeout_set(int8_t interface_id, uint32_t timeout_a, uint32_t timeout_b, uint32_t delay)
 {
+    (void) interface_id;
+    (void) timeout_a;
+    (void) timeout_b;
+    (void) delay;
 #ifdef HAVE_THREAD_BORDER_ROUTER
-    thread_extension_bbr_timeout_set(interface_id, mlr_timeout, dua_timeout, dua_delay);
+    thread_extension_bbr_timeout_set(interface_id, timeout_a, timeout_b, delay);
 return 0;
 #else
-(void) interface_id;
-(void) mlr_timeout;
-(void) dua_timeout;
-(void) dua_delay;
-return -1;
+    return -1;
 #endif // HAVE_THREAD_BORDER_ROUTER
 }
 
-int thread_bbr_tri_address_set(int8_t interface_id, const uint8_t *tri_addr_ptr, uint16_t tri_port)
+int thread_bbr_validation_interface_address_set(int8_t interface_id, const uint8_t *addr_ptr, uint16_t port)
 {
+    (void) interface_id;
+    (void) addr_ptr;
+    (void) port;
 #ifdef HAVE_THREAD_BORDER_ROUTER
-    return thread_extension_bbr_address_set(interface_id, tri_addr_ptr, tri_port);
+    return thread_extension_bbr_address_set(interface_id, addr_ptr, port);
 #else
-(void) interface_id;
-(void) tri_addr_ptr;
-(void) tri_port;
-return -1;
+    return -1;
 #endif // HAVE_THREAD_BORDER_ROUTER
 }
 
 
 
 void thread_bbr_stop(int8_t interface_id)
 {
+    (void) interface_id;
 #ifdef HAVE_THREAD_BORDER_ROUTER
 
     thread_bbr_t *this = thread_bbr_find_by_interface(interface_id);
@@ -1057,7 +1049,6 @@ void thread_bbr_stop(int8_t interface_id)
     this->backbone_interface_id = -1;
 
 #else
-    (void) interface_id;
     return;
 #endif // HAVE_THREAD_BORDER_ROUTER
 

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -1936,9 +1936,11 @@ 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)
+static void thread_network_select(struct protocol_interface_info_entry *interface_ptr, device_configuration_s *device_configuration_ptr, thread_nwk_discovery_response_list_t *discover_response)
 {
-    discovery_response_list_t *discovered_network_ptr = thread_extension_bootstrap_network_select(interface_prt, discover_response);
+    (void) interface_ptr;
+
+    discovery_response_list_t *discovered_network_ptr = thread_extension_bootstrap_network_select(interface_ptr, discover_response);
 
     /* If network found */
     if (discovered_network_ptr) {
@@ -1950,7 +1952,6 @@ static void thread_network_select(struct protocol_interface_info_entry *interfac
             }
         }
     } else {
-        // thread 1.1 device, or no CCM network found. Use normal attach
         thread_network_select_by_steering_data(device_configuration_ptr, discover_response);
     }
 }

source/6LoWPAN/Thread/thread_common.c

@@ -1883,6 +1883,8 @@ static void thread_address_notification_cb(struct protocol_interface_info_entry
 
 void thread_mcast_group_change(struct protocol_interface_info_entry *interface, if_group_entry_t *group, bool addr_added)
 {
+    (void) addr_added;
+
     group->mld_timer = 0;
 
     if (thread_attach_ready(interface) != 0) {

source/6LoWPAN/Thread/thread_constants.h

@@ -153,11 +153,6 @@
 #define ROUTER_DOWNGRADE_THRESHOLD 23 // Define downGrade Threshold when active router is higher than this
 #define ROUTER_UPGRADE_THRESHOLD 16 // Define upgrade Threshold fort REED when Active Router Count is smaller than this upgrade is possible
 
-#define THREAD_VERSION_1_2 3
-
-/** Thread BBR service id */
-#define THREAD_SERVICE_DATA_BBR 0x01
-
 /** Thread prefix minimum lifetime in seconds */
 #define THREAD_MIN_PREFIX_LIFETIME  3600
 

source/6LoWPAN/Thread/thread_extension_constants.h

@@ -65,4 +65,17 @@ typedef struct discovery_additional_info {
 /** NMKP Steering Data TLV. */
 #define MESHCOP_TLV_NMKP_PORT                              66
 
+/** Thread BBR service id */
+#define THREAD_SERVICE_DATA_BBR 0x01
+
+
+/* Thread 1.2 defines*/
+#define TMFCOP_TLV_TIMEOUT                                 11
+#define TMFCOP_TLV_NETWORK_NAME                            12
+#define TMFCOP_TLV_SEQUENCE_NUMBER                         13
+#define TMFCOP_TLV_IPV6_ADDRESS                            14
+
+
+#define THREAD_VERSION_1_2 3
+
 #endif /* THREAD_EXTENSION_CONSTANTS_H_ */

source/6LoWPAN/Thread/thread_host_bootstrap.c

@@ -407,6 +407,7 @@ static void thread_child_synch_receive_cb(int8_t interface_id, mle_message_t *ml
 static bool thread_host_prefer_parent_response(protocol_interface_info_entry_t *cur, thread_scanned_parent_t *scanned_parent, uint16_t version, thread_connectivity_t *connectivity)
 {
     (void) connectivity;
+    (void) cur;
 
     if (!thread_extension_version_check(thread_info(cur)->version)) {
         return false;

source/6LoWPAN/Thread/thread_joiner_application.h

@@ -45,9 +45,6 @@ uint64_t thread_joiner_application_active_timestamp_get(int8_t interface_id);
 void thread_joiner_application_active_timestamp_set(int8_t interface_id, uint64_t timestamp);
 uint8_t *thread_joiner_application_active_config_tlv_list_get(uint8_t interface_id, uint16_t *length);
 
-
-/*
- * Thread 1.2 support*/
 uint8_t *thread_joiner_application_active_config_params_get(uint8_t interface_id, uint16_t *length);
 
 /** Get device configuration

source/6LoWPAN/Thread/thread_management_if.c

@@ -1319,6 +1319,11 @@ int8_t thread_management_get_request_full_nwk_data(int8_t interface_id, bool *fu
 
 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)
 {
+    (void) interface_id;
+    (void) device_certificate_ptr;
+    (void) device_certificate_len;
+    (void) priv_key_ptr;
+    (void) priv_key_len;
 #ifdef HAVE_THREAD
     protocol_interface_info_entry_t *cur;
 
@@ -1331,14 +1336,16 @@ int thread_management_device_certificate_set(int8_t interface_id, const unsigned
     return thread_extension_bootstrap_device_certificate_set(cur, device_certificate_ptr, device_certificate_len, priv_key_ptr, priv_key_len);
 
 #else
-    (void) interface_id;
-    (void) device_certificate_ptr;
-    (void) device_certificate_len;
     return -1;
 #endif
 }
 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)
 {
+    (void) interface_id;
+    (void) network_certificate_ptr;
+    (void) network_certificate_len;
+    (void) priv_key_ptr;
+    (void) priv_key_len;
 #ifdef HAVE_THREAD
     protocol_interface_info_entry_t *cur;
 
@@ -1354,11 +1361,6 @@ int thread_management_network_certificate_set(int8_t interface_id, const unsigne
 
     return thread_extension_bootstrap_network_private_key_set(cur, priv_key_ptr, priv_key_len);
 #else
-    (void) interface_id;
-    (void) network_certificate_ptr;
-    (void) network_certificate_len;
-    (void) priv_key_ptr;
-    (void) priv_key_len;
     return -1;
 #endif
 }

source/6LoWPAN/Thread/thread_network_data_storage.c

@@ -1930,8 +1930,7 @@ uint8_t thread_nd_context_id_allocate(thread_network_data_cache_entry_t *network
         }
     }
 
-    //Allocate Free context id starting from number 1 for Thread 1.1
-    // Starting for 2 for Thread commercial.
+    //Allocate Free context id
     if (thread_extension_version_check(thread_version)) {
         tempId = 2;
     } else {