-doxygen

[oweals/gnunet.git] / src / transport / gnunet-service-transport_plugins.c

diff --git a/src/transport/gnunet-service-transport_plugins.c b/src/transport/gnunet-service-transport_plugins.c
index 4f2a8ff94df58fff804ce1b70f0b02f6105d076e..83c062ec3715c7f94f1ec28bc5fb61af62bfe6eb 100644 (file)
--- a/src/transport/gnunet-service-transport_plugins.c
+++ b/src/transport/gnunet-service-transport_plugins.c
@@ -160,6 +160,7 @@ GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
       GNUNET_free (plug->short_name);
       GNUNET_free (plug->lib_name);
       GNUNET_free (plug);
+      continue;
     }
     fail = GNUNET_NO;
     if (NULL == plug->api->address_pretty_printer)
@@ -323,9 +324,15 @@ GST_plugins_a2s (const struct GNUNET_HELLO_Address *address)
 {
   struct GNUNET_TRANSPORT_PluginFunctions *api;
   static char unable_to_show[1024];
+  static const char *s;
 
   if (address == NULL)
-    return "<inbound>";
+  {
+       GNUNET_break (0); /* a HELLO address cannot be NULL */
+    return "<invalid>";
+  }
+  if (0 == address->address_length)
+    return TRANSPORT_SESSION_INBOUND_STRING; /* Addresse with length 0 are inbound, address->address itself may be NULL */
   api = GST_plugins_printer_find (address->transport_name);
   if (NULL == api)
     return "<plugin unknown>";
@@ -337,8 +344,8 @@ GST_plugins_a2s (const struct GNUNET_HELLO_Address *address)
                      address->transport_name);
     return unable_to_show;
   }
-  return api->address_to_string (NULL, address->address,
-                                 address->address_length);
+  return (NULL != (s = api->address_to_string (NULL, address->address,
+                                 address->address_length)) ? s : "<invalid>");
 }