diff --git a/dap-sdk/net/core/dap_events_socket.c b/dap-sdk/net/core/dap_events_socket.c index edcbf556444f8890f1c82e0752de7788240c167a..171b620ba51a17fe7005fe1c43ceb0e614b23367 100644 --- a/dap-sdk/net/core/dap_events_socket.c +++ b/dap-sdk/net/core/dap_events_socket.c @@ -322,7 +322,7 @@ dap_events_socket_t * dap_events_socket_queue_ptr_create_input(dap_events_socket { dap_events_socket_t * l_es = DAP_NEW_Z(dap_events_socket_t); l_es->type = DESCRIPTOR_TYPE_QUEUE; - l_es->buf_out_size_max = 8 * sizeof(void*); + l_es->buf_out_size_max = l_es->buf_in_size_max = 8 * sizeof(void*); l_es->buf_out = DAP_NEW_Z_SIZE(byte_t,l_es->buf_out_size_max ); //l_es->buf_out_size = 8 * sizeof(void*); l_es->events = a_es->events; @@ -423,11 +423,7 @@ dap_events_socket_t * s_create_type_queue_ptr(dap_worker_t * a_w, dap_events_soc l_es->worker = a_w; } l_es->callbacks.queue_ptr_callback = a_callback; // Arm event callback - if (l_es->buf_out){ - DAP_DELETE(l_es->buf_out); - l_es->buf_out_size_max =0; - - } + l_es->buf_in_size_max = 8 * sizeof(void*); l_es->buf_out = NULL; #if defined(DAP_EVENTS_CAPS_EPOLL) @@ -737,8 +733,8 @@ int dap_events_socket_queue_proc_input_unsafe(dap_events_socket_t * a_esocket) dap_events_socket_t * s_create_type_event(dap_worker_t * a_w, dap_events_socket_callback_event_t a_callback) { dap_events_socket_t * l_es = DAP_NEW_Z(dap_events_socket_t); if (!l_es) return NULL; - l_es->buf_out_size_max = 1; - l_es->buf_out = DAP_NEW_Z_SIZE(byte_t, l_es->buf_out_size_max); + l_es->buf_out_size_max = l_es->buf_in_size_max = 1; + l_es->buf_out = DAP_NEW_Z_SIZE(byte_t, l_es->buf_out_size_max); l_es->type = DESCRIPTOR_TYPE_EVENT; if (a_w){ l_es->events = a_w->events; diff --git a/dap-sdk/net/core/dap_worker.c b/dap-sdk/net/core/dap_worker.c index 37e89179355fae0511b333ba7da994223e7b4d24..46dd79b46403334c7fcfa149535c55dac34684f8 100644 --- a/dap-sdk/net/core/dap_worker.c +++ b/dap-sdk/net/core/dap_worker.c @@ -339,11 +339,11 @@ void *dap_worker_thread(void *arg) log_it(L_ERROR,"No accept_callback on listening socket"); break; case DESCRIPTOR_TYPE_TIMER:{ - uint64_t val; /* if we not reading data from socket, he triggered again */ #ifdef DAP_OS_WINDOWS l_bytes_read = dap_recvfrom(l_cur->socket, NULL, 0); #else + uint64_t val; read( l_cur->fd, &val, 8); #endif if (l_cur->callbacks.timer_callback)