diff --git a/dap-sdk/net/client/dap_client_http.c b/dap-sdk/net/client/dap_client_http.c
index d960d9f3bef1f5686e33a6db39cd5a2d141853ca..f525976e5e37036aa0e1cac691008c47035a8690 100644
--- a/dap-sdk/net/client/dap_client_http.c
+++ b/dap-sdk/net/client/dap_client_http.c
@@ -368,14 +368,17 @@ void* dap_client_http_request_custom(dap_worker_t * a_worker,const char *a_uplin
#ifdef DAP_OS_WINDOWS
SOCKET l_socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (l_socket == INVALID_SOCKET) {
- log_it(L_ERROR, "Socket create error: %d", WSAGetLastError());
+ int err = WSAGetLastError();
+ log_it(L_ERROR, "Socket create error: %d", err);
+ if(a_error_callback)
+ a_error_callback(err, a_obj);
#else
int l_socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (l_socket == -1) {
log_it(L_ERROR, "Error %d with socket create", errno);
-#endif
if(a_error_callback)
a_error_callback(errno,a_obj);
+#endif
return NULL;
}
// Get socket flags
@@ -486,12 +489,15 @@ void* dap_client_http_request_custom(dap_worker_t * a_worker,const char *a_uplin
log_it(L_DEBUG, "Connecting to %s:%u", a_uplink_addr, a_uplink_port);
l_http_pvt->worker = a_worker?a_worker: dap_events_worker_get_auto();
dap_worker_add_events_socket(l_ev_socket,l_http_pvt->worker);
+ dap_timerfd_start_on_worker(l_http_pvt->worker,s_client_timeout_ms, s_timer_timeout_check,l_ev_socket);
return l_http_pvt;
} else {
log_it(L_ERROR, "Socket %d connecting error: %d", l_ev_socket->socket, l_err2);
s_client_http_delete( l_http_pvt);
l_ev_socket->_inheritor = NULL;
dap_events_socket_delete_unsafe( l_ev_socket, true);
+ if(a_error_callback)
+ a_error_callback(l_err2, a_obj);
return NULL;
}
}
@@ -509,6 +515,7 @@ void* dap_client_http_request_custom(dap_worker_t * a_worker,const char *a_uplin
strerror_r(l_err, l_errbuf, sizeof (l_errbuf));
log_it(L_ERROR, "Connecting error: \"%s\" (code %d)", l_errbuf, l_err);
s_client_http_delete( l_http_pvt);
+ l_ev_socket->_inheritor = NULL;
dap_events_socket_delete_unsafe( l_ev_socket, true);
if(a_error_callback)
a_error_callback(errno,a_obj);
diff --git a/dap-sdk/net/core/dap_events_socket.c b/dap-sdk/net/core/dap_events_socket.c
index b66b0a45c6679d170e184aa3a9f6917101817366..c14675dbc12e5dcac487c7938fe3af6ba5cd8ce3 100644
--- a/dap-sdk/net/core/dap_events_socket.c
+++ b/dap-sdk/net/core/dap_events_socket.c
@@ -154,11 +154,7 @@ dap_events_socket_t *dap_events_socket_wrap_no_add( dap_events_t *a_events,
if ( a_sock!= 0 && a_sock != -1){
pthread_rwlock_wrlock(&a_events->sockets_rwlock);
-#ifdef DAP_OS_WINDOWS
- HASH_ADD(hh,a_events->sockets, socket, sizeof(SOCKET), ret);
-#else
HASH_ADD_INT(a_events->sockets, socket, ret);
-#endif
pthread_rwlock_unlock(&a_events->sockets_rwlock);
}else
log_it(L_WARNING, "Be carefull, you've wrapped socket 0 or -1 so it wasn't added to global list. Do it yourself when possible");
@@ -1178,11 +1174,7 @@ dap_events_socket_t * dap_events_socket_wrap2( dap_server_t *a_server, struct da
ret->last_time_active = ret->last_ping_request = time( NULL );
pthread_rwlock_wrlock( &a_events->sockets_rwlock );
-#ifdef DAP_OS_WINDOWS
- HASH_ADD(hh,a_events->sockets, socket, sizeof(SOCKET), ret);
-#else
HASH_ADD_INT(a_events->sockets, socket, ret);
-#endif
pthread_rwlock_unlock( &a_events->sockets_rwlock );
return ret;
@@ -1203,14 +1195,9 @@ dap_events_socket_t *dap_events_socket_find_unsafe( int sock, struct dap_events
return NULL;
if(a_events->sockets) {
pthread_rwlock_rdlock(&a_events->sockets_rwlock);
-#ifdef DAP_OS_WINDOWS
- HASH_FIND(hh, a_events->sockets, &sock, sizeof(SOCKET), ret );
-#else
HASH_FIND_INT( a_events->sockets, &sock, ret );
-#endif
pthread_rwlock_unlock(&a_events->sockets_rwlock);
}
-
return ret;
}
@@ -1321,8 +1308,7 @@ void dap_events_socket_remove_and_delete_unsafe( dap_events_socket_t *a_es, bool
return;
//log_it( L_DEBUG, "es is going to be removed from the lists and free the memory (0x%016X)", a_es );
- if ( a_es->worker)
- dap_events_socket_remove_from_worker_unsafe(a_es, a_es->worker);
+ dap_events_socket_remove_from_worker_unsafe(a_es, a_es->worker);
//log_it( L_DEBUG, "dap_events_socket wrapped around %d socket is removed", a_es->socket );
@@ -1341,7 +1327,11 @@ void dap_events_socket_delete_unsafe( dap_events_socket_t * a_esocket , bool a_p
{
if (a_esocket->events){ // It could be socket NOT from events
if(!dap_events_socket_find_unsafe(a_esocket->socket, a_esocket->events)){
- log_it( L_ERROR, "dap_events_socket 0x%x already deleted", a_esocket);
+ log_it(L_ERROR, "esocket %d type %d already deleted", a_esocket->socket, a_esocket->type);
+ /*dap_events_socket_t * es1 = NULL, *es2;
+ HASH_ITER(hh, a_esocket->events->sockets, es1, es2) {
+ log_it(L_INFO, "Table: socket %d", es1->socket);
+ }*/
return ;
}
@@ -1358,12 +1348,14 @@ void dap_events_socket_delete_unsafe( dap_events_socket_t * a_esocket , bool a_p
DAP_DEL_Z(a_esocket->_pvt)
DAP_DEL_Z(a_esocket->buf_in)
DAP_DEL_Z(a_esocket->buf_out)
- DAP_DEL_Z(a_esocket->remote_addr_str)
+ if (a_esocket->type == DESCRIPTOR_TYPE_SOCKET) {
+ DAP_DEL_Z(a_esocket->remote_addr_str)
+ }
#ifdef DAP_OS_WINDOWS
- if ( a_esocket->socket && a_esocket->socket != INVALID_SOCKET) {
+ if ( a_esocket->socket && (a_esocket->socket != INVALID_SOCKET)) {
closesocket( a_esocket->socket );
#else
- if ( a_esocket->socket && a_esocket->socket != -1) {
+ if ( a_esocket->socket && (a_esocket->socket != -1)) {
close( a_esocket->socket );
#ifdef DAP_EVENTS_CAPS_QUEUE_PIPE2
if( a_esocket->type == DESCRIPTOR_TYPE_QUEUE){
@@ -1383,7 +1375,7 @@ void dap_events_socket_delete_unsafe( dap_events_socket_t * a_esocket , bool a_p
void dap_events_socket_remove_from_worker_unsafe( dap_events_socket_t *a_es, dap_worker_t * a_worker)
{
if (!a_es->worker) {
- // Socket already removed from worker
+ log_it(L_INFO, "No worker assigned to esocket %d", a_es->socket);
return;
}
#ifdef DAP_EVENTS_CAPS_EPOLL
diff --git a/dap-sdk/net/core/dap_worker.c b/dap-sdk/net/core/dap_worker.c
index fa51bdc1cd9db30e6a0bf8dbd20282a1c7112252..91cd4bce29cfffb2c23c05df015cd69513fe6e1e 100644
--- a/dap-sdk/net/core/dap_worker.c
+++ b/dap-sdk/net/core/dap_worker.c
@@ -631,10 +631,12 @@ void *dap_worker_thread(void *arg)
if ((l_cur->flags & DAP_SOCK_SIGNAL_CLOSE) && !l_cur->no_close)
{
if (l_cur->buf_out_size == 0) {
- log_it(L_INFO, "Process signal to close %s, sock %u [thread %u]", l_cur->remote_addr_str, l_cur->socket, l_tn);
+ log_it(L_INFO, "Process signal to close %s sock %u type %d [thread %u]",
+ l_cur->remote_addr_str ? l_cur->remote_addr_str : "", l_cur->socket, l_cur->type, l_tn);
dap_events_socket_remove_and_delete_unsafe( l_cur, false);
} else if (l_cur->buf_out_size ) {
- log_it(L_INFO, "Got signal to close %s, sock %u [thread %u] but buffer is not empty(%zd)", l_cur->remote_addr_str, l_cur->socket, l_tn,
+ log_it(L_INFO, "Got signal to close %s sock %u [thread %u] type %d but buffer is not empty(%zd)",
+ l_cur->remote_addr_str ? l_cur->remote_addr_str : "", l_cur->socket, l_cur->type, l_tn,
l_cur->buf_out_size);
}
}