Security bits handled correctly (#1642)

Author: Kari Severinkangas

source/6LoWPAN/Thread/thread_extension.c

@@ -64,7 +64,7 @@
 
 #define TRACE_GROUP "comm"
 
-#define SECURITY_POLICY_CCM_ENABLED     0x04 /* Thread Commercial Commissioning Mode is enabled when this bit is set. This is Thread 1.2 feature. */
+#define SECURITY_POLICY_CCM_DISABLED     0x04 /* Thread Commercial Commissioning Mode is enabled when this bit is set. This is Thread 1.2 feature. */
 
 typedef struct thread_extension_info {
     int8_t coap_service_id;
@@ -581,7 +581,7 @@ bool thread_extension_enabled(protocol_interface_info_entry_t *cur)
     }
     uint16_t securityPolicy = thread_joiner_application_security_policy_get(cur->id);
 
-    if (securityPolicy & SECURITY_POLICY_CCM_ENABLED) {
+    if (!(securityPolicy & SECURITY_POLICY_CCM_DISABLED)) {
         return true;
     }
 
@@ -620,11 +620,9 @@ void thread_extension_discover_response_read(discovery_response_list_t *nwk_info
 
 void thread_extension_discover_response_tlv_write(uint16_t *data, uint8_t version, uint16_t securityPolicy)
 {
-
-    if (version == 3 && !(securityPolicy & SECURITY_POLICY_CCM_ENABLED)) {
+    if (version == 3 && !(securityPolicy & SECURITY_POLICY_CCM_DISABLED)) {
         *data |= (uint16_t) (1 << 10);
     }
-    return;
 }
 
 #ifdef HAVE_THREAD_ROUTER