From 89963b943638799819321934761a31aaa442f384 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Fri, 12 Jul 2013 08:51:22 +0000 Subject: [PATCH] fixed address validation for plugins with client server architecture --- .../gnunet-service-transport_validation.c | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c index bd4476082..98a73b3da 100644 --- a/src/transport/gnunet-service-transport_validation.c +++ b/src/transport/gnunet-service-transport_validation.c @@ -903,10 +903,13 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender, const struct TransportPingMessage *ping; struct TransportPongMessage *pong; struct GNUNET_TRANSPORT_PluginFunctions *papi; + struct GNUNET_TRANSPORT_PluginFunctions *server_papi; struct GNUNET_CRYPTO_EccSignature *sig_cache; struct GNUNET_TIME_Absolute *sig_cache_exp; const char *addr; const char *addrend; + char *plugin_name; + char *pos; size_t alen; size_t slen; ssize_t ret; @@ -960,13 +963,26 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender, { GNUNET_break (0); } - if (NULL == (papi = GST_plugins_find (address.transport_name))) + + if (0 != strstr (address.transport_name, "_client")) + { + plugin_name = GNUNET_strdup (address.transport_name); + pos = strstr (plugin_name, "_client"); + GNUNET_assert (NULL != pos); + GNUNET_snprintf (pos, strlen ("_server") + 1, "%s", "_server"); + } + else + plugin_name = GNUNET_strdup (address.transport_name); + + if (NULL == (papi = GST_plugins_find (plugin_name))) { /* we don't have the plugin for this address */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Plugin `%s' not available, cannot confirm having this address \n", - address.transport_name) ; + plugin_name); + GNUNET_free (plugin_name); return; } + GNUNET_free (plugin_name); if (GNUNET_OK != papi->check_address (papi->cls, addrend, alen)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Address `%s' is not one of my addresses, not confirming PING\n", -- 2.25.1