[kaa docker cluster]--prompt"ZooKeeper JMX enabled by default"

avrogen/pom.xml

@@ -19,7 +19,7 @@ Copyright 2014-2016 CyberVision, Inc.
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject</groupId>
-        <version>0.10.0</version>
+        <version>0.10.1</version>
         <artifactId>kaa</artifactId>
     </parent>
 

client/client-multi/client-c/CMakeLists.txt

@@ -34,7 +34,6 @@
 #
 #	Extensions' names:
 #
-#	- PROFILE
 #	- CONFIGURATION
 #	- EVENT
 #	- LOGGING
@@ -75,14 +74,14 @@ project(Kaa-c C)
 
 include(ExternalProject)
 
-option(WITH_EXTENSION_PROFILE "Enable profile extension" ON)
 option(WITH_EXTENSION_CONFIGURATION "Enable configuration extension" ON)
 option(WITH_EXTENSION_EVENT "Enable event extension" ON)
 option(WITH_EXTENSION_LOGGING "Enable logging extension" ON)
 option(WITH_EXTENSION_NOTIFICATION "Enable notification extension" ON)
 option(WITH_EXTENSION_USER "Enable user extension" ON)
 option(WITH_ENCRYPTION "Enable encryption" ON)
 option(KAA_RUNTIME_KEY_GENERATION "Enable RSA key generation at runtime" OFF)
+option(KAA_UNITTESTS_COMPILE "Compile unit tests" OFF)
 
 # Expose Kaa SDK directory to all modules
 set(KAA_SDK_DIR ${CMAKE_CURRENT_LIST_DIR})
@@ -218,14 +217,9 @@ message("BOOTSTRAP ENABLED")
 include(${CMAKE_CURRENT_LIST_DIR}/src/extensions/bootstrap/CMakeLists.txt)
 target_link_libraries(kaac PUBLIC extension_bootstrap)
 
-if(WITH_EXTENSION_PROFILE)
-    message("PROFILE ENABLED")
-
-    include(${CMAKE_CURRENT_LIST_DIR}/src/extensions/profile/CMakeLists.txt)
-    target_link_libraries(kaac PUBLIC extension_profile)
-else()
-    add_definitions(-DKAA_DISABLE_FEATURE_PROFILE)
-endif()
+message("PROFILE ENABLED")
+include(${CMAKE_CURRENT_LIST_DIR}/src/extensions/profile/CMakeLists.txt)
+target_link_libraries(kaac PUBLIC extension_profile)
 
 if(WITH_EXTENSION_USER)
     message("USER EXTENSION ENABLED")

client/client-multi/client-c/examples/my-kaa-application/CMakeLists.txt

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.5.2)
+cmake_minimum_required(VERSION 3.0.2)
 project(kaa-application C)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -g -Wall -Wextra")

client/client-multi/client-c/listfiles/UnitTest.cmake

@@ -204,15 +204,14 @@ kaa_add_unit_test(NAME test_kaa_extension_private
         INC_DIRS
         src/kaa src/extensions/bootstrap ${KAA_INCLUDE_PATHS})
 
-# KAA-985
-#kaa_add_unit_test(NAME test_kaa_tcp_channel_operation
-#        SOURCES
-#        test/kaa_tcp_channel/test_kaa_tcp_channel_operation.c
-#        test/kaa_test_external.c
-#        DEPENDS
-#        kaac
-#        INC_DIRS
-#        test)
+kaa_add_unit_test(NAME test_kaa_tcp_channel_operation
+        SOURCES
+        test/kaa_tcp_channel/test_kaa_tcp_channel_operation.c
+        test/kaa_test_external.c
+        DEPENDS
+        kaac
+        INC_DIRS
+        test)
 
 kaa_add_unit_test(NAME test_kaa_channel_manager
         SOURCES

client/client-multi/client-c/pom.xml

@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.client</groupId>
-        <version>0.10.0</version>
+        <version>0.10.1</version>
         <artifactId>client-multi</artifactId>
     </parent>
     <artifactId>client-c</artifactId>

client/client-multi/client-c/src/extensions/user/test/test_kaa_user.c

@@ -145,6 +145,8 @@ void test_specified_user_verifier(void **state)
     buf_cursor += kaa_aligned_size_get(strlen(USER_VERIFIER));
 
     kaa_platform_message_writer_destroy(writer);
+
+    (void)buf_cursor;
 }
 
 void test_success_response(void **state)

client/client-multi/client-c/src/kaa/Mainpage.dox

@@ -20,7 +20,6 @@
  <ul>
     <li>\link quickstart Quick start \endlink</li>
     <li>\link programminguide Programming guide \endlink</li>
-    <li>\link demo Demo application \endlink</li>
  </ul>
 
  \section quickstart Quick start
@@ -35,7 +34,7 @@
         $ make install
     @endcode
 
-    Specific build options are described in the <a href='README'>README</a> and <a href="https://docs.kaaproject.org/display/KAA/Endpoint+platforms+integration">in the official online documentation.</a>
+    Specific platforms' build options are described in the <a href='README'>README</a> and <a href="http://kaaproject.github.io/kaa/docs/latest/Programming-guide/Using-Kaa-endpoint-SDKs/">in the official online documentation.</a>
 
  \subsection linkage Link Kaa library to your project
 
@@ -123,7 +122,7 @@
     @endcode
 
     @note To use the log collection feature, go through
-    <a href="https://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints#Collectingdatafromendpoints-Coding">additional initialization steps.</a>
+    <a href="http://kaaproject.github.io/kaa/docs/latest/Programming-guide/Key-platform-features/Data-collection">additional initialization steps.</a>
 
     <b>To finish the Kaa C SDK initialization, execute the following command:</b>
     @code
@@ -135,23 +134,6 @@
 
  \section programminguide Programming guide
 
-    For more information about functions supported by the Kaa C SDK, see our <a href="https://docs.kaaproject.org/display/KAA/Programming+guide">Programming guide:</a>
-    <ul>
-        <li>
-            <a href="https://docs.kaaproject.org/display/KAA/Collecting+endpoint+profiles">Collecting endpoint profiles</a>
-        </li>
-        <li>
-            <a href="https://docs.kaaproject.org/display/KAA/Messaging+across+endpoints">Messaging across endpoints</a>
-        </li>
-        <li>
-            <a href="https://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">Collecting data from endpoints</a>
-        </li>
-    </ul>
-
- \section demo Demo application
-
-    To better familiarize yourself with Kaa C SDK, you may look at our demo application.
-
-    Find the demo source code in the 'example' directory located in the root of the Kaa project.
+    For more information about functions supported by the Kaa C SDK, see our <a href="http://kaaproject.github.io/kaa/docs/latest/Programming-guide/Key-platform-features/">Key platform features</a>.
+ */
 
- */

client/client-multi/client-c/src/kaa/kaa.c

@@ -36,9 +36,7 @@
 
 #include <kaa_extension.h>
 
-#ifndef KAA_DISABLE_FEATURE_PROFILE
 #include "kaa_profile_private.h"
-#endif
 
 static kaa_error_t kaa_context_destroy(kaa_context_t *context);
 
@@ -231,12 +229,10 @@ kaa_error_t kaa_check_readiness(kaa_context_t *kaa_context)
 {
     KAA_RETURN_IF_NIL(kaa_context, KAA_ERR_BADPARAM);
 
-#ifndef KAA_DISABLE_FEATURE_PROFILE
     if (!kaa_profile_manager_is_profile_set(kaa_context->profile_manager)) {
         KAA_LOG_ERROR(kaa_context->logger, KAA_ERR_PROFILE_IS_NOT_SET, "Profile isn't set");
         return KAA_ERR_PROFILE_IS_NOT_SET;
     }
-#endif
 
     return KAA_ERR_NONE;
 }

client/client-multi/client-c/src/kaa/kaa_extension_private.h

@@ -43,15 +43,13 @@ static struct kaa_extension kaa_extension_bootstrap = {
     .server_sync = kaa_extension_bootstrap_server_sync,
 };
 
-#ifndef KAA_DISABLE_FEATURE_PROFILE
 static struct kaa_extension kaa_extension_profile = {
     .id = KAA_EXTENSION_PROFILE,
     .init = kaa_extension_profile_init,
     .deinit = kaa_extension_profile_deinit,
     .request_serialize = kaa_extension_profile_request_serialize,
     .server_sync = kaa_extension_profile_server_sync,
 };
-#endif
 
 #ifndef KAA_DISABLE_FEATURE_EVENTS
 static struct kaa_extension kaa_extension_event = {
@@ -108,9 +106,7 @@ static struct kaa_extension kaa_extension_user = {
 static const struct kaa_extension *kaa_extensions[] = {
     &kaa_extension_bootstrap,
 
-#ifndef KAA_DISABLE_FEATURE_PROFILE
     &kaa_extension_profile,
-#endif
 
 #ifndef KAA_DISABLE_FEATURE_EVENTS
     &kaa_extension_event,

client/client-multi/client-c/src/kaa/kaa_platform_common.h

@@ -22,7 +22,7 @@ extern "C" {
 #endif
 
 #define KAA_PLATFORM_PROTOCOL_VERSION        1
-#define KAA_PLATFORM_PROTOCOL_ID             0x3553c66f
+#define KAA_PLATFORM_PROTOCOL_ID             0x0231ad61
 
 #define KAA_ALIGNMENT                        4
 

client/client-multi/client-c/src/kaa/kaa_platform_protocol.c

@@ -33,9 +33,7 @@
 
 #include <kaa_extension.h>
 
-#ifndef KAA_DISABLE_FEATURE_PROFILE
 #include "kaa_profile_private.h"
-#endif
 
 /** Resync flag indicating that profile manager should be resynced */
 #define KAA_PROFILE_RESYNC_FLAG     0x1
@@ -71,7 +69,7 @@ kaa_error_t kaa_meta_data_request_serialize(kaa_platform_protocol_t *self,
 
     KAA_LOG_TRACE(self->logger, KAA_ERR_NONE, "Going to serialize client meta sync");
 
-    uint16_t options = TIMEOUT_VALUE | PUBLIC_KEY_HASH_VALUE | PROFILE_HASH_VALUE | APP_TOKEN_VALUE;
+    const uint16_t options = TIMEOUT_VALUE | PUBLIC_KEY_HASH_VALUE | PROFILE_HASH_VALUE | APP_TOKEN_VALUE;
 
     const size_t payload_length = kaa_meta_data_request_size - KAA_EXTENSION_HEADER_SIZE;
 
@@ -343,7 +341,6 @@ kaa_error_t kaa_platform_protocol_process_server_sync(kaa_platform_protocol_t *s
                 KAA_LOG_INFO(self->logger, KAA_ERR_NONE, "Profile resync is requested");
                 self->status->profile_needs_resync = true;
 
-#ifndef KAA_DISABLE_FEATURE_PROFILE
                 void *profile_ctx = kaa_extension_get_context(KAA_EXTENSION_PROFILE);
                 if (!profile_ctx) {
                     error_code = KAA_ERR_NOT_FOUND;
@@ -357,7 +354,6 @@ kaa_error_t kaa_platform_protocol_process_server_sync(kaa_platform_protocol_t *s
                     KAA_LOG_ERROR(self->logger, error_code, "Failed to force-sync profile");
                     goto fail;
                 }
-#endif
             }
         } else {
             error_code = kaa_extension_server_sync(extension_type, request_id,

client/client-multi/client-c/src/kaa/kaa_status.c

@@ -76,11 +76,10 @@ kaa_error_t kaa_status_create(kaa_status_t ** kaa_status_p)
     KAA_RETURN_IF_NIL(kaa_status->topics, KAA_ERR_NOMEM);
 
     char *  read_buf = NULL;
-    char *  read_buf_head = NULL;
     size_t  read_size = 0;
     bool    needs_deallocation = false;
     ext_status_read(&read_buf, &read_size, &needs_deallocation);
-    read_buf_head = read_buf;
+    char *read_buf_head = read_buf;
 
     if (read_size >= KAA_STATUS_STATIC_SIZE + sizeof(size_t)) {
         READ_BUFFER(read_buf, &kaa_status->is_registered, sizeof(kaa_status->is_registered));

client/client-multi/client-c/src/kaa/platform-impl/common/kaa_failover_strategy.c

@@ -82,3 +82,14 @@ kaa_failover_decision_t kaa_failover_strategy_on_failover(void *self, kaa_failov
     }
     return strategy->decision;
 }
+
+kaa_error_t kaa_failover_strategy_set(kaa_failover_strategy_t *strategy,
+        kaa_failover_decision_t *decision)
+{
+    if (strategy == NULL || decision == NULL) {
+        return KAA_ERR_BADPARAM;
+    }
+    strategy->decision = *decision;
+
+    return KAA_ERR_NONE;
+}

client/client-multi/client-c/src/kaa/platform-impl/esp8266/kaa_client.c

@@ -52,7 +52,9 @@ static kaa_extension_id BOOTSTRAP_SERVICE[] = { KAA_EXTENSION_BOOTSTRAP };
 static const int BOOTSTRAP_SERVICE_COUNT = sizeof(BOOTSTRAP_SERVICE) / sizeof(kaa_extension_id);
 
 static kaa_extension_id OPERATIONS_SERVICES[] = { KAA_EXTENSION_PROFILE
+#ifndef KAA_DISABLE_FEATURE_USER
                                              , KAA_EXTENSION_USER
+#endif
 #ifndef KAA_DISABLE_FEATURE_CONFIGURATION
                                              , KAA_EXTENSION_CONFIGURATION
 #endif

client/client-multi/client-c/src/kaa/platform-impl/posix/kaa_client.c

@@ -49,7 +49,9 @@ static kaa_extension_id BOOTSTRAP_SERVICE[] = { KAA_EXTENSION_BOOTSTRAP };
 static const int BOOTSTRAP_SERVICE_COUNT = sizeof(BOOTSTRAP_SERVICE) / sizeof(kaa_extension_id);
 
 static kaa_extension_id OPERATIONS_SERVICES[] = { KAA_EXTENSION_PROFILE
+#ifndef KAA_DISABLE_FEATURE_USER
                                              , KAA_EXTENSION_USER
+#endif
 #ifndef KAA_DISABLE_FEATURE_CONFIGURATION
                                              , KAA_EXTENSION_CONFIGURATION
 #endif

client/client-multi/client-c/templates/event/kaa_event_families.cvm

@@ -21,6 +21,7 @@
 
 # include "kaa_common.h"
 # include "kaa_event.h"
+# include "kaa_event_private.h"
 # include "kaa_error.h"
 # include "utilities/kaa_mem.h"
 

client/client-multi/client-c/test/kaa_tcp_channel/test_kaa_tcp_channel_bootstrap.c

@@ -160,8 +160,8 @@ void test_create_kaa_tcp_channel(void **state)
     (void)state;
     kaa_error_t error_code;
 
-    kaa_transport_channel_interface_t *channel = NULL;
-    channel = KAA_CALLOC(1,sizeof(kaa_transport_channel_interface_t));
+    kaa_transport_channel_interface_t *channel =
+        KAA_CALLOC(1, sizeof(kaa_transport_channel_interface_t));
 
     kaa_extension_id bootstrap_services[] = {KAA_EXTENSION_BOOTSTRAP};
 
@@ -210,8 +210,8 @@ void test_set_access_point_full_success_bootstrap(void **state)
 
     kaa_error_t error_code;
 
-    kaa_transport_channel_interface_t *channel = NULL;
-    channel = KAA_CALLOC(1,sizeof(kaa_transport_channel_interface_t));
+    kaa_transport_channel_interface_t *channel =
+        KAA_CALLOC(1, sizeof(kaa_transport_channel_interface_t));
 
     kaa_extension_id bootstrap_services[] = {KAA_EXTENSION_BOOTSTRAP};
 
@@ -238,8 +238,8 @@ void test_set_access_point_connecting_error(void **state)
 
     kaa_error_t error_code;
 
-    kaa_transport_channel_interface_t *channel = NULL;
-    channel = KAA_CALLOC(1,sizeof(kaa_transport_channel_interface_t));
+    kaa_transport_channel_interface_t *channel =
+        KAA_CALLOC(1, sizeof(kaa_transport_channel_interface_t));
 
     kaa_extension_id bootstrap_services[] = {KAA_EXTENSION_BOOTSTRAP};
 
@@ -280,8 +280,8 @@ void test_set_access_point_io_error(void **state)
 
     kaa_error_t error_code;
 
-    kaa_transport_channel_interface_t *channel = NULL;
-    channel = KAA_CALLOC(1,sizeof(kaa_transport_channel_interface_t));
+    kaa_transport_channel_interface_t *channel =
+        KAA_CALLOC(1, sizeof(kaa_transport_channel_interface_t));
 
     kaa_extension_id bootstrap_services[] = {KAA_EXTENSION_BOOTSTRAP};
 
@@ -347,8 +347,8 @@ void test_bootstrap_sync_success(void **state)
 
     kaa_error_t error_code;
 
-    kaa_transport_channel_interface_t *channel = NULL;
-    channel = KAA_CALLOC(1,sizeof(kaa_transport_channel_interface_t));
+    kaa_transport_channel_interface_t *channel =
+        KAA_CALLOC(1, sizeof(kaa_transport_channel_interface_t));
 
     kaa_extension_id bootstrap_services[] = {KAA_EXTENSION_BOOTSTRAP};
 
@@ -627,7 +627,7 @@ kaatcp_error_t kaatcp_get_request_connect(const kaatcp_connect_t *message
     if (message->protocol_version != PROTOCOL_VERSION) {
         return KAATCP_ERR_BAD_PARAM;
     }
-    if (message->next_ptorocol_id != 0x3553c66f) {
+    if (message->next_ptorocol_id != 0x0231ad61) {
         return KAATCP_ERR_BAD_PARAM;
     }
     if (message->connect_flags != KAA_CONNECT_FLAGS) {
@@ -659,7 +659,7 @@ kaatcp_error_t kaatcp_fill_connect_message(uint16_t keepalive, uint32_t next_pro
     if (keepalive != KAA_TCP_CHANNEL_MAX_TIMEOUT) {
         return KAATCP_ERR_BAD_PARAM;
     }
-    if (next_protocol_id != 0x3553c66f) {
+    if (next_protocol_id != 0x0231ad61) {
         return KAATCP_ERR_BAD_PARAM;
     }