-makefile for new test_stream_local (commented)

[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 17fc5edc6a88689a6eb32eb6ad07d9c2bf7754b7..99db005618cc85081f3587f6e55ba033fa664bde 100644 (file)
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -251,6 +251,10 @@ struct ValidationEntry
    * Are we expecting a PONG message for this validation entry?
    */
   int expecting_pong;
+
+  /* FIXME: DEBUGGING */
+  int last_line_set_to_no;
+  int last_line_set_to_yes;
 };
 
 
@@ -481,11 +485,23 @@ transmit_ping_if_allowed (void *cls, const struct GNUNET_PeerIdentity *pid,
     else
     {
       GNUNET_assert (papi->send != NULL);
-      ret =
-          papi->send (papi->cls, pid, message_buf, tsize, PING_PRIORITY,
-                      ACCEPTABLE_PING_DELAY, NULL /* no session */ ,
-                      ve->address->address, ve->address->address_length,
-                      GNUNET_YES, NULL, NULL);
+      GNUNET_assert (papi->get_session != NULL);
+      struct Session * session = papi->get_session(papi->cls, ve->address);
+
+      if (session != NULL)
+      {
+        ret = papi->send (papi->cls, session,
+                          message_buf, tsize,
+                          PING_PRIORITY, ACCEPTABLE_PING_DELAY,
+                          NULL, NULL);
+      }
+      else
+      {
+        /* Could not get a valid session */
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not get a valid session for `%s' %s\n",
+                    GNUNET_i2s (pid), GST_plugins_a2s (ve->address));
+        ret = -1;
+      }
     }
   }
   if (-1 != ret)
@@ -588,6 +604,9 @@ find_validation_entry (const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
   if (public_key == NULL)
     return NULL;
   ve = GNUNET_malloc (sizeof (struct ValidationEntry));
+  ve->in_use = GNUNET_SYSERR; /* not defined */
+  ve->last_line_set_to_no  = 0;
+  ve->last_line_set_to_yes  = 0;
   ve->address = GNUNET_HELLO_address_copy (address);
   ve->public_key = *public_key;
   ve->pid = address->peer;
@@ -727,10 +746,21 @@ multicast_pong (void *cls,
   papi = GST_plugins_find (address->transport_name);
   if (papi == NULL)
     return;
-  (void) papi->send (papi->cls, &address->peer, (const char *) pong,
-                     ntohs (pong->header.size), PONG_PRIORITY,
-                     ACCEPTABLE_PING_DELAY, NULL, address->address,
-                     address->address_length, GNUNET_YES, NULL, NULL);
+
+  GNUNET_assert (papi->send != NULL);
+  GNUNET_assert (papi->get_session != NULL);
+
+  struct Session * session = papi->get_session(papi->cls, address);
+  if (session == NULL)
+  {
+     GNUNET_break (0);
+     return;
+  }
+
+  papi->send (papi->cls, session,
+              (const char *) pong, ntohs (pong->header.size),
+              PONG_PRIORITY, ACCEPTABLE_PING_DELAY,
+              NULL, NULL);
 }
 
 
@@ -856,17 +886,35 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
   }
   pong->signature = *sig_cache;
 
+  GNUNET_assert (sender_address != NULL);
+
   /* 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
-    ret =
-        papi->send (papi->cls, sender, (const char *) pong,
-                    ntohs (pong->header.size), PONG_PRIORITY,
-                    ACCEPTABLE_PING_DELAY, session, sender_address->address,
-                    sender_address->address_length, GNUNET_SYSERR, NULL, NULL);
+  {
+    GNUNET_assert (papi->send != NULL);
+    GNUNET_assert (papi->get_session != NULL);
+
+    if (session == NULL)
+    {
+      session = papi->get_session (papi->cls, sender_address);
+    }
+    if (session == NULL)
+    {
+      GNUNET_break (0);
+      ret = -1;
+    }
+    else
+    {
+      ret = papi->send (papi->cls, session,
+                        (const char *) pong, ntohs (pong->header.size),
+                        PONG_PRIORITY, ACCEPTABLE_PING_DELAY,
+                        NULL, NULL);
+    }
+  }
   if (ret != -1)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1170,11 +1218,13 @@ GST_validation_get_addresses (const struct GNUNET_PeerIdentity *target,
  * @param session the session
  * @param in_use GNUNET_YES if we are now using the address for a connection,
  *               GNUNET_NO if we are no longer using the address for a connection
+ * @param line line of caller just for DEBUGGING!
  */
 void
 GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
                                 struct Session *session,
-                                int in_use)
+                                int in_use,
+                                int line)
 {
   struct ValidationEntry *ve;
 
@@ -1188,10 +1238,33 @@ GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
     return;
   }
   if (ve->in_use == in_use)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "GST_validation_set_address_use: %s %s: ve->in_use %i <-> in_use %i\n",
-                GNUNET_i2s (&address->peer), GST_plugins_a2s (address), ve->in_use,
-                in_use);
+  {
+
+    if (GNUNET_YES == in_use)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Error setting address in use for peer `%s' `%s' to USED: set last time by %i, called now by %i\n",
+                  GNUNET_i2s (&address->peer), GST_plugins_a2s (address),
+                  ve->last_line_set_to_yes, line);
+    }
+    if (GNUNET_NO == in_use)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Error setting address in use for peer `%s' `%s' to NOT_USED: set last time by %i, called now by %i\n",
+                  GNUNET_i2s (&address->peer), GST_plugins_a2s (address),
+                  ve->last_line_set_to_no, line);
+    }
+  }
+
+  if (GNUNET_YES == in_use)
+  {
+    ve->last_line_set_to_yes = line;
+  }
+  if (GNUNET_NO == in_use)
+  {
+    ve->last_line_set_to_no = line;
+  }
+
   GNUNET_break (ve->in_use != in_use);  /* should be different... */
   ve->in_use = in_use;
   if (in_use == GNUNET_YES)