Merge branch 'features-2392' into 'master'

Features 2392 - logical completion

See merge request libdap-server-core-python!3

CMakeLists.txt

@@ -4,12 +4,28 @@ cmake_minimum_required(VERSION 2.8)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_COLOR_MAKEFILE   ON)
 set(CMAKE_C_STANDARD 11)
-set(SUBMODULES_NO_BUILD ON)
 
-add_subdirectory(libdap)
-add_subdirectory(libdap-crypto)
+if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
+    set(SUBMODULES_NO_BUILD ON)
+    if (NOT (TARGET dap_core))
+        add_subdirectory(libdap)
+        target_compile_options(
+            dap_core PRIVATE
+            "-fpic"
+        )
+    endif()
+    if (NOT (TARGET dap_crypto))
+       add_subdirectory(libdap-crypto)
+       target_compile_options(
+           dap_crypto PRIVATE
+           "-fpic"
+       )
+    endif()
+endif()
+
 add_subdirectory(libdap-server-core)
 
+
 file(GLOB SERVER_CORE_PYTHON_SRCS src/*.c)
 file(GLOB SERVER_CORE_PYTHON_HEADERS include/*.h)
 
@@ -28,18 +44,6 @@ target_compile_options(
     "-fpic"
 )
 
-target_compile_options(
-    dap_core PRIVATE
-    "-fpic"
-)
-target_compile_options(
-    dap_crypto PRIVATE
-    "-fpic"
-)
-
-
-#target_link_libraries(${PROJECT_NAME} dap_core dap_crypto)
-#targat_link_libraries(${PROJECT_NAME} dap_server_core)
 target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core)
 
 #if(BUILD_DAP_PYTHON_TESTS)

libdap @ 6c5dd5a5

-Subproject commit 67993d1f4cec44de464acee32a4d4f71d51c7e7d
+Subproject commit 6c5dd5a5b0de5573b03ed144c651352467a56101

libdap-crypto @ 1acfbdd8

-Subproject commit 6249887fdd5c9ed88eb26c1e10f853ea9f7001b6
+Subproject commit 1acfbdd8f5f3caef4c2e584ae2c20ab584b22b4e

libdap-server-core @ de9b4c77

-Subproject commit 6778521f9f646e2985994e63f470067b3e2c1e48
+Subproject commit de9b4c77a021af36148515e3dbc56403ab45490f

src/libdap-server-core-python.c

@@ -4,9 +4,14 @@
 static PyObject *dap_server_core_init(PyObject *self, PyObject *args){
     uint32_t l_thread_cnt;
     size_t conn_t;
-    if (!PyArg_ParseTuple(args, "I|n", &l_thread_cnt, &conn_t)){
+    const char *app_name;
+    const char *app_log;
+    if (!PyArg_ParseTuple(args, "I|n|s|s", &l_thread_cnt, &conn_t, &app_name, &app_log)){
         return NULL;
     }
+    int32_t result_common_init = dap_common_init(app_name, app_log);
+    if (result_common_init != 0)
+        return PyLong_FromLong(result_common_init);
     int32_t result = dap_server_init(l_thread_cnt);
     if ( result != 0 ) {
        log_it( L_CRITICAL, "Can't init socket server module" );

test/test.py

 import libDapServerCore as server
 
 print ("Start wrapping libdap server core python module")
-res_i = server.init(1, 0)
+res_i = server.init(1, 0, "TestServer", "TestServer.txt")
 rc = server.listen("0.0.0.0", 3307, 0)
 server.deinit()