remove output

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

diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c
index d467c71a7ff72ccb315975525e79ee8ecfaef5b9..0c70ee9bb0bdb482044764a5e2ba6daaf112956f 100644 (file)
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -189,7 +189,7 @@ struct ValidationEntry
   /**
    * Public key of the peer.
    */
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
+  struct GNUNET_CRYPTO_EccPublicKey public_key;
 
   /**
    * The identity of the peer. FIXME: duplicated (also in 'address')
@@ -682,8 +682,8 @@ revalidate_address (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  *         if we don't have an existing entry and no public key was given
  */
 static struct ValidationEntry *
-find_validation_entry (const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded
-                       *public_key, const struct GNUNET_HELLO_Address *address)
+find_validation_entry (const struct GNUNET_CRYPTO_EccPublicKey *public_key,
+                      const struct GNUNET_HELLO_Address *address)
 {
   struct ValidationEntryMatchContext vemc;
   struct ValidationEntry *ve;
@@ -737,7 +737,7 @@ add_valid_address (void *cls, const struct GNUNET_HELLO_Address *address,
   struct ValidationEntry *ve;
   struct GNUNET_PeerIdentity pid;
   struct GNUNET_ATS_Information ats;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
+  struct GNUNET_CRYPTO_EccPublicKey public_key;
 
   if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value == 0)
     return GNUNET_OK;           /* expired */
@@ -857,8 +857,8 @@ GST_validation_stop ()
  */
 static void
 multicast_pong (void *cls,
-                const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded
-                *public_key, struct GNUNET_TIME_Absolute valid_until,
+                const struct GNUNET_CRYPTO_EccPublicKey *public_key, 
+               struct GNUNET_TIME_Absolute valid_until,
                 struct GNUNET_TIME_Absolute validation_block,
                 const struct GNUNET_HELLO_Address *address)
 {
@@ -907,6 +907,8 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
   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;
@@ -939,7 +941,7 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
 
   sig_cache = NULL;
   sig_cache_exp = NULL;
-
+  papi = NULL;
   if (alen > 0)
   {
     addrend = memchr (addr, '\0', alen);
@@ -956,6 +958,49 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
     address.transport_name = addr;
     address.peer = GST_my_identity;
 
+    if (NULL == address.transport_name)
+    {
+       GNUNET_break (0);
+    }
+
+    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",
+               plugin_name);
+      GNUNET_free (plugin_name);
+      return;
+    }
+    GNUNET_free (plugin_name);
+    if (GNUNET_OK != papi->check_address (papi->cls, addrend, alen))
+               {
+      GNUNET_STATISTICS_update (GST_stats,
+                                gettext_noop
+                                ("# failed address checks during validation"), 1,
+                                GNUNET_NO);
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Address `%s' is not one of my addresses, not confirming PING\n",
+               GST_plugins_a2s (&address));
+       return;
+               }
+    else
+    {
+      GNUNET_STATISTICS_update (GST_stats,
+                                gettext_noop
+                                ("# successful address checks during validation"), 1,
+                                GNUNET_NO);
+       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Address `%s' is one of my addresses, confirming PING\n",
+                       GST_plugins_a2s (&address));
+    }
 
     if (GNUNET_YES != GST_hello_test_address (&address, &sig_cache, &sig_cache_exp))
     {
@@ -1019,9 +1064,13 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
                "Creating PONG signature to indicate ownership.\n");
     *sig_cache_exp = GNUNET_TIME_relative_to_absolute (PONG_SIGNATURE_LIFETIME);
     pong->expiration = GNUNET_TIME_absolute_hton (*sig_cache_exp);
-    GNUNET_assert (GNUNET_OK ==
+    if (GNUNET_OK !=
                   GNUNET_CRYPTO_ecc_sign (GST_my_private_key, &pong->purpose,
-                                          sig_cache));
+                                          sig_cache))
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+               _("Failed to create PONG signature for peer `%s'\n"), GNUNET_i2s (sender));
+    }
   }
   else
   {
@@ -1033,7 +1082,6 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
 
   /* first see if the session we got this PING from can be used to transmit
    * a response reliably */
-  papi = GST_plugins_find (sender_address->transport_name);
   if (papi == NULL)
     ret = -1;
   else
@@ -1095,7 +1143,7 @@ struct ValidateAddressContext
   /**
    * Public key of the peer whose address is being validated.
    */
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
+  struct GNUNET_CRYPTO_EccPublicKey public_key;
 };