diff --git a/dap-sdk/net/client/dap_client_http.c b/dap-sdk/net/client/dap_client_http.c
index 08a7f6ea59ef2300c149546cef83f62c6f1876c1..d43fa788ac058f4a52323bdb6053364965d580b7 100644
--- a/dap-sdk/net/client/dap_client_http.c
+++ b/dap-sdk/net/client/dap_client_http.c
@@ -95,8 +95,8 @@ static bool s_timer_timeout_after_connected_check(void * a_arg);
static bool s_debug_more=false;
-static uint64_t s_client_timeout_ms=20000;
-static time_t s_client_timeout_read_after_connect_ms=5000;
+static uint64_t s_client_timeout_ms = 20000;
+static time_t s_client_timeout_read_after_connect = 5;
static uint32_t s_max_attempts = 5;
#ifndef DAP_NET_CLIENT_NO_SSL
@@ -112,7 +112,7 @@ int dap_client_http_init()
s_debug_more = dap_config_get_item_bool_default(g_config,"dap_client","debug_more",false);
s_max_attempts = dap_config_get_item_uint32_default(g_config,"dap_client","max_tries",5);
s_client_timeout_ms = dap_config_get_item_uint32_default(g_config,"dap_client","timeout",10)*1000;
- s_client_timeout_read_after_connect_ms = (time_t) dap_config_get_item_uint32_default(g_config,"dap_client","timeout_read_after_connect",5);
+ s_client_timeout_read_after_connect = (time_t) dap_config_get_item_uint32_default(g_config,"dap_client","timeout_read_after_connect",5);
#ifndef DAP_NET_CLIENT_NO_SSL
wolfSSL_Init();
wolfSSL_Debugging_ON ();
@@ -198,7 +198,7 @@ static bool s_timer_timeout_after_connected_check(void * a_arg)
return false;
}
dap_client_http_pvt_t * l_http_pvt = PVT(l_es);
- if ( time(NULL)- l_http_pvt->ts_last_read > s_client_timeout_read_after_connect_ms ){
+ if ( time(NULL)- l_http_pvt->ts_last_read >= s_client_timeout_read_after_connect){
log_it(L_WARNING,"Read after connect timeout for request http://%s:%u/%s, possible uplink is on heavy load or DPI between you",
l_http_pvt->uplink_addr, l_http_pvt->uplink_port, l_http_pvt->path);
if(l_http_pvt->error_callback) {
@@ -717,7 +717,7 @@ static void s_http_connected(dap_events_socket_t * a_esocket)
dap_events_socket_handler_t * l_ev_socket_handler = DAP_NEW_Z(dap_events_socket_handler_t);
l_ev_socket_handler->esocket = a_esocket;
l_ev_socket_handler->uuid = a_esocket->uuid;
- dap_timerfd_start_on_worker(l_http_pvt->worker,s_client_timeout_ms, s_timer_timeout_after_connected_check,l_ev_socket_handler);
+ dap_timerfd_start_on_worker(l_http_pvt->worker, (unsigned long)s_client_timeout_read_after_connect * 1000, s_timer_timeout_after_connected_check, l_ev_socket_handler);
char l_request_headers[1024] = { [0]='\0' };
int l_offset = 0;
diff --git a/dap-sdk/net/client/dap_client_pvt.c b/dap-sdk/net/client/dap_client_pvt.c
index 46cfeb6d4c46d1446cc673ac26e1580cf0573ffc..483361c50ee477f89b1d7c73b2de876afbe4b2fe 100644
--- a/dap-sdk/net/client/dap_client_pvt.c
+++ b/dap-sdk/net/client/dap_client_pvt.c
@@ -81,7 +81,7 @@
static int s_max_attempts = 5;
static int s_timeout = 20;
static bool s_debug_more = false;
-static time_t s_client_timeout_read_after_connect_ms=5000;
+static time_t s_client_timeout_read_after_connect = 5;
static bool s_stage_status_after(dap_client_pvt_t * a_client_internal);
@@ -125,7 +125,7 @@ int dap_client_pvt_init()
s_max_attempts = dap_config_get_item_int32_default(g_config,"dap_client","max_tries",5);
s_timeout = dap_config_get_item_int32_default(g_config,"dap_client","timeout",10);
s_debug_more = dap_config_get_item_bool_default(g_config,"dap_client","debug_more",false);
- s_client_timeout_read_after_connect_ms = (time_t) dap_config_get_item_uint32_default(g_config,"dap_client","timeout_read_after_connect",5);
+ s_client_timeout_read_after_connect = (time_t) dap_config_get_item_uint32_default(g_config,"dap_client","timeout_read_after_connect",5);
return 0;
}
@@ -209,7 +209,7 @@ static void s_stream_connected(dap_client_pvt_t * a_client_pvt)
dap_events_socket_handler_t * l_ev_socket_handler = DAP_NEW_Z(dap_events_socket_handler_t);
l_ev_socket_handler->esocket = a_client_pvt->stream_es;
l_ev_socket_handler->uuid = a_client_pvt->stream_es->uuid;
- dap_timerfd_start_on_worker(a_client_pvt->stream_es->worker,s_client_timeout_read_after_connect_ms*1000, s_stream_timer_timeout_after_connected_check ,l_ev_socket_handler);
+ dap_timerfd_start_on_worker(a_client_pvt->stream_es->worker, s_client_timeout_read_after_connect * 1000, s_stream_timer_timeout_after_connected_check ,l_ev_socket_handler);
}
/**
@@ -284,7 +284,7 @@ static bool s_stream_timer_timeout_after_connected_check(void * a_arg)
return false;
}
dap_client_pvt_t * l_client_pvt =(dap_client_pvt_t *) l_es->_inheritor;//(l_client) ? DAP_CLIENT_PVT(l_client) : NULL;
- if ( time(NULL)- l_client_pvt->ts_last_read > s_client_timeout_read_after_connect_ms ){
+ if ( time(NULL)- l_client_pvt->ts_last_read >= s_client_timeout_read_after_connect){
log_it(L_WARNING,"Connecting timeout for streaming uplink http://%s:%u/, possible network problems or host is down",
l_client_pvt->uplink_addr, l_client_pvt->uplink_port);
@@ -503,7 +503,7 @@ static bool s_stage_status_after(dap_client_pvt_t * a_client_pvt)
dap_events_socket_handler_t * l_stream_es_handler = DAP_NEW_Z(dap_events_socket_handler_t);
l_stream_es_handler->esocket = a_client_pvt->stream_es;
l_stream_es_handler->uuid = a_client_pvt->stream_es->uuid;
- dap_timerfd_start_on_worker(a_client_pvt->worker,s_client_timeout_read_after_connect_ms*1000,
+ dap_timerfd_start_on_worker(a_client_pvt->worker, (unsigned long)s_client_timeout_read_after_connect * 1000,
s_stream_timer_timeout_check,l_stream_es_handler);
}
else if (l_err != EINPROGRESS && l_err != -1){
@@ -532,7 +532,7 @@ static bool s_stage_status_after(dap_client_pvt_t * a_client_pvt)
dap_events_socket_handler_t * l_stream_es_handler = DAP_NEW_Z(dap_events_socket_handler_t);
l_stream_es_handler->esocket = a_client_pvt->stream_es;
l_stream_es_handler->uuid = a_client_pvt->stream_es->uuid;
- dap_timerfd_start_on_worker(a_client_pvt->worker,s_client_timeout_read_after_connect_ms*1000,
+ dap_timerfd_start_on_worker(a_client_pvt->worker, (unsigned long)s_client_timeout_read_after_connect * 1000,
s_stream_timer_timeout_check,l_stream_es_handler);
}
}