diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e8bf8c33798fad4b250bb4a93869717be2cbbe6..174b4169e519b37c62caa7df48f3aa4adec0d617 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,12 +56,8 @@ if(WIN32) add_definitions ("-D_POSIX_THREAD_SAFE_FUNCTIONS") add_definitions ("-DNODE_NETNAME=\"cellframe\"") add_compile_definitions(_GNU_SOURCE) - include_directories(../libdap/src/win32/) - include_directories(../3rdparty/wepoll/include/) + include_directories(../3rdparty/wepoll/) include_directories(../3rdparty/uthash/src/) - include_directories(../3rdparty/libjson-c/) - include_directories(../3rdparty/curl/include/) - include_directories(../3rdparty/libsqlite3/) endif() add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_NET_SRCS} ${DAP_CHAIN_NET_HEADERS} ${IPUTILS_SRCS} ${IPUTILS_HEADERS}) diff --git a/dap_chain_net.c b/dap_chain_net.c index 7b930a71830f62e84cde8c29811d20af95511ba8..36cf5571055b2f1347a07bcdb47b5bc6448ed842 100755 --- a/dap_chain_net.c +++ b/dap_chain_net.c @@ -826,10 +826,11 @@ static void *s_net_proc_thread ( void *a_net ) // wait if flag not set then go to SYNC_GDB if(!(PVT(l_net)->flags & F_DAP_CHAIN_NET_GO_SYNC)) { + struct timespec l_to; #ifndef _WIN32 pthread_mutex_lock( &p_net->state_mutex_cond ); // prepare for signal waiting - struct timespec l_to; + clock_gettime( CLOCK_MONOTONIC, &l_to ); int64_t l_nsec_new = l_to.tv_nsec + l_timeout_ms * 1000000ll; diff --git a/dap_chain_node_cli_cmd.c b/dap_chain_node_cli_cmd.c index 422f2c0b72d78f00b58c1be915f1b895b3b42d51..85e81c79894a8f680d3bf79fb3b2afddfbc042c2 100644 --- a/dap_chain_node_cli_cmd.c +++ b/dap_chain_node_cli_cmd.c @@ -1568,7 +1568,7 @@ int com_tx_wallet(int argc, char ** argv, char **str_reply) // dap_sign_type_t l_sign_type = { SIG_TYPE_BLISS }; dap_sign_type_t l_sign_type = dap_sign_type_from_str(l_sign_type_str); if(l_sign_type.type == SIG_TYPE_NULL){ - l_sign_type.type = SIG_TYPE_BLISS; + l_sign_type.type = SIG_TYPE_DILITHIUM; l_sign_type_str = dap_sign_type_to_str(l_sign_type); } uint8_t *l_seed = NULL; diff --git a/dap_chain_node_client.c b/dap_chain_node_client.c index 47604d533b3402a29a399dc1e99a474acefd06b7..3b536019d72bdea3343ff25eaa523df0c1816e85 100644 --- a/dap_chain_node_client.c +++ b/dap_chain_node_client.c @@ -44,7 +44,7 @@ #include "dap_config.h" #include "dap_events.h" #include "dap_hash.h" -#include "dap_http_client_simple.h" +//#include "dap_http_client_simple.h" #include "dap_client_pvt.h" #include "dap_chain_global_db_remote.h" #include "dap_chain_global_db_hist.h" @@ -85,7 +85,7 @@ int dap_chain_node_client_init(void) */ void dap_chain_node_client_deinit() { - dap_http_client_simple_deinit(); + //dap_http_client_simple_deinit(); dap_client_deinit(); } diff --git a/iputils/traceroute/traceroute.c b/iputils/traceroute/traceroute.c index 8f0ec111330e3be9a0b8e42a365ed3eb4361584b..a0dbeb2e233478034ab0b0fb6caec1a7285f74ed 100755 --- a/iputils/traceroute/traceroute.c +++ b/iputils/traceroute/traceroute.c @@ -27,7 +27,6 @@ /* XXX: Remove this when things will be defined properly in netinet/ ... */ #include "flowlabel.h" -#include <clif.h> //#include "version.h" #include <stdbool.h> //#include <glib.h> diff --git a/iputils/traceroute/traceroute.h b/iputils/traceroute/traceroute.h index 532b7b6f0912d67fb71e2bcac901d7f9da99bb37..0db40c544ed51febe2379ba64de5bbfe1b689057 100644 --- a/iputils/traceroute/traceroute.h +++ b/iputils/traceroute/traceroute.h @@ -8,7 +8,7 @@ #include <netinet/in.h> -#include <clif.h> +#include "clif.h" #include "../iputils.h" union common_sockaddr {