From a37b82ade6fc9c450f4193296660e42b140fa18b Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Thu, 3 Sep 2020 13:23:27 +0700
Subject: [PATCH] [-] Removed few useless functions and logs
---
dap-sdk/CMakeLists.txt | 1 +
.../http_server/http_client/dap_http_client.c | 11 +++--
.../http_server/include/dap_http_folder.h | 6 +--
dap-sdk/net/stream/ch/dap_stream_ch.c | 45 -------------------
dap-sdk/net/stream/ch/include/dap_stream_ch.h | 6 ---
.../stream/ch/include/dap_stream_ch_proc.h | 8 ++--
dap-sdk/net/stream/stream/dap_stream.c | 2 +-
modules/service/vpn/dap_chain_net_srv_vpn.c | 4 --
8 files changed, 16 insertions(+), 67 deletions(-)
diff --git a/dap-sdk/CMakeLists.txt b/dap-sdk/CMakeLists.txt
index 89f2652ec8..cc44d581e1 100644
--- a/dap-sdk/CMakeLists.txt
+++ b/dap-sdk/CMakeLists.txt
@@ -1,3 +1,4 @@
+set(DAP_SDK_NATIVE_VERSION "2.0-11")
# Core
if (DAPSDK_MODULES MATCHES "core")
# Core
diff --git a/dap-sdk/net/server/http_server/http_client/dap_http_client.c b/dap-sdk/net/server/http_server/http_client/dap_http_client.c
index c592706837..8f07fcf5a7 100644
--- a/dap-sdk/net/server/http_server/http_client/dap_http_client.c
+++ b/dap-sdk/net/server/http_server/http_client/dap_http_client.c
@@ -73,7 +73,6 @@ void dap_http_client_new( dap_events_socket_t *cl, void *arg )
{
(void) arg;
- log_it( L_NOTICE, "dap_http_client_new" );
cl->_inheritor = DAP_NEW_Z( dap_http_client_t );
@@ -526,9 +525,13 @@ void dap_http_client_write( dap_events_socket_t * cl, void *arg )
} break;
case DAP_HTTP_CLIENT_STATE_DATA:
{
- if ( l_http_client->proc )
- if ( l_http_client->proc->data_write_callback )
- l_http_client->proc->data_write_callback( l_http_client, NULL );
+ if ( l_http_client->proc ){
+ if ( l_http_client->proc->data_write_callback ){
+ l_http_client->proc->data_write_callback( l_http_client, NULL );
+ }
+ }else{
+ log_it(L_WARNING, "No http proc, nothing to write");
+ }
}
break;
}
diff --git a/dap-sdk/net/server/http_server/include/dap_http_folder.h b/dap-sdk/net/server/http_server/include/dap_http_folder.h
index 43a10f29ff..530afb1e2e 100644
--- a/dap-sdk/net/server/http_server/include/dap_http_folder.h
+++ b/dap-sdk/net/server/http_server/include/dap_http_folder.h
@@ -23,8 +23,8 @@
#pragma once
struct dap_http;
-extern int dap_http_folder_init();
-extern void dap_http_folder_deinit();
+int dap_http_folder_init(void);
+void dap_http_folder_deinit(void);
-extern int dap_http_folder_add(struct dap_http *sh, const char * url_path, const char * local_path); // Add folder for reading to the HTTP server
+int dap_http_folder_add(struct dap_http *sh, const char * url_path, const char * local_path); // Add folder for reading to the HTTP server
diff --git a/dap-sdk/net/stream/ch/dap_stream_ch.c b/dap-sdk/net/stream/ch/dap_stream_ch.c
index 85c0649402..b28f693ab8 100644
--- a/dap-sdk/net/stream/ch/dap_stream_ch.c
+++ b/dap-sdk/net/stream/ch/dap_stream_ch.c
@@ -123,20 +123,6 @@ dap_stream_ch_t* dap_stream_ch_new(dap_stream_t* a_stream, uint8_t id)
}
}
-struct dap_stream_ch_table_t *dap_stream_ch_valid(dap_stream_ch_t *a_ch)
-{
- struct dap_stream_ch_table_t *l_ret;
- if(!a_ch)
- return false;
- pthread_mutex_lock(&s_ch_table_lock);
- HASH_FIND_PTR(s_ch_table, &a_ch, l_ret);
- if (l_ret) {
- pthread_mutex_lock(&a_ch->mutex);
- }
- pthread_mutex_unlock(&s_ch_table_lock);
- return l_ret;
-}
-
/**
* @brief stream_ch_delete Delete channel instance
* @param ch Channel delete
@@ -207,34 +193,3 @@ void dap_stream_ch_set_ready_to_write_unsafe(dap_stream_ch_t * ch,bool is_ready)
}
}
-/**
- * @brief dap_stream_ch_get_ready_to_read
- * @param a_ch
- * @return
- */
-bool dap_stream_ch_get_ready_to_read(dap_stream_ch_t * a_ch)
-{
- if (!dap_stream_ch_valid(a_ch)) {
- return false;
- }
- bool l_ret;
- l_ret = a_ch->ready_to_read;
- pthread_mutex_unlock(&a_ch->mutex);
- return l_ret;
-}
-
-/**
- * @brief dap_stream_ch_get_ready_to_write
- * @param a_ch
- * @return
- */
-bool dap_stream_ch_get_ready_to_write(dap_stream_ch_t * a_ch)
-{
- if (!dap_stream_ch_valid(a_ch)) {
- return false;
- }
- bool l_ret;
- l_ret = a_ch->ready_to_write;
- pthread_mutex_unlock(&a_ch->mutex);
- return l_ret;
-}
diff --git a/dap-sdk/net/stream/ch/include/dap_stream_ch.h b/dap-sdk/net/stream/ch/include/dap_stream_ch.h
index dc1e862802..a4da8d255f 100644
--- a/dap-sdk/net/stream/ch/include/dap_stream_ch.h
+++ b/dap-sdk/net/stream/ch/include/dap_stream_ch.h
@@ -58,15 +58,9 @@ int dap_stream_ch_init();
void dap_stream_ch_deinit();
dap_stream_ch_t* dap_stream_ch_new( dap_stream_t * dap_stream,uint8_t id);
-
void dap_stream_ch_set_ready_to_read_unsafe(dap_stream_ch_t * ch,bool is_ready);
void dap_stream_ch_set_ready_to_write_unsafe(dap_stream_ch_t * ch,bool is_ready);
-
-bool dap_stream_ch_get_ready_to_read(dap_stream_ch_t *a_ch);
-bool dap_stream_ch_get_ready_to_write(dap_stream_ch_t *a_ch);
-
void dap_stream_ch_delete(dap_stream_ch_t *a_ch);
-struct dap_stream_ch_table_t *dap_stream_ch_valid(dap_stream_ch_t *a_ch);
#endif
diff --git a/dap-sdk/net/stream/ch/include/dap_stream_ch_proc.h b/dap-sdk/net/stream/ch/include/dap_stream_ch_proc.h
index 1847aa42bf..f3ea2c410c 100644
--- a/dap-sdk/net/stream/ch/include/dap_stream_ch_proc.h
+++ b/dap-sdk/net/stream/ch/include/dap_stream_ch_proc.h
@@ -37,14 +37,14 @@ typedef struct dap_stream_ch_proc{
void * internal;
} stream_ch_proc_t;
-extern int stream_ch_proc_init();
-extern void stream_ch_proc_deinit();
+int stream_ch_proc_init();
+void stream_ch_proc_deinit();
-extern void dap_stream_ch_proc_add(uint8_t id,
+void dap_stream_ch_proc_add(uint8_t id,
dap_stream_ch_callback_t new_callback, dap_stream_ch_callback_t delete_callback,
dap_stream_ch_callback_t packet_in_callback,
dap_stream_ch_callback_t packet_out_callback
);
-extern stream_ch_proc_t* stream_ch_proc_find(uint8_t id);
+stream_ch_proc_t* stream_ch_proc_find(uint8_t id);
#endif
diff --git a/dap-sdk/net/stream/stream/dap_stream.c b/dap-sdk/net/stream/stream/dap_stream.c
index c8cdc2410a..d621ea294e 100644
--- a/dap-sdk/net/stream/stream/dap_stream.c
+++ b/dap-sdk/net/stream/stream/dap_stream.c
@@ -476,7 +476,7 @@ static void s_esocket_write(dap_events_socket_t* a_client , void * a_arg){
size_t i;
bool ready_to_write=false;
dap_http_client_t *l_http_client = DAP_HTTP_CLIENT(a_client);
- //log_it(L_DEBUG,"Process channels data output (%u channels)", DAP_STREAM(l_http_client)->channel_count );
+ log_it(L_DEBUG,"Process channels data output (%u channels)", DAP_STREAM(l_http_client)->channel_count );
for(i=0;i<DAP_STREAM(l_http_client)->channel_count; i++){
dap_stream_ch_t * ch = DAP_STREAM(l_http_client)->channel[i];
if(ch->ready_to_write){
diff --git a/modules/service/vpn/dap_chain_net_srv_vpn.c b/modules/service/vpn/dap_chain_net_srv_vpn.c
index 2605ef012b..c680840a2e 100644
--- a/modules/service/vpn/dap_chain_net_srv_vpn.c
+++ b/modules/service/vpn/dap_chain_net_srv_vpn.c
@@ -1530,7 +1530,6 @@ void * srv_ch_sf_thread(void * a_arg)
if(ret > 0) {
size_t buf_size = ret;
s_update_limits(l_socket_proxy->ch,l_srv_session,l_usage,buf_size);
- if ( dap_stream_ch_get_ready_to_read(l_socket_proxy->ch) ){
ch_vpn_pkt_t * pout;
pout = l_socket_proxy->pkt_out[l_socket_proxy->pkt_out_size] = (ch_vpn_pkt_t *) calloc(1,
buf_size + sizeof(pout->header));
@@ -1542,15 +1541,12 @@ void * srv_ch_sf_thread(void * a_arg)
l_socket_proxy->pkt_out_size++;
pthread_mutex_unlock(&(l_socket_proxy->mutex));
dap_stream_ch_set_ready_to_write_unsafe(l_socket_proxy->ch, true);
- }else{
pthread_mutex_unlock(&(l_socket_proxy->mutex));
- }
} else {
log_it(L_NOTICE,
"Socket id %d returned error on recv() function - may be host has disconnected", s);
pthread_mutex_unlock(&(l_socket_proxy->mutex));
- dap_stream_ch_set_ready_to_write_unsafe(l_socket_proxy->ch, true);
srv_stream_sf_disconnect(l_socket_proxy);
}
} else {
--
GitLab