2 files changed, 31 insertions, 0 deletions

diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c
index 55787a7f9..2a7af356f 100644
--- a/src/transport/plugin_transport_unix.c
+++ b/src/transport/plugin_transport_unix.c
@@ -1363,11 +1363,19 @@ libgnunet_plugin_transport_unix_done (void *cls)
     GNUNET_free (api);
     return NULL;
   }
+
+  plugin->env->notify_address (plugin->env->cls, GNUNET_NO,
+                               plugin->unix_socket_path,
+                               strlen (plugin->unix_socket_path) + 1,
+                               "unix");
+
   unix_transport_server_stop (plugin);
 
+
   GNUNET_CONTAINER_multihashmap_iterate (plugin->session_map, &get_session_delete_it, plugin);
   GNUNET_CONTAINER_multihashmap_destroy (plugin->session_map);
 
+
   if (NULL != plugin->rs)
     GNUNET_NETWORK_fdset_destroy (plugin->rs);
   if (NULL != plugin->ws)
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 6632244e2..3bd0b7cb0 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -142,6 +142,9 @@ struct AddressWrapper
 static void
 end ()
 {
+  struct AddressWrapper *w;
+  int c = 0;
+
   if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
   {
       GNUNET_SCHEDULER_cancel (timeout_task);
@@ -149,6 +152,26 @@ end ()
   }
   if (NULL != api)
       GNUNET_PLUGIN_unload (libname, api);
+
+  while (NULL != head)
+  {
+      w = head;
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Plugin did not remove address `%s' \n"), w->addrstring);
+      GNUNET_CONTAINER_DLL_remove (head, tail, w);
+      c ++;
+      GNUNET_free (w->addr);
+      GNUNET_free (w->addrstring);
+      GNUNET_free (w);
+  }
+  if (c > 0)
+  {
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              _("Plugin did not remove %u addresses \n"), c);
+  }
+
+
   GNUNET_free (libname);
   libname = NULL;
   GNUNET_STATISTICS_destroy (stats, GNUNET_NO);