summaryrefslogtreecommitdiff
path: root/src/ipcpd
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-08-10 12:55:23 +0200
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-08-10 12:55:23 +0200
commite5cb8042c9f0c6374c4f14bf7ff3f4fe3cdcd155 (patch)
tree31c27f46ba0a5f4981aa7522b11d133e1288c26d /src/ipcpd
parent0ec8f7b6d977a9cc469445d4990d432253f979d9 (diff)
parent155fbfb32b9a69705a06a5771bd146c1bed22821 (diff)
downloadouroboros-e5cb8042c9f0c6374c4f14bf7ff3f4fe3cdcd155.tar.gz
ouroboros-e5cb8042c9f0c6374c4f14bf7ff3f4fe3cdcd155.zip
Merged in sandervrijders/ouroboros/be-create-ipcp (pull request #200)
ipcp, irmd, lib: Notify IRMd upon IPCP initialization
Diffstat (limited to 'src/ipcpd')
-rw-r--r--src/ipcpd/local/main.c6
-rw-r--r--src/ipcpd/normal/main.c10
-rw-r--r--src/ipcpd/shim-eth-llc/main.c6
-rw-r--r--src/ipcpd/shim-udp/main.c6
4 files changed, 28 insertions, 0 deletions
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index a6076800..3f5bf908 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -621,6 +621,12 @@ int main(int argc, char * argv[])
pthread_rwlock_unlock(&_ipcp->state_lock);
+ if (ipcp_create_r(getpid())) {
+ LOG_ERR("Failed to notify IRMd we are initialized.");
+ close_logfile();
+ exit(EXIT_FAILURE);
+ }
+
pthread_join(_ap_instance->mainloop, NULL);
shim_ap_fini();
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index 2d416942..38789ddd 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -27,6 +27,7 @@
#include <ouroboros/shm_du_map.h>
#include <ouroboros/shm_ap_rbuff.h>
#include <ouroboros/dev.h>
+#include <ouroboros/ipcp.h>
#include <stdbool.h>
#include <signal.h>
@@ -326,6 +327,15 @@ int main(int argc, char * argv[])
pthread_rwlock_unlock(&_ipcp->state_lock);
+ if (ipcp_create_r(getpid())) {
+ LOG_ERR("Failed to notify IRMd we are initialized.");
+ normal_ipcp_data_destroy();
+ fmgr_fini();
+ free(_ipcp);
+ close_logfile();
+ exit(EXIT_FAILURE);
+ }
+
pthread_join(normal_data(_ipcp)->mainloop, NULL);
normal_ipcp_data_destroy();
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index 7471e319..b8689ac7 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -1379,6 +1379,12 @@ int main(int argc, char * argv[])
pthread_rwlock_unlock(&_ipcp->state_lock);
+ if (ipcp_create_r(getpid())) {
+ LOG_ERR("Failed to notify IRMd we are initialized.");
+ close_logfile();
+ exit(EXIT_FAILURE);
+ }
+
pthread_join(shim_data(_ipcp)->mainloop, NULL);
eth_llc_ipcp_data_destroy();
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index 9d6d15a7..8d9ac25c 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -1609,6 +1609,12 @@ int main(int argc, char * argv[])
pthread_rwlock_unlock(&_ipcp->state_lock);
+ if (ipcp_create_r(getpid())) {
+ LOG_ERR("Failed to notify IRMd we are initialized.");
+ close_logfile();
+ exit(EXIT_FAILURE);
+ }
+
pthread_join(_ap_instance->mainloop, NULL);
shim_ap_fini();