From cb87b1f92530a5649da3d7469c3a6a38f2949d39 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <dm@cifercom.com>
Date: Mon, 9 Jul 2018 17:24:27 +0700
Subject: [PATCH] [*] Node core files
---
.gitignore | 1 +
config/node.cfg | 2 +-
libdap | 2 +-
libdap-server | 2 +-
libdap-stream | 2 +-
sources/node_manager.c | 5 +++--
sources/node_manager.h | 8 ++++----
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index c6127b38..43f392ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
# Prerequisites
*.d
+*.txt.user
# Object files
*.o
diff --git a/config/node.cfg b/config/node.cfg
index b43630a4..703e54f4 100644
--- a/config/node.cfg
+++ b/config/node.cfg
@@ -1,3 +1,3 @@
[general]
-port = 56001
+port = 49123
diff --git a/libdap b/libdap
index 8fd1d212..81377864 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit 8fd1d21201bf36461bd40249236d27edbd4dff73
+Subproject commit 81377864c37166c8ec9f5e9e02775c05618109f8
diff --git a/libdap-server b/libdap-server
index b7c3f362..2fa06587 160000
--- a/libdap-server
+++ b/libdap-server
@@ -1 +1 @@
-Subproject commit b7c3f362f85be6695d8fe431dcf6b74ec1944793
+Subproject commit 2fa0658778d991f780dd55d7f15d17deb5503070
diff --git a/libdap-stream b/libdap-stream
index 7194c7a9..3a867229 160000
--- a/libdap-stream
+++ b/libdap-stream
@@ -1 +1 @@
-Subproject commit 7194c7a9ed7f234ad30aeba4f508ee9f027cd915
+Subproject commit 3a8672290289cde03708148e8a5300a17ff3906f
diff --git a/sources/node_manager.c b/sources/node_manager.c
index dcc98cf5..ba45c143 100644
--- a/sources/node_manager.c
+++ b/sources/node_manager.c
@@ -19,7 +19,8 @@
*/
#include "node_manager.h"
-#define LOG_TAG "main"
+
+#define LOG_TAG "node_manager"
void client_new(dap_udp_client_t *client,void * arg){
@@ -127,4 +128,4 @@ void node_manager_start(node_manager_t* manager){
sh->client_delete_callback = *client_disconnect;
dap_udp_server_loop(sh);
dap_udp_server_delete(sh);
-}
\ No newline at end of file
+}
diff --git a/sources/node_manager.h b/sources/node_manager.h
index a4624f3a..31733d60 100644
--- a/sources/node_manager.h
+++ b/sources/node_manager.h
@@ -40,13 +40,13 @@ typedef struct node_manager{
} node_manager_t;
-extern int node_manager_init();
+int node_manager_init();
node_manager_t* new_node_manager(char* config_file); // Create new manager structure
-extern void node_manager_deinit();
+void node_manager_deinit();
-extern void node_manager_start(node_manager_t* manager); // Start manager work
+void node_manager_start(node_manager_t* manager); // Start manager work
-#endif
\ No newline at end of file
+#endif
--
GitLab