irmd: Remove IPCP from list upon error

If an IPCP crashes (due to a segfault for instance), it is removed
from the spawned apis list. However, if it was an IPCP it should also
be removed from the IPCPs list, since else on shutdown, the irmd will
try to destroy the IPCP that crashed.

1 files changed, 13 insertions, 0 deletions

diff --git a/src/irmd/main.c b/src/irmd/main.c
index 8503fcfa..35208909 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -1337,6 +1337,8 @@ void * irm_flow_cleaner()
         struct timespec now;
         struct list_head * pos = NULL;
         struct list_head * n   = NULL;
+        struct list_head * h   = NULL;
+        struct list_head * t   = NULL;
 
         struct timespec timeout = {IRMD_CLEANUP_TIMER / BILLION,
                                    IRMD_CLEANUP_TIMER % BILLION};
@@ -1415,6 +1417,17 @@ void * irm_flow_cleaner()
                                 LOG_INFO("Spawned process %d terminated "
                                          "with exit status %d.",
                                          api->api, status);
+
+                                list_for_each_safe(h, t, &irmd->ipcps) {
+                                        struct ipcp_entry * e =
+                                                list_entry(h, struct ipcp_entry,
+                                                           next);
+                                        if (e->api == api->api) {
+                                                list_del(&e->next);
+                                                ipcp_entry_destroy(e);
+                                        }
+                                }
+
                                 list_del(&api->next);
                                 free(api);
                         }