1 files changed, 33 insertions, 2 deletions

diff --git a/src/daemon/dlt_daemon_event_handler.c b/src/daemon/dlt_daemon_event_handler.c
index 9ee3bc1..9051f07 100644
--- a/src/daemon/dlt_daemon_event_handler.c
+++ b/src/daemon/dlt_daemon_event_handler.c
@@ -128,7 +128,9 @@ int dlt_daemon_handle_event(DltEventHandler *pEvent,
     for (i = 0 ; i < nfds ; i++)
     {
         struct epoll_event *ev = &pEvent->events[i];
-        DltConnection *con = (DltConnection *)ev->data.ptr;
+        DltConnectionId id = (DltConnectionId)ev->data.ptr;
+        DltConnection *con = dlt_event_handler_find_connection_by_id(pEvent,
+                                                                     id);
         int fd = 0;
         DltConnectionType type = DLT_CONNECTION_TYPE_MAX;
 
@@ -137,6 +139,10 @@ int dlt_daemon_handle_event(DltEventHandler *pEvent,
             type = con->type;
             fd = con->receiver->fd;
         }
+        else /* connection might have been destroyed in the meanwhile */
+        {
+            continue;
+        }
 
         /* First of all handle epoll error events
          * We only expect EPOLLIN or EPOLLOUT
@@ -206,6 +212,31 @@ DltConnection *dlt_event_handler_find_connection(DltEventHandler *ev,
     return temp;
 }
 
+/** @brief Find connection with a specific \a id in the connection list.
+ *
+ * There can be only one event per \a fd. We can then find a specific connection
+ * based on this \a fd. That allows to check if a specific \a fd has already been
+ * registered.
+ *
+ * @param ev The event handler structure where the list of connection is.
+ * @param id The identifier of the connection to be found.
+ *
+ * @return The found connection pointer, NULL otherwise.
+ */
+DltConnection *dlt_event_handler_find_connection_by_id(DltEventHandler *ev,
+                                                       DltConnectionId id)
+{
+
+    DltConnection *temp = ev->connections;
+
+    while ((temp != NULL) && (temp->id != id))
+    {
+        temp = temp->next;
+    }
+
+    return temp;
+}
+
 /** @brief Remove a connection from the list and destroy it.
  *
  * This function will first look for the connection in the event handler list,
@@ -347,7 +378,7 @@ int dlt_connection_check_activate(DltEventHandler *evhdl,
         {
             struct epoll_event ev; /* Content will be copied by the kernel */
             ev.events = con->ev_mask;
-            ev.data.ptr = (void *)con;
+            ev.data.ptr = (void *)con->id;
 
             snprintf(local_str,
                      DLT_DAEMON_TEXTBUFSIZE,