Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-clean-exit

5 files changed, 43 insertions, 14 deletions

diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index 579203c2..28004a92 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -22,13 +22,15 @@
 
 #include <ouroboros/config.h>
 #include <ouroboros/ipcp.h>
-#include <sys/socket.h>
-#include <stdlib.h>
-#include "ipcp.h"
 
 #define OUROBOROS_PREFIX "ipcpd/ipcp"
 #include <ouroboros/logs.h>
 
+#include <string.h>
+#include <sys/socket.h>
+#include <stdlib.h>
+#include "ipcp.h"
+
 struct ipcp * ipcp_instance_create()
 {
         struct ipcp * i = malloc(sizeof *i);
@@ -45,15 +47,42 @@ struct ipcp * ipcp_instance_create()
         return i;
 }
 
-int ipcp_arg_check(int argc, char * argv[])
+int ipcp_parse_arg(int argc, char * argv[])
 {
-        if (argc != 2)
+        char * log_file;
+        size_t len = 0;
+
+        if (!(argc == 3 || argc == 2))
                 return -1;
 
         /* argument 1: api of irmd */
         if (atoi(argv[1]) == 0)
                 return -1;
 
+        if (argv[2] == NULL)
+                return 0;
+
+        len += strlen(INSTALL_PREFIX);
+        len += strlen(LOG_DIR);
+        len += strlen(argv[2]);
+
+        log_file = malloc(len + 1);
+        if (log_file == NULL) {
+                LOG_ERR("Failed to malloc");
+                return -1;
+        }
+
+        strcpy(log_file, INSTALL_PREFIX);
+        strcat(log_file, LOG_DIR);
+        strcat(log_file, argv[2]);
+        log_file[len] = '\0';
+
+        if (set_logfile(log_file))
+                LOG_ERR("Cannot open %s, falling back to stdout for logs.",
+                        log_file);
+
+        free(log_file);
+
         return 0;
 }
 
diff --git a/src/ipcpd/ipcp.h b/src/ipcpd/ipcp.h
index 27c3cf8e..bbf1d1f7 100644
--- a/src/ipcpd/ipcp.h
+++ b/src/ipcpd/ipcp.h
@@ -50,6 +50,6 @@ struct ipcp {
 struct ipcp * ipcp_instance_create();
 void *        ipcp_main_loop(void * o);
 void *        ipcp_sdu_loop(void * o);
-int           ipcp_arg_check(int argc, char * argv[]);
+int           ipcp_parse_arg(int argc, char * argv[]);
 
 #endif
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 17327fce..ffe69dfb 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -573,7 +573,7 @@ static struct ipcp * ipcp_local_create()
 
 #ifndef MAKE_CHECK
 
-int main (int argc, char * argv[])
+int main(int argc, char * argv[])
 {
         struct sigaction sig_act;
         sigset_t  sigset;
@@ -583,8 +583,8 @@ int main (int argc, char * argv[])
         sigaddset(&sigset, SIGHUP);
         sigaddset(&sigset, SIGPIPE);
 
-        if (ipcp_arg_check(argc, argv)) {
-                LOG_ERR("Wrong arguments.");
+        if (ipcp_parse_arg(argc, argv)) {
+                LOG_ERR("Failed to parse arguments.");
                 exit(1);
         }
 
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index 8f65819f..5e355bd7 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -1245,8 +1245,8 @@ int main(int argc, char * argv[])
         sigaddset(&sigset, SIGHUP);
         sigaddset(&sigset, SIGPIPE);
 
-        if (ipcp_arg_check(argc, argv)) {
-                LOG_ERR("Wrong arguments.");
+        if (ipcp_parse_arg(argc, argv)) {
+                LOG_ERR("Failed to parse arguments.");
                 exit(1);
         }
 
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index 874168ef..92204970 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -1557,7 +1557,7 @@ static struct ipcp * ipcp_udp_create()
 
 #ifndef MAKE_CHECK
 
-int main (int argc, char * argv[])
+int main(int argc, char * argv[])
 {
         struct sigaction sig_act;
         sigset_t  sigset;
@@ -1567,8 +1567,8 @@ int main (int argc, char * argv[])
         sigaddset(&sigset, SIGHUP);
         sigaddset(&sigset, SIGPIPE);
 
-        if (ipcp_arg_check(argc, argv)) {
-                LOG_ERR("Wrong arguments.");
+        if (ipcp_parse_arg(argc, argv)) {
+                LOG_ERR("Failed to parse arguments.");
                 exit(1);
         }