Fixing defines in the client

kubos · Mar 22, 2017 · 64919e4 · 64919e4
1 parent 567efac
commit 64919e4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/cmd-control-client/config.json b/cmd-control-client/config.json
@@ -1,5 +1,9 @@
 {
+    "cnc": {
+        "client_tx_pipe": "\"/usr/local/kubos/client-to-server\"",
+        "client_rx_pipe": "\"/usr/local/kubos/server-to-client\""
+    },
     "csp": {
         "socket": true
     }
-}
+}
diff --git a/cmd-control-client/source/main.c b/cmd-control-client/source/main.c
@@ -40,6 +40,9 @@
 #define SERVER_CSP_ADDRESS 1
 #define SOCKET_PORT        8189
 
+#define CNC_CLIENT_RX_PIPE YOTTA_CFG_CNC_CLIENT_RX_PIPE
+#define CNC_CLIENT_TX_PIPE YOTTA_CFG_CNC_CLIENT_TX_PIPE
+
 csp_iface_t csp_socket_if;
 csp_socket_handle_t socket_driver;
 
@@ -92,8 +95,8 @@ bool init()
     int my_address = 2;
     char *rx_channel_name, *tx_channel_name;
 
-    tx_channel_name = "/home/vagrant/client-to-server";
-    rx_channel_name = "/home/vagrant/server-to-client";
+    tx_channel_name = CNC_CLIENT_TX_PIPE;
+    rx_channel_name = CNC_CLIENT_RX_PIPE;
 
 
     /* Init CSP and CSP buffer system */

diff --git a/cmd-control-daemon/config.json b/cmd-control-daemon/config.json
@@ -2,8 +2,8 @@
     "cnc": {
         "daemon_log_path": "\"/var/log.daemon.log\"",
         "registry_dir": "\"/usr/local/kubos\"",
-        "daemon_rx_pipe": "\"/home/vagrant/client-to-server\"",
-        "daemon_tx_pipe": "\"/home/vagrant/server-to-client\""
+        "daemon_rx_pipe": "\"/usr/local/kubos/client-to-server\"",
+        "daemon_tx_pipe": "\"/usr/local/kubos/server-to-client\""
     },
     "csp": {
         "socket": true