From 1341b7757a284687c20e5736468073324f5d35b8 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Sat, 8 Sep 2018 15:48:07 +0700
Subject: [PATCH] [*] Renames und fixes
---
CMakeLists.txt | 6 +++---
dap_server.c | 3 ++-
dap_server_client.c | 4 ++--
dap_server_client.h | 4 ++--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fe6d63..c12bc38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,10 +10,10 @@ if(BUILD_DAP_CORE_SERVER_TESTS)
add_subdirectory(test)
endif()
-file(GLOB SOURCES *.c)
-file(GLOB HEADERS *.h)
+file(GLOB CORE_SERVER_SOURCES *.c)
+file(GLOB CORE_SERVER_HEADERS *.h)
-add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
+add_library(${PROJECT_NAME} STATIC ${CORE_SERVER_SOURCES} ${CORE_SERVER_HEADERS})
target_link_libraries(${PROJECT_NAME} pthread ev dap_crypto)
target_include_directories(${PROJECT_NAME} INTERFACE .)
diff --git a/dap_server.c b/dap_server.c
index eb55503..34286c9 100644
--- a/dap_server.c
+++ b/dap_server.c
@@ -98,7 +98,7 @@ int dap_server_init(size_t count_threads)
pthread_mutex_init(&mutex_on_cnt_connections, NULL);
log_it(L_NOTICE,"Initialized socket server module");
-
+ dap_server_client_init();
return 0;
}
@@ -107,6 +107,7 @@ int dap_server_init(size_t count_threads)
*/
void dap_server_deinit()
{
+ dap_server_client_deinit();
for(size_t i = 0; i < _count_threads; i++)
free (async_watchers[i].data);
diff --git a/dap_server_client.c b/dap_server_client.c
index 0b601cc..6454dd2 100644
--- a/dap_server_client.c
+++ b/dap_server_client.c
@@ -36,7 +36,7 @@
* @brief dap_client_init Init clients module
* @return Zero if ok others if no
*/
-int dap_client_remote_init()
+int dap_server_client_init()
{
log_it(L_NOTICE,"Initialized socket client module");
return 0;
@@ -45,7 +45,7 @@ int dap_client_remote_init()
/**
* @brief dap_client_deinit Deinit clients module
*/
-void dap_client_remote_deinit()
+void dap_server_client_deinit()
{
}
diff --git a/dap_server_client.h b/dap_server_client.h
index 44cc346..eef117d 100644
--- a/dap_server_client.h
+++ b/dap_server_client.h
@@ -82,8 +82,8 @@ typedef struct dap_server_client{
-int dap_client_remote_init(void); // Init clients module
-void dap_client_remote_deinit(void); // Deinit clients module
+int dap_server_client_init(void); // Init clients module
+void dap_server_client_deinit(void); // Deinit clients module
dap_server_client_t * dap_client_create(struct dap_server * sh, int s, ev_io* w_client); // Create new client and add it to the list
dap_server_client_t * dap_client_find(int sock, struct dap_server * sh); // Find client by socket
--
GitLab