Merged in dstaesse/ouroboros/be-irmd-fix (pull request #174)

irmd: Fix accessing reg_api struct after destroy

1 files changed, 30 insertions, 0 deletions

diff --git a/src/irmd/main.c b/src/irmd/main.c
index 1da4b310..625c28c8 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -247,6 +247,36 @@ static pid_t get_ipcp_by_dst_name(char * dst_name)
         struct list_head * pos = NULL;
         char * dif_name =
                 registry_get_dif_for_dst(&instance->registry, dst_name);
+        if (dif_name == NULL) {
+                list_for_each(pos, &instance->ipcps) {
+                        struct ipcp_entry * e =
+                                list_entry(pos, struct ipcp_entry, next);
+                        if (e->type == IPCP_NORMAL) {
+                                dif_name = e->dif_name;
+                                break;
+                        }
+                }
+
+                list_for_each(pos, &instance->ipcps) {
+                        struct ipcp_entry * e =
+                                list_entry(pos, struct ipcp_entry, next);
+                        if (e->type == IPCP_SHIM_ETH_LLC) {
+                                dif_name = e->dif_name;
+                                break;
+                        }
+                }
+
+
+                list_for_each(pos, &instance->ipcps) {
+                        struct ipcp_entry * e =
+                                list_entry(pos, struct ipcp_entry, next);
+                        if (e->type == IPCP_SHIM_UDP) {
+                                dif_name = e->dif_name;
+                                break;
+                        }
+                }
+        }
+
         if (dif_name == NULL)
                 return -1;