Merge branch 'bugs-2706' into 'master'

Bugs 2706

See merge request !48

CMakeLists.txt

@@ -82,6 +82,7 @@ if(WIN32)
   add_definitions("-DHAVE_PREAD")
   add_definitions("-DHAVE_MMAP")
   add_definitions("-DHAVE_STRNDUP")
+  add_definitions("-DWINVER=0x0600 -D_WIN32_WINNT=0x0600")
 
   if(DAP_RELEASE)
     set(_CCOPT "-static -std=gnu11 -Wall -O3 -fno-ident -ffast-math -ftree-vectorize -mfpmath=sse -mmmx -msse2 -fno-asynchronous-unwind-tables -ffunction-sections -Wl,--gc-sections -Wl,--strip-all")
@@ -94,12 +95,11 @@ if(WIN32)
   set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${_LOPT}")
 
   include_directories(libdap/src/win32/)
-  include_directories(3rdparty/wepoll/include/)
   include_directories(3rdparty/uthash/src/)
   include_directories(3rdparty/libjson-c/)
   include_directories(3rdparty/curl/include/)
   include_directories(3rdparty/libsqlite3/)
-
+  include_directories(sources/wepoll/)
   include_directories(libdap-server-http-db-auth/)
   include_directories(libdap-chain-net-srv-vpn/)
 endif()
@@ -188,10 +188,8 @@ if(WIN32)
   add_executable(${PROJECT_NAME} "sources/main.c" "sources/exh_win32.c" "sources/sig_win32_handler.c")
   add_executable(${PROJECT_NAME}-cli "sources/main_node_cli.c" "sources/main_node_cli_shell.c" "sources/main_node_cli_net.c" )
   add_executable(${PROJECT_NAME}-tool "sources/main_node_tool.c" )
-
   target_link_libraries(${PROJECT_NAME}-cli dap_chain_net
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/wepoll[x86_64CLANG].a
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libsqlite3[x86_64CLANG].a
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmongoc[x86_64CLANG].a
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libbson[x86_64CLANG].a
@@ -232,7 +230,6 @@ if(WIN32)
     dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_cuttdb
 
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/wepoll[x86_64CLANG].a
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libsqlite3[x86_64CLANG].a
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmongoc[x86_64CLANG].a
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libbson[x86_64CLANG].a
@@ -265,7 +262,6 @@ if(WIN32)
   )
   set_property(TARGET ${PROJECT_NAME}-tool APPEND_STRING PROPERTY LINK_FLAGS "-mconsole")
 
-
   target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
     dap_enc_server dap_stream dap_stream_ch_vpn dap_stream_ch_chain dap_stream_ch_chain_net
     dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
@@ -274,7 +270,6 @@ if(WIN32)
     dap_chain_net_srv_datum dap_chain_net_srv_datum_pool
     dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_chain_gdb
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/wepoll[x86_64CLANG].a
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libsqlite3[x86_64CLANG].a
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmongoc[x86_64CLANG].a
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libbson[x86_64CLANG].a
@@ -315,8 +310,6 @@ endif()
 #add_executable(${PROJECT_NAME}-tool "sources/main_node_tool.c" )
 
 if(UNIX)
-
-
     target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
         dap_enc_server dap_stream dap_stream_ch_vpn dap_stream_ch_chain dap_stream_ch_chain_net
         dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
@@ -350,7 +343,6 @@ if(UNIX)
         target_link_libraries(${PROJECT_NAME}-tool pthread)
 
     endif()
-
 endif()
 
 target_include_directories(${PROJECT_NAME} INTERFACE .)

libdap @ 9053a059

-Subproject commit 1c0614797a3a2a2f4c179630025600e177637a65
+Subproject commit 9053a0597613f8dc685bfd756b058494b8aaef14

libdap-chain @ 65f71526

-Subproject commit 04be73e68e1994e86a71154370616a3a3b2b85ae
+Subproject commit 65f715269361e3d9ba317537e655961f31bf2247

libdap-chain-cs-dag @ 4d83c5af

-Subproject commit 447d6db4e8587d6118e968eb1109fbf2a3356247
+Subproject commit 4d83c5afc1e0f71c24b48603557372f8bb20f021

libdap-chain-cs-dag-poa @ 757f5879

-Subproject commit db06bbd6a784ff2496f2d1bb9cbb54924efe83b6
+Subproject commit 757f58797844421ce4b3b369e11dff9065acbfb6

libdap-chain-cs-dag-pos @ 52bf1186

-Subproject commit b1a0d674dbb56938e0ba58862ad1d638420e554f
+Subproject commit 52bf11864520d7090362713cadf87fe0d63bd8a3

libdap-chain-gdb @ 86d32bd6

-Subproject commit 76181225215f91f3a2a42671f735f70ade46d045
+Subproject commit 86d32bd6dc2159e7fe3eb50996dd6b8c8f51be5d

libdap-chain-global-db @ b7d2fb60

-Subproject commit 8c6bbf4458bd10614bf48bb2da7e84b4f80f0d33
+Subproject commit b7d2fb60fe97c6f8e2a08cb41429d1f33a3bc353

libdap-chain-mempool @ 74421dd7

-Subproject commit 4bbdcf60e10de8462820e45d7cc3715dca4c2139
+Subproject commit 74421dd778babd15c0e8e2c28f9b4e4c1d93d41e

libdap-chain-net @ 8de30467

-Subproject commit 94ff5a32e30465d3e5986a11753caf57f67e5096
+Subproject commit 8de30467285db82cdeef34e95eae60efecec95d3

libdap-chain-net-srv @ cafb5af4

-Subproject commit 5edea70af6a5ede0c759e9d83a5741376f4da9fb
+Subproject commit cafb5af4984e8ee347518c0718f5c68733b51f3a

libdap-chain-net-srv-app @ 18e4d357

-Subproject commit e5f23784de6b8cc16b80b4bc755c67df5fc7565f
+Subproject commit 18e4d357d6d984b96ea8c95582d206217ab3f032

libdap-chain-net-srv-app-db @ 9e115e17

-Subproject commit ce7f0333b77f8290428949b593e0ca2bd3df01b3
+Subproject commit 9e115e17ab30a8b6df0507471e2c08a4dad8c184

libdap-chain-net-srv-datum @ 60239115

-Subproject commit 5186f865f3a1bd10ef61f3cb039d85c9b32c7ad7
+Subproject commit 602391159d47da34b08d8da743812a26a2efdd97

libdap-chain-net-srv-datum-pool @ 883e227b

-Subproject commit 0eb7c08027ff1a643c90b5ca59a8e4267e71ca6f
+Subproject commit 883e227be78ca7f2aa33a9283b5122198875dad3

libdap-chain-wallet @ 3fcaedb1

-Subproject commit 5273ba5ba0a15dd94e680f9d961ab150f3764848
+Subproject commit 3fcaedb1f33a3db1bde6050f824fdabf07e9ad34

libdap-client @ b583f811

-Subproject commit d3f5458f352294547b1ac68404d5ccdc8dea28ba
+Subproject commit b583f811fe3221c51f491809095340e0a6ff47af

libdap-server @ d7401c14

-Subproject commit e3f07ae78aaecfada9f44abdd48a4ebbce9e2184
+Subproject commit d7401c1493dbbd86e843c639182469c09331d077

libdap-server-core @ 0f9f2923

-Subproject commit 73a86ef8202ee67a05098d186aac2deacb207f63
+Subproject commit 0f9f2923b4f650ea1a6af6cc1207a2f44a1cf7fe