3rdparty/json-c/CMakeLists.txt

+cmake_minimum_required(VERSION 2.8)
+project (json-c)
+  
+file(GLOB JSON_C_SRCS FILES *.c)
+file(GLOB JSON_C_HEADERS FILES *.h)
+
+add_library(${PROJECT_NAME} STATIC ${JSON_C_SRCS} ${JSON_C_HEADERS})
+target_include_directories(json-c PUBLIC . )

CMakeLists.txt

@@ -2,7 +2,7 @@ project(cellframe-sdk C)
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_C_STANDARD 11)
-set(CELLFRAME_SDK_NATIVE_VERSION "2.6-94")
+set(CELLFRAME_SDK_NATIVE_VERSION "2.6-95")
 add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
 set(DAPSDK_MODULES "")
 
@@ -32,6 +32,12 @@ endif()
 add_subdirectory(dap-sdk)
 add_subdirectory(3rdparty/monero_crypto)
 add_subdirectory(3rdparty/cuttdb)
+if (ANDROID)
+    add_subdirectory(3rdparty/libmagic)
+    add_subdirectory(3rdparty/json-c)
+    include_directories(cellframe-sdk/3rdparty/)
+
+endif()
 add_subdirectory(modules/)
 
 add_library(${PROJECT_NAME} STATIC cellframe-sdk.c)

cmake/OS_Detection.cmake

@@ -12,7 +12,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
     set(ANDROID ON)
     set(UNIX ON)
-    set(LINUX ON)
+    set(LINUX OFF)
     set(OS_TYPE_MOBILE ON)
     message("[*] ANDROID build")
     add_definitions(-DANDROID -DDAP_OS_ANDROID)
@@ -69,13 +69,6 @@ if(UNIX)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_CCOPT}")
     set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${_LOPT}")
 
-    if (ANDROID)
-      add_subdirectory(lib/json-c)
-      add_subdirectory(lib/sqlite3)
-      #add_subdirectory(lib/libev)
-      include_directories(lib/)
-    else()
-    endif(ANDROID)
 endif()
 
 if(WIN32)

dap-sdk/core/libdap.pri

@@ -7,7 +7,7 @@ unix {
     DEFINES += DAP_OS_UNIX
 }
 android {
-    DEFINES += DAP_OS_ANDROID
+    DEFINES += DAP_OS_ANDROID DAP_OS_LINUX DAP_OS_UNIX
 }
 
 unix: !android {

dap-sdk/net/core/dap_events_socket.c

@@ -386,9 +386,13 @@ dap_events_socket_t * dap_events_socket_queue_ptr_create_input(dap_events_socket
     l_es->port          = a_es->port;
     l_es->mq_num        = a_es->mq_num;
 
-    WCHAR l_direct_name[MQ_MAX_Q_NAME_LEN + 1] = { 0 };
-    size_t l_sz_in_words = sizeof(l_direct_name)/sizeof(l_direct_name[0]);
-    int pos = _snwprintf_s(l_direct_name, l_sz_in_words, l_sz_in_words - 1, L"DIRECT=OS:.\\PRIVATE$\\DapEventSocketQueue%d", l_es->mq_num);
+    WCHAR l_direct_name[MQ_MAX_Q_NAME_LEN] = { 0 };
+    int pos = 0;
+#ifdef DAP_BRAND
+    pos = _snwprintf_s(l_direct_name, sizeof(l_direct_name)/sizeof(l_direct_name[0]), _TRUNCATE, L"DIRECT=OS:.\\PRIVATE$\\" DAP_BRAND "__esmq%d", l_es->mq_num);
+#else
+    pos = _snwprintf_s(l_direct_name, sizeof(l_direct_name)/sizeof(l_direct_name[0]), _TRUNCATE, L"DIRECT=OS:.\\PRIVATE$\\%hs__esmq%d", dap_get_appname(), l_es->mq_num);
+#endif
     if (pos < 0) {
         log_it(L_ERROR, "Message queue path error");
         DAP_DELETE(l_es);
@@ -550,10 +554,14 @@ dap_events_socket_t * s_create_type_queue_ptr(dap_worker_t * a_w, dap_events_soc
     QUEUEPROPID    l_qp_id[1];
     HRESULT        l_q_status[1];
 
-    WCHAR l_pathname[MAX_PATH] = { 0 };
+    WCHAR l_pathname[MQ_MAX_Q_NAME_LEN - 10] = { 0 };
     static atomic_uint s_queue_num = 0;
-    size_t l_sz_in_words = sizeof(l_pathname)/sizeof(l_pathname[0]);
-    int pos = _snwprintf_s(l_pathname, l_sz_in_words, l_sz_in_words - 1, L".\\PRIVATE$\\DapEventSocketQueue%d", l_es->mq_num = s_queue_num++);
+    int pos = 0;
+#ifdef DAP_BRAND
+    pos = _snwprintf_s(l_pathname, sizeof(l_pathname)/sizeof(l_pathname[0]), _TRUNCATE, L".\\PRIVATE$\\" DAP_BRAND "__esmq%d", l_es->mq_num = s_queue_num++);
+#else
+    pos = _snwprintf_s(l_pathname, sizeof(l_pathname)/sizeof(l_pathname[0]), _TRUNCATE, L".\\PRIVATE$\\%hs__esmq%d", dap_get_appname(), l_es->mq_num = s_queue_num++);
+#endif
     if (pos < 0) {
         log_it(L_ERROR, "Message queue path error");
         DAP_DELETE(l_es);
@@ -570,7 +578,7 @@ dap_events_socket_t * s_create_type_queue_ptr(dap_worker_t * a_w, dap_events_soc
     l_qps.aPropVar  = l_qp_var;
     l_qps.aStatus   = l_q_status;
 
-    WCHAR l_direct_name[MQ_MAX_Q_NAME_LEN + 1]      = { 0 };
+    WCHAR l_direct_name[MQ_MAX_Q_NAME_LEN]      = { 0 };
     WCHAR l_format_name[sizeof(l_direct_name) - 10] = { 0 };
     DWORD l_buflen = sizeof(l_format_name);
     HRESULT hr = MQCreateQueue(NULL, &l_qps, l_format_name, &l_buflen);
@@ -579,9 +587,7 @@ dap_events_socket_t * s_create_type_queue_ptr(dap_worker_t * a_w, dap_events_soc
         DAP_DELETE(l_es);
         return NULL;
     }
-
-    wcsncpy(l_direct_name, L"DIRECT=OS:", 10);
-    wcscat_s(l_direct_name, l_buflen, l_pathname);
+    _snwprintf_s(l_direct_name, sizeof(l_direct_name)/sizeof(l_direct_name[0]), _TRUNCATE, L"DIRECT=OS:%ls", l_pathname);
 
     hr = MQOpenQueue(l_direct_name, MQ_SEND_ACCESS, MQ_DENY_NONE, &(l_es->mqh));
     if (hr == MQ_ERROR_QUEUE_NOT_FOUND) {

dap-sdk/net/core/include/dap_events_socket.h

@@ -36,7 +36,7 @@
 #define DAP_EVENTS_CAPS_EVENT_EVENTFD
 #include <netinet/in.h>
 #include <sys/eventfd.h>
-#include <mqueue.h>
+#include <unistd.h>
 #elif defined(DAP_OS_LINUX)
 //    #define DAP_EVENTS_CAPS_EPOLL
     #define DAP_EVENTS_CAPS_POLL

dap-sdk/net/server/CMakeLists.txt

 project(libdap-server C)
 cmake_minimum_required(VERSION 3.0)
 
-if (ANDROID)
-    add_subdirectory(../../../3rdparty/libmagic)
-endif()
 
 add_subdirectory(http_server)
 add_subdirectory(enc_server)