comment

[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 f3e7ccaa46b9e0e4beb1dd157ff612b0378eaa37..fc14b6e76ed295fbbd22d0d3b2ca9679174c5ea9 100644 (file)
--- a/src/transport/gnunet-service-transport_plugins.c
+++ b/src/transport/gnunet-service-transport_plugins.c
@@ -88,11 +88,13 @@ static struct TransportPlugin *plugins_tail;
  * @param recv_cb function to call when data is received
  * @param address_cb function to call when our public addresses changed
  * @param session_end_cb function to call when a session was terminated
+ * @param address_type_cb function to call when a address type is requested
  */
 void
 GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
                   GNUNET_TRANSPORT_AddressNotification address_cb,
-                  GNUNET_TRANSPORT_SessionEnd session_end_cb)
+                  GNUNET_TRANSPORT_SessionEnd session_end_cb,
+                  GNUNET_TRANSPORT_AddressToType address_type_cb)
 {
   struct TransportPlugin *plug;
   struct TransportPlugin *next;
@@ -130,6 +132,7 @@ GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
     plug->env.receive = recv_cb;
     plug->env.notify_address = address_cb;
     plug->env.session_end = session_end_cb;
+    plug->env.get_address_type = address_type_cb;
     plug->env.max_connections = tneigh;
     plug->env.stats = GST_stats;
     GNUNET_CONTAINER_DLL_insert (plugins_head, plugins_tail, plug);
@@ -144,7 +147,8 @@ GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
     if (plug->api == NULL)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Failed to load transport plugin for `%s'\n"), pos);
+                  _("Failed to load transport plugin for `%s'\n"),
+                  plug->lib_name);
       GNUNET_CONTAINER_DLL_remove (plugins_head, plugins_tail, plug);
       GNUNET_free (plug->short_name);
       GNUNET_free (plug->lib_name);
@@ -203,13 +207,23 @@ const char *
 GST_plugins_a2s (const struct GNUNET_HELLO_Address *address)
 {
   struct GNUNET_TRANSPORT_PluginFunctions *api;
+  static char unable_to_show[1024];
 
   if (address == NULL)
     return "<inbound>";
   api = GST_plugins_find (address->transport_name);
-  if ((api == NULL) || (address->address_length == 0) || (address->address == NULL))
-    return NULL;
-  return api->address_to_string (NULL, address->address, address->address_length);
+  if (NULL == api)
+    return "<plugin unknown>";
+  if (0 == address->address_length)
+  {
+    GNUNET_snprintf (unable_to_show, sizeof (unable_to_show),
+                     "<unable to stringify %u-byte long address of %s transport>",
+                     (unsigned int) address->address_length,
+                     address->transport_name);
+    return unable_to_show;
+  }
+  return api->address_to_string (NULL, address->address,
+                                 address->address_length);
 }