Organize Thread code (#1471)

Move Thread 1.2 specific code to thread_commercial file.

Author: Arto Kinnunen

source/6LoWPAN/Thread/thread_address_registration_client.c

@@ -63,7 +63,7 @@ void thread_address_registration_timer_set(protocol_interface_info_entry_t *inte
 }
 void thread_address_registration_timer(protocol_interface_info_entry_t *interface, uint16_t seconds)
 {
-    if (!enabled || interface->thread_info->version < THREAD_VERSION_1_2) {
+    if (!enabled || !thread_commercial_version_check(interface->thread_info->version)) {
         return;
     }
 

source/6LoWPAN/Thread/thread_bbr_api.c

@@ -916,7 +916,7 @@ void thread_bbr_seconds_timer(int8_t interface_id, uint32_t seconds)
         thread_bbr_status_check(this,seconds);
     }
 
-    if (thread_version < THREAD_VERSION_1_2) {
+    if (!thread_commercial_version_check(thread_version)) {
         return;
     }
     thread_commercial_bbr_seconds_timer(interface_id, seconds);

source/6LoWPAN/Thread/thread_commercial.c

@@ -544,6 +544,23 @@ void thread_commercial_activate(protocol_interface_info_entry_t *cur)
     }
 }
 
+bool thread_commercial_security_policy_enabled(uint8_t securityPolicy)
+{
+    if (securityPolicy & SECURITY_POLICY_CCM_ENABLED) {
+        return true;
+    }
+
+    return false;
+}
+
+bool thread_commercial_version_check(uint8_t version)
+{
+    if (version >= THREAD_VERSION_1_2) {
+        return true;
+    }
+
+    return false;
+}
 
 #ifdef HAVE_THREAD_ROUTER
 static int thread_commercial_relay_tx_cb(int8_t service_id, uint8_t source_address[16], uint16_t source_port, sn_coap_hdr_s *request_ptr)

source/6LoWPAN/Thread/thread_commercial.h

@@ -29,6 +29,8 @@ void thread_commercial_mcast_subscrition_change(protocol_interface_info_entry_t
 void thread_commercial_address_registration_trigger(protocol_interface_info_entry_t *interface);
 void thread_commercial_route_set(protocol_interface_info_entry_t *cur);
 void thread_commercial_activate(protocol_interface_info_entry_t *cur);
+bool thread_commercial_security_policy_enabled(uint8_t securityPolicy);
+bool thread_commercial_version_check(uint8_t version);
 #ifdef HAVE_THREAD_ROUTER
 int thread_commercial_joiner_router_init(int8_t interface_id);
 bool thread_commercial_joining_enabled(int8_t interface_id);
@@ -56,6 +58,8 @@ uint8_t *thread_commercial_discover_response_write(protocol_interface_info_entry
 #define thread_commercial_address_registration_change(interface)
 #define thread_commercial_route_set(cur)
 #define thread_commercial_activate(cur)
+#define thread_commercial_security_policy_enabled(securityPolicy) (false)
+#define thread_commercial_version_check(version) (false)
 #define thread_commercial_joiner_router_init(interface_id)
 #define thread_commercial_joining_enabled(interface_id) false
 #define thread_commercial_discover_response_len(cur) 0

source/6LoWPAN/Thread/thread_discovery.c

@@ -537,7 +537,7 @@ static int thread_discovery_response_send(thread_discovery_class_t *class, threa
     *ptr++ = MLE_TYPE_DISCOVERY;
     *ptr++ = message_length;
     uint16_t discover_response_tlv = thread_discover_tlv_get(class->version, (linkConfiguration->securityPolicy & SECURITY_POLICY_NATIVE_COMMISSIONING_ALLOWED),
-            (linkConfiguration->securityPolicy & SECURITY_POLICY_CCM_ENABLED));
+        thread_commercial_security_policy_enabled(linkConfiguration->securityPolicy));
 
     ptr = thread_meshcop_tlv_data_write_uint16(ptr, MESHCOP_TLV_DISCOVERY_RESPONSE, discover_response_tlv);
     ptr = thread_meshcop_tlv_data_write(ptr, MESHCOP_TLV_XPANID, 8, linkConfiguration->extented_pan_id);
@@ -956,7 +956,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 (discovery_class->interface->thread_info->version == THREAD_VERSION_1_2) {
+        if (thread_commercial_version_check(discovery_class->interface->thread_info->version)) {
             if (!discovery_class->interface->thread_info->ccm_ptr) {
                 tr_debug("Dropped, no joiner info or CCM network");
             }

source/6LoWPAN/Thread/thread_host_bootstrap.c

@@ -408,7 +408,7 @@ static bool thread_host_prefer_parent_response(protocol_interface_info_entry_t *
 {
     (void) connectivity;
 
-    if (thread_info(cur)->version < THREAD_VERSION_1_2){
+    if (!thread_commercial_version_check(thread_info(cur)->version)) {
         return false;
     }
 

source/6LoWPAN/Thread/thread_network_data_storage.c

@@ -19,6 +19,7 @@
 #include "ip6string.h"
 #include "6LoWPAN/Thread/thread_common.h"
 #include "6LoWPAN/Thread/thread_config.h"
+#include "6LoWPAN/Thread/thread_commercial.h"
 #include "6LoWPAN/Thread/thread_joiner_application.h"
 #include "6LoWPAN/Thread/thread_network_data_lib.h"
 #include "6LoWPAN/Thread/thread_network_data_storage.h"
@@ -1931,7 +1932,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.
-    if (thread_version > THREAD_VERSION_1_2) {
+    if (thread_commercial_version_check(thread_version)) {
         tempId = 2;
     } else {
         tempId = 1;

source/6LoWPAN/Thread/thread_router_bootstrap.c

@@ -2578,7 +2578,7 @@ bool thread_router_bootstrap_routing_allowed(struct protocol_interface_info_entr
         return true;
     }
 
-    return !(cur->thread_info->version < THREAD_VERSION_1_2 && !(link_conf_ptr->securityPolicy & SECURITY_POLICY_ALL_ROUTERS_JOIN_ALLOWED));
+    return !(!thread_commercial_version_check(cur->thread_info->version) && !(link_conf_ptr->securityPolicy & SECURITY_POLICY_ALL_ROUTERS_JOIN_ALLOWED));
 }
 
 void thread_router_bootstrap_address_change_notify_send(protocol_interface_info_entry_t *cur)