From fbb2ead93897ef58c3e9a8baed1dbb184a63fd27 Mon Sep 17 00:00:00 2001
From: alexandrmruchok <alexandrmruchok@gmail.com>
Date: Tue, 17 Dec 2019 17:52:36 +0200
Subject: [PATCH] [*] replaced pthread_timedjoin_np with pthread_join;
---
CMakeLists.txt | 7 ++++---
dap_chain_node_ping.c | 4 ++++
iputils/iputils.h | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1575eb7b4..4c86cc5c60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.0)
project (dap_chain_net)
+
set(DAP_CHAIN_NET_SRCS
dap_chain_net.c
dap_chain_net_remote.c
@@ -69,13 +70,13 @@ if(WIN32)
endif()
if(UNIX)
- target_link_libraries(dap_chain_net dap_core dap_crypto dap_client dap_stream_ch_chain dap_chain_gdb dap_stream_ch_chain_net dap_chain
+ target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_client dap_stream_ch_chain dap_chain_gdb dap_stream_ch_chain_net dap_chain
dap_chain_crypto dap_chain_wallet dap_chain_net_srv dap_chain_net_srv_vpn dap_chain_mempool dap_chain_global_db
- resolv
+# resolv
)
endif()
-target_include_directories(dap_chain_net INTERFACE . PUBLIC ${IPUTILS_INCLUDE_DIRS})
+target_include_directories(${PROJECT_NAME} INTERFACE . PUBLIC ${IPUTILS_INCLUDE_DIRS})
set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
diff --git a/dap_chain_node_ping.c b/dap_chain_node_ping.c
index cd7d84492b..bf3527d9ca 100644
--- a/dap_chain_node_ping.c
+++ b/dap_chain_node_ping.c
@@ -161,7 +161,11 @@ int wait_node_ping(pthread_t l_thread, int timeout_ms)
l_wait_time.tv_sec += timeout_ms / DAP_USEC_PER_SEC;
l_wait_time.tv_nsec += 1000 * (timeout_ms % DAP_USEC_PER_SEC);
+#ifdef __ANDROID__
+ int res = pthread_join(l_thread, (void **) &l_ping_time);
+#else
int res = pthread_timedjoin_np(l_thread, (void **) &l_ping_time, &l_wait_time);
+#endif
if(res == ETIMEDOUT) {
pthread_kill(l_thread, 3); // SIGQUIT SIGABRT
}
diff --git a/iputils/iputils.h b/iputils/iputils.h
index 4ec59b51a4..d7948fb516 100644
--- a/iputils/iputils.h
+++ b/iputils/iputils.h
@@ -9,6 +9,7 @@
#include <stdlib.h>
#include <netinet/ip.h>
#include <setjmp.h>
+#include <sys/time.h>
#ifdef __cplusplus
extern "C" {
--
GitLab