Extending the testcases to use bluetooth

[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 71a96de124248a19305720a2de10a42d4eb5b86d..4ea0f07a6557c3b4b9e49e3e42df17a7f0abbd8f 100644 (file)
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -266,6 +266,8 @@ struct ValidationEntry
   /* FIXME: DEBUGGING */
   int last_line_set_to_no;
   int last_line_set_to_yes;
+
+  enum GNUNET_ATS_Network_Type network;
 };
 
 
@@ -473,6 +475,7 @@ transmit_ping_if_allowed (void *cls, const struct GNUNET_PeerIdentity *pid,
   struct GNUNET_TRANSPORT_PluginFunctions *papi;
   struct GNUNET_TIME_Absolute next;
   const struct GNUNET_MessageHeader *hello;
+  enum GNUNET_ATS_Network_Type network;
   ssize_t ret;
   size_t tsize;
   size_t slen;
@@ -546,6 +549,14 @@ transmit_ping_if_allowed (void *cls, const struct GNUNET_PeerIdentity *pid,
                           message_buf, tsize,
                           PING_PRIORITY, ACCEPTABLE_PING_DELAY,
                           NULL, NULL);
+        network = papi->get_network (ve->address, session);
+        if (GNUNET_ATS_NET_UNSPECIFIED == network)
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                                                       "Could not obtain a valid network for `%s' %s\n",
+                      GNUNET_i2s (pid), GST_plugins_a2s (ve->address));
+               GNUNET_break (0);
+        }
       }
       else
       {
@@ -563,6 +574,8 @@ transmit_ping_if_allowed (void *cls, const struct GNUNET_PeerIdentity *pid,
                               gettext_noop
                               ("# PING without HELLO messages sent"), 1,
                               GNUNET_NO);
+
+    ve->network = network;
     ve->expecting_pong = GNUNET_YES;
     validations_running ++;
          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -723,6 +736,7 @@ add_valid_address (void *cls, const struct GNUNET_HELLO_Address *address,
   const struct GNUNET_HELLO_Message *hello = cls;
   struct ValidationEntry *ve;
   struct GNUNET_PeerIdentity pid;
+  struct GNUNET_ATS_Information ats;
   struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
 
   if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value == 0)
@@ -744,7 +758,11 @@ add_valid_address (void *cls, const struct GNUNET_HELLO_Address *address,
 
   if (GNUNET_SCHEDULER_NO_TASK == ve->revalidation_task)
     ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve);
-  GNUNET_ATS_address_add (GST_ats, address, NULL, NULL, 0);
+
+  ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+  ats.value = htonl (ve->network);
+  GNUNET_ATS_address_add (GST_ats, address, NULL, &ats, 1);
+
   return GNUNET_OK;
 }
 
@@ -889,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;
@@ -921,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);
@@ -938,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))
     {
@@ -1015,7 +1078,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
@@ -1208,23 +1270,24 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
   do_verify = GNUNET_YES;
   if (0 != GNUNET_TIME_absolute_get_remaining(ve->pong_sig_valid_until).rel_value)
   {
+               /* We have a cached and valid signature for this peer,
+                * try to compare instead of verify */
                if (0 == memcmp (&ve->pong_sig_cache, &pong->signature, sizeof (struct GNUNET_CRYPTO_EccSignature)))
                {
+                       /* signatures are identical, we can skip verification */
                        sig_res = GNUNET_OK;
                        do_verify = GNUNET_NO;
                }
                else
                {
                        sig_res = GNUNET_SYSERR;
-        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-               "Failed to check with cached signature: different signature on address %s:%s from peer `%s'\n",
-               tname, GST_plugins_a2s (ve->address),
-               GNUNET_i2s (sender));
+                       /* signatures do not match, we have to verify */
                }
   }
 
   if (GNUNET_YES == do_verify)
   {
+                       /* Do expensive verification */
                sig_res = GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN,
                                 &pong->purpose, &pong->signature,
                                 &ve->public_key);
@@ -1247,10 +1310,12 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
        ve->pong_sig_valid_until = GNUNET_TIME_absolute_ntoh (pong->expiration);
   ve->latency = GNUNET_TIME_absolute_get_duration (ve->send_time);
   {
-    struct GNUNET_ATS_Information ats;
-    ats.type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
-    ats.value = htonl ((uint32_t) ve->latency.rel_value);
-    GNUNET_ATS_address_add (GST_ats, ve->address, NULL, &ats, 1);
+    struct GNUNET_ATS_Information ats[2];
+    ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
+    ats[0].value = htonl ((uint32_t) ve->latency.rel_value);
+    ats[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+    ats[1].value = htonl ((uint32_t) ve->network);
+    GNUNET_ATS_address_add (GST_ats, ve->address, NULL, ats, 2);
   }
   if (validations_running > 0)
   {