Merge pull request #25 from sadhyama/aker_blob

Webconfig Aker Blob Support

Author: shilpa24balaji

CMakeLists.txt

@@ -43,11 +43,18 @@ include_directories(${INCLUDE_DIR}
 		    ${INCLUDE_DIR}/trower-base64
 		    ${INCLUDE_DIR}/wdmp-c
 		    ${INCLUDE_DIR}/cimplog
+			${INCLUDE_DIR}/wrp-c
+			${INCLUDE_DIR}/nanomsg
+			${INCLUDE_DIR}/libparodus
 #                    ${INCLUDE_DIR}/curl
                     )
 
 if (NOT BUILD_YOCTO)
 
+if (MULTIPART_UTILITY)
+add_definitions(-DMULTIPART_UTILITY)
+endif (MULTIPART_UTILITY)
+
 # msgpack-c external dependency
 #-------------------------------------------------------------------------------
 ExternalProject_Add(msgpack
@@ -120,6 +127,52 @@ add_dependencies(libcurl curl)
 #find_library( LIB_CURL,
 #              NAMES curl
 #              PATHS /usr/lib64 )
+
+# nanoMsg external dependency
+#-------------------------------------------------------------------------------
+ExternalProject_Add(nanomsg
+    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/nanomsg
+    GIT_REPOSITORY https://github.com/nanomsg/nanomsg.git
+    GIT_TAG "1.1.4"
+    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+)
+add_library(libnanomsg STATIC SHARED IMPORTED)
+add_dependencies(libnanomsg nanomsg)
+
+# wrp-c external dependency
+#-------------------------------------------------------------------------------
+ExternalProject_Add(wrp-c
+	DEPENDS trower-base64 msgpack cimplog
+    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/wrp-c
+    GIT_REPOSITORY https://github.com/Comcast/wrp-c.git
+    GIT_TAG "1.0.1"
+    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+                  -DMSGPACK_ENABLE_CXX=OFF
+                  -DMSGPACK_BUILD_EXAMPLES=OFF
+                  -DBUILD_TESTING=OFF
+                  -DMAIN_PROJ_BUILD=ON
+                  -DMAIN_PROJ_LIB_PATH=${LIBRARY_DIR}
+		  -DMAIN_PROJ_INCLUDE_PATH=${INCLUDE_DIR}
+)
+add_library(libwrp-c STATIC SHARED IMPORTED)
+add_dependencies(libwrp-c wrp-c)
+
+# libparodus external dependency
+#-------------------------------------------------------------------------------
+ExternalProject_Add(libparodus
+    DEPENDS trower-base64 msgpack nanomsg wrp-c
+    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/libparodus
+    GIT_REPOSITORY https://github.com/Comcast/libparodus.git
+    GIT_TAG "1.0.2"
+    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
+	-DMAIN_PROJ_BUILD=ON
+	-DMAIN_PROJ_LIB_PATH=${LIBRARY_DIR}
+	-DMAIN_PROJ_LIB64_PATH=${LIBRARY_DIR64}
+	-DMAIN_PROJ_COMMON_PATH=${COMMON_LIBRARY_DIR}
+	-DMAIN_PROJ_INCLUDE_PATH=${INCLUDE_DIR}
+)
+add_library(liblibparodus STATIC SHARED IMPORTED)
+add_dependencies(liblibparodus libparodus)
 endif ()
 link_directories ( ${LIBRARY_DIR} ${COMMON_LIBRARY_DIR} ${LIBRARY_DIR64} )
 

src/CMakeLists.txt

@@ -13,8 +13,8 @@
 #   limitations under the License.
 
 set(PROJ_WEBCFG webcfg)
-set(HEADERS webcfg.h webcfg_param.h webcfg_pack.h webcfg_multipart.h webcfg_auth.h webcfg_notify.h webcfg_generic.h webcfg_db.h webcfg_log.h webcfg_blob.h webcfg_event.h)
-set(SOURCES webcfg_helpers.c webcfg.c webcfg_param.c webcfg_pack.c webcfg_multipart.c webcfg_auth.c webcfg_notify.c webcfg_db.c webcfg_generic.c webcfg_blob.c webcfg_event.c)
+set(HEADERS webcfg.h webcfg_param.h webcfg_pack.h webcfg_multipart.h webcfg_auth.h webcfg_notify.h webcfg_generic.h webcfg_db.h webcfg_log.h webcfg_blob.h webcfg_event.h webcfg_aker.h)
+set(SOURCES webcfg_helpers.c webcfg.c webcfg_param.c webcfg_pack.c webcfg_multipart.c webcfg_auth.c webcfg_notify.c webcfg_db.c webcfg_generic.c webcfg_blob.c webcfg_event.c webcfg_client.c webcfg_aker.c)
 
 add_library(${PROJ_WEBCFG} STATIC ${HEADERS} ${SOURCES})
 add_library(${PROJ_WEBCFG}.shared SHARED ${HEADERS} ${SOURCES})

src/webcfg.c

@@ -30,15 +30,18 @@
 #include <wdmp-c.h>
 #include <base64.h>
 #include "webcfg_db.h"
+#include "webcfg_aker.h"
 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
 /*----------------------------------------------------------------------------*/
 
 
 #ifdef MULTIPART_UTILITY
-
+#ifdef BUILD_YOCTO
 #define TEST_FILE_LOCATION		"/nvram/multipart.bin"
-
+#else
+#define TEST_FILE_LOCATION		"/tmp/multipart.bin"
+#endif
 #endif
 /*----------------------------------------------------------------------------*/
 /*                               Data Structures                              */
@@ -92,6 +95,7 @@ void *WebConfigMultipartTask(void *status)
 
 	//start webconfig notification thread.
 	initWebConfigNotifyTask();
+	initWebConfigClient();
 	WebcfgInfo("initDB %s\n", WEBCFG_DB_FILE);
 
 	initDB(WEBCFG_DB_FILE);

src/webcfg.h

@@ -19,13 +19,21 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdbool.h>
+#include <pthread.h>
+#include <time.h>
 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */
 /*----------------------------------------------------------------------------*/
 #define MAX_BUF_SIZE	           256
 #define MAX_PARAMETERNAME_LENGTH       512
 #define BACKOFF_SLEEP_DELAY_SEC 	    10
 
+#ifdef BUILD_YOCTO
+#define DEVICE_PROPS_FILE       "/etc/device.properties"
+#else
+#define DEVICE_PROPS_FILE       "/tmp/device.properties"
+#endif
+
 #define WEBCFG_FREE(__x__) if(__x__ != NULL) { free((void*)(__x__)); __x__ = NULL;} else {printf("Trying to free null pointer\n");}
 #ifndef TEST
 #define FOREVER()   1
@@ -66,5 +74,5 @@ void webcfgStrncpy(char *destStr, const char *srcStr, size_t destSize);
 char* get_global_auth_token();
 void getCurrent_Time(struct timespec *timer);
 long timeVal_Diff(struct timespec *starttime, struct timespec *finishtime);
-
+void initWebConfigClient();
 #endif