*
* @param recv_cb function to call when data is received
* @param address_cb function to call when our public addresses changed
- * @param traffic_cb function to call for flow control
* @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
+void
GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
- GNUNET_TRANSPORT_AddressNotification address_cb,
- GNUNET_TRANSPORT_SessionEnd session_end_cb)
+ GNUNET_TRANSPORT_AddressNotification address_cb,
+ GNUNET_TRANSPORT_SessionEnd session_end_cb,
+ GNUNET_TRANSPORT_AddressToType address_type_cb)
{
struct TransportPlugin *plug;
+ struct TransportPlugin *next;
unsigned long long tneigh;
char *libname;
char *plugs;
char *pos;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (GST_cfg,
- "TRANSPORT",
- "NEIGHBOUR_LIMIT",
- &tneigh))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Transport service is lacking NEIGHBOUR_LIMIT option.\n"));
- return;
- }
+ GNUNET_CONFIGURATION_get_value_number (GST_cfg, "TRANSPORT",
+ "NEIGHBOUR_LIMIT", &tneigh))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Transport service is lacking NEIGHBOUR_LIMIT option.\n"));
+ return;
+ }
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (GST_cfg,
- "TRANSPORT", "PLUGINS", &plugs))
+ GNUNET_CONFIGURATION_get_value_string (GST_cfg, "TRANSPORT", "PLUGINS",
+ &plugs))
return;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Starting transport plugins `%s'\n"),
- plugs);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Starting transport plugins `%s'\n"),
+ plugs);
for (pos = strtok (plugs, " "); pos != NULL; pos = strtok (NULL, " "))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Loading `%s' transport plugin\n"), pos);
- GNUNET_asprintf (&libname,
- "libgnunet_plugin_transport_%s",
- pos);
- plug = GNUNET_malloc (sizeof (struct TransportPlugin));
- plug->short_name = GNUNET_strdup (pos);
- plug->lib_name = libname;
- plug->env.cfg = GST_cfg;
- plug->env.my_identity = &GST_my_identity;
- plug->env.get_our_hello = &GST_hello_get;
- plug->env.cls = plug->short_name;
- plug->env.receive = recv_cb;
- plug->env.notify_address = address_cb;
- plug->env.session_end = session_end_cb;
- plug->env.max_connections = tneigh;
- plug->env.stats = GST_stats;
- GNUNET_CONTAINER_DLL_insert (plugins_head,
- plugins_tail,
- plug);
- plug->api = GNUNET_PLUGIN_load (libname, &plug->env);
- if (plug->api == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to load transport plugin for `%s'\n"),
- pos);
- GNUNET_CONTAINER_DLL_remove (plugins_head,
- plugins_tail,
- plug);
- GNUNET_free (plug->short_name);
- GNUNET_free (plug->lib_name);
- GNUNET_free (plug);
- }
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading `%s' transport plugin\n"),
+ pos);
+ GNUNET_asprintf (&libname, "libgnunet_plugin_transport_%s", pos);
+ plug = GNUNET_malloc (sizeof (struct TransportPlugin));
+ plug->short_name = GNUNET_strdup (pos);
+ plug->lib_name = libname;
+ plug->env.cfg = GST_cfg;
+ plug->env.my_identity = &GST_my_identity;
+ plug->env.get_our_hello = &GST_hello_get;
+ plug->env.cls = plug->short_name;
+ 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);
+ }
GNUNET_free (plugs);
+ next = plugins_head;
+ while (next != NULL)
+ {
+ plug = next;
+ next = plug->next;
+ plug->api = GNUNET_PLUGIN_load (plug->lib_name, &plug->env);
+ if (plug->api == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("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);
+ GNUNET_free (plug);
+ }
+ }
}
struct TransportPlugin *plug;
while (NULL != (plug = plugins_head))
- {
- GNUNET_break (NULL == GNUNET_PLUGIN_unload (plug->lib_name, plug->api));
- GNUNET_free (plug->lib_name);
- GNUNET_free (plug->short_name);
- GNUNET_CONTAINER_DLL_remove (plugins_head,
- plugins_tail,
- plug);
- GNUNET_free (plug);
- }
+ {
+ GNUNET_break (NULL == GNUNET_PLUGIN_unload (plug->lib_name, plug->api));
+ GNUNET_free (plug->lib_name);
+ GNUNET_free (plug->short_name);
+ GNUNET_CONTAINER_DLL_remove (plugins_head, plugins_tail, plug);
+ GNUNET_free (plug);
+ }
}
}
+/**
+ * Obtain the plugin API based on a the stripped plugin name after the underscore.
+ *
+ * Example: GST_plugins_printer_find (http_client) will return all plugins
+ * starting with the prefix "http":
+ * http_client or server if loaded
+ *
+ * @param name name of the plugin
+ * @return the plugin's API, NULL if the plugin is not loaded
+ */
+struct GNUNET_TRANSPORT_PluginFunctions *
+GST_plugins_printer_find (const char *name)
+{
+ struct TransportPlugin *head = plugins_head;
+
+ char *stripped = GNUNET_strdup (name);
+ char *sep = strchr (stripped, '_');
+ if (NULL != sep)
+ sep[0] = '\0';
+
+ while (head != NULL)
+ {
+ if (head->short_name == strstr (head->short_name, stripped))
+ break;
+ head = head->next;
+ }
+ GNUNET_free (stripped);
+ if (NULL == head)
+ return NULL;
+ return head->api;
+}
+
+
/**
* Convert a given address to a human-readable format. Note that the
* return value will be overwritten on the next call to this function.
- *
- * @param name plugin name
- * @param addr binary address in plugin-specific format
- * @param addrlen number of bytes in 'addr'
+ *
+ * @param address the address to convert
* @return statically allocated (!) human-readable address
*/
const char *
-GST_plugins_a2s (const char *name,
- const void *addr,
- size_t addrlen)
+GST_plugins_a2s (const struct GNUNET_HELLO_Address *address)
{
struct GNUNET_TRANSPORT_PluginFunctions *api;
+ static char unable_to_show[1024];
- if (name == NULL)
- return NULL;
- api = GST_plugins_find (name);
- if ( (api == NULL) || (addrlen == 0) || (addr == NULL) )
- return NULL;
- return api->address_to_string (NULL,
- addr,
- addrlen);
+ if (address == NULL)
+ return "<inbound>";
+ api = GST_plugins_printer_find (address->transport_name);
+ 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);
}
projects / oweals / gnunet.git / blobdiff