Merge pull request #2 from kelvinblockchain/master

master->feature-2272

CMakeLists.txt

@@ -11,12 +11,10 @@ set(DAP_CHAIN_NET_SRV_HEADERS
         dap_chain_net_srv_common.h
     )
 
-
 add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_NET_SRV_SRCS} ${DAP_CHAIN_NET_SRV_HEADERS})
 
 
-target_link_libraries(dap_chain_net_srv dap_core dap_crypto dap_chain dap_chain_crypto dap_chain_net)
-#target_link_libraries(dap_chain_net_srv dap_core dap_crypto dap_chain dap_chain_crypto dap_chain_net dap_server_http_db_auth)
+target_link_libraries(dap_chain_net_srv dap_core dap_crypto dap_chain dap_chain_crypto dap_chain_net )
 target_include_directories(dap_chain_net_srv INTERFACE .)
 
 set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)

dap_chain_net_srv.c

@@ -31,8 +31,8 @@
 
 #define LOG_TAG "chain_net_srv"
 
-size_t m_uid_count;
-dap_chain_net_srv_uid_t * m_uid;
+static size_t m_uid_count;
+static dap_chain_net_srv_uid_t * m_uid;
 
 typedef struct service_list {
     dap_chain_net_srv_uid_t uid;
@@ -136,7 +136,7 @@ dap_chain_net_srv_t * dap_chain_net_srv_get(dap_chain_net_srv_uid_t *a_uid)
  * @brief dap_chain_net_srv_count
  * @return
  */
-const size_t dap_chain_net_srv_count(void)
+ size_t dap_chain_net_srv_count(void)
 {
     size_t l_count = 0;
     service_list_t *l_sdata, *l_sdata_tmp;

dap_chain_net_srv.h

@@ -23,12 +23,10 @@
  */
 #pragma once
 
-#include "dap_chain_node_ctl.h"
 #include "dap_chain_net_srv_common.h"
 
 typedef struct dap_chain_net_srv
 {
-    dap_chain_node_ctl_t * node;
     dap_chain_net_srv_uid_t uid; // Unique ID for service.
     dap_chain_net_srv_abstract_t srv_common;
 
@@ -45,6 +43,6 @@ void dap_chain_net_srv_add(dap_chain_net_srv_t * a_srv);
 void dap_chain_net_srv_del(dap_chain_net_srv_t * a_srv);
 void dap_chain_net_srv_del_all(void);
 dap_chain_net_srv_t * dap_chain_net_srv_get(dap_chain_net_srv_uid_t *a_uid);
-const size_t dap_chain_net_srv_count(void);
+size_t dap_chain_net_srv_count(void);
 const dap_chain_net_srv_uid_t * dap_chain_net_srv_list(void);