[*] Build eror fixes

CMakeLists.txt

@@ -7,40 +7,44 @@ set (CMAKE_CXX_STANDARD 11)
 
 add_definitions ("-DDAP_SERVER")
 
-add_subdirectory(libdap-server)
 add_subdirectory(libdap)
+add_subdirectory(libdap-server-core)
+add_subdirectory(libdap-server)
 add_subdirectory(libdap-chain)
 add_subdirectory(libdap-stream)
 
 
-include_directories("${INCLUDE_DIRECTORIES} ${dap_core_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_http_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_crypto_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_enc_server_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_http_server_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_client_INCLUDE_DIRS}")
+#include_directories("${INCLUDE_DIRECTORIES} ${dap_core_INCLUDE_DIRS}")
+#include_directories("${INCLUDE_DIRECTORIES} ${dap_http_INCLUDE_DIRS}")
+#include_directories("${INCLUDE_DIRECTORIES} ${dap_crypto_INCLUDE_DIRS}")
+#include_directories("${INCLUDE_DIRECTORIES} ${dap_enc_server_INCLUDE_DIRS}")
+#include_directories("${INCLUDE_DIRECTORIES} ${dap_http_server_INCLUDE_DIRS}")
+
 #include_directories("${INCLUDE_DIRECTORIES} ${dap-chain_INCLUDE_DIRS}")
+
 include_directories("${INCLUDE_DIRECTORIES} ${dap_core_server_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_udp_server_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_session_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_stream_INCLUDE_DIRS}")
-
-add_definitions ("${dap_core_DEFINITIONS}")
-add_definitions ("${dap_crypto_DEFINITIONS}")
-add_definitions ("${dap_client_DEFINITIONS}")
-add_definitions ("${dap_enc_server_DEFINITIONS}")
-add_definitions ("${dap_http_server_DEFINITIONS}")
-add_definitions ("${dap_http_DEFINITIONS}")
+#include_directories("${INCLUDE_DIRECTORIES} ${dap_udp_server_INCLUDE_DIRS}")
+#include_directories("${INCLUDE_DIRECTORIES} ${dap_session_INCLUDE_DIRS}")
+#include_directories("${INCLUDE_DIRECTORIES} ${dap_stream_INCLUDE_DIRS}")
+
+#add_definitions ("${dap_core_DEFINITIONS}")
+#add_definitions ("${dap_crypto_DEFINITIONS}")
+#add_definitions ("${dap_enc_server_DEFINITIONS}")
+#add_definitions ("${dap_http_server_DEFINITIONS}")
+#add_definitions ("${dap_http_DEFINITIONS}")
+
 #add_definitions ("${dap-chain_DEFINITIONS}")
-add_definitions ("${dap_core_server_DEFINITIONS}")
-add_definitions ("${dap_udp_server_DEFINITIONS}")
-add_definitions ("${dap_session_DEFINITIONS}")
-add_definitions ("${dap_stream_DEFINITIONS}")
+
+#add_definitions ("${dap_core_server_DEFINITIONS}")
+#add_definitions ("${dap_udp_server_DEFINITIONS}")
+#add_definitions ("${dap_session_DEFINITIONS}")
+#add_definitions ("${dap_stream_DEFINITIONS}")
+file(GLOB SERVER_SRCS *.c)
 
 set(SOURCES sources/main.c sources/node_manager.c )
 set(HEADERS sources/node_manager.h)
 
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")
-add_executable(${PROJECT_NAME} "sources/main.c" ${HEADERS} ${SOURCES} ${CRYPTO_SRCS})
-target_link_libraries(${PROJECT_NAME} dap_http_server dap_core_server dap_udp_server dap_session dap_crypto  dap_core dap_enc_server dap_stream  m pthread)
+add_executable(${PROJECT_NAME} "sources/main.c" ${HEADERS} ${SOURCES} ${SERVER_SRCS} )
+target_link_libraries(${PROJECT_NAME} dap_core_server dap_http_server  dap_udp_server dap_session dap_crypto  dap_core dap_enc_server dap_stream  m pthread)

libdap-chain @ 65683fd4

-Subproject commit 4530b8182a18d29b2befb88ca3c7a323cbc36eb6
+Subproject commit 65683fd400f116a60b52865c837db2f915ea059a

libdap-server @ bcf7b24c

-Subproject commit b74c398692051acb301f3dda4ffc1bb8a87c5281
+Subproject commit bcf7b24c534571690cdbf3b393afdfc8717f0c02

libdap-server-core @ 1341b775

-Subproject commit de8f82d6f484bf4f9d27f82a6c0216e8760be0c8
+Subproject commit 1341b7757a284687c20e5736468073324f5d35b8

libdap-stream @ 26dfafe9

-Subproject commit a7f193603b176c0007a011c7cdce37180848cc80
+Subproject commit 26dfafe9f36905d57e03d2be49b60ec4d423e8e1

sources/main.c

@@ -17,7 +17,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with any DAP based project.  If not, see <http://www.gnu.org/licenses/>.
 */
-#define DAP_SERVER
 
 #include <errno.h>
 #include <signal.h>
@@ -70,4 +69,4 @@ int main(int argc, char **argv) {
         puts("Please, specify config file path.");
 
     return 0;
-}
\ No newline at end of file
+}

sources/node_manager.c

@@ -56,11 +56,11 @@ void channel_packet_out(struct stream_ch* ch,void* arg)
 }
 
 
-void client_new(dap_client_remote_t *client,void * arg){
+void client_new(dap_server_client_t *client,void * arg){
     log_it(L_INFO,"Client connected");
 }
 
-void client_read(dap_client_remote_t *client,void * arg){
+void client_read(dap_server_client_t *client,void * arg){
     log_it(L_INFO,"Client read %u",client->buf_in_size);
     unsigned char* data = (char*)malloc(client->buf_in_size);
     data[client->buf_in_size] = 0;
@@ -74,12 +74,12 @@ void client_read(dap_client_remote_t *client,void * arg){
     free(data);
 }
 
-void client_write(dap_client_remote_t *client,void * arg)
+void client_write(dap_server_client_t *client,void * arg)
 {
     log_it(L_DEBUG,"Client write");
 }
 
-void client_disconnect(dap_client_remote_t *client,void * arg)
+void client_disconnect(dap_server_client_t *client,void * arg)
 {
     log_it(L_DEBUG,"Client disconnect");
 }
@@ -105,14 +105,11 @@ int node_manager_init(){
         log_it(L_CRITICAL,"Can't init encryption key module");
         return -57;
     }
-    if(dap_server_init()!=0){
+    if(dap_server_init(0)!=0){
         log_it(L_CRITICAL,"Can't init udp server module");
         return -4;
     }
-    if(dap_client_init()!=0){
-        log_it(L_CRITICAL,"Can't init udp client module");
-        return -4;
-    }
+
     stream_init();
     stream_session_init();
     dap_http_init();
@@ -126,7 +123,7 @@ int node_manager_init(){
 void node_manager_deinit(){
     stream_session_deinit();
     dap_server_deinit();
-    dap_client_deinit();
+    dap_server_client_deinit();
     dap_enc_key_deinit();
     dap_enc_deinit();
     dap_common_deinit();

sources/node_manager.h

@@ -48,6 +48,7 @@ node_manager_t* new_node_manager(char* config_file);
 void node_manager_deinit();
 
 void node_manager_start(node_manager_t* manager);        // Start manager work
+void node_manager_start_stream();
 
 
 #endif