fix eligibility traces

[oweals/gnunet.git] / src / ats / ats_api_scheduling.c

diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index 410d4880b5669d038e7ce55cdaf5bddcf9987ffd..1ef6ce09585222f60be81b99bc6124b32085956b 100644 (file)
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -290,9 +290,6 @@ transmit_message_to_ats (void *cls, size_t size, void *buf)
     ret += p->size;
     size -= p->size;
     GNUNET_CONTAINER_DLL_remove (sh->pending_head, sh->pending_tail, p);
-    if (GNUNET_YES == p->is_init)
-      GNUNET_CLIENT_receive (sh->client, &process_ats_message, sh,
-                             GNUNET_TIME_UNIT_FOREVER_REL);
     GNUNET_free (p);
   }
   do_transmit (sh);
@@ -683,6 +680,8 @@ reconnect (struct GNUNET_ATS_SchedulingHandle *sh)
   GNUNET_assert (NULL == sh->client);
   sh->client = GNUNET_CLIENT_connect ("ats", sh->cfg);
   GNUNET_assert (NULL != sh->client);
+  GNUNET_CLIENT_receive (sh->client, &process_ats_message, sh,
+                           GNUNET_TIME_UNIT_FOREVER_REL);
   if ((NULL == (p = sh->pending_head)) || (GNUNET_YES != p->is_init))
   {
     p = GNUNET_malloc (sizeof (struct PendingMessage) +
@@ -1133,6 +1132,32 @@ GNUNET_ATS_suggest_address_cancel (struct GNUNET_ATS_SchedulingHandle *sh,
 }
 
 
+/**
+ * Test if a address and a session is known to ATS
+ *
+ * @param sh the scheduling handle
+ * @param address the address
+ * @param session the session
+ * @return GNUNET_YES or GNUNET_NO
+ */
+int
+GNUNET_ATS_session_known (struct GNUNET_ATS_SchedulingHandle *sh,
+                                                                                       const struct GNUNET_HELLO_Address *address,
+                                                                                       struct Session *session)
+{
+       int s;
+  if (NULL != session)
+  {
+    if (NOT_FOUND != (s = find_session_id (sh, session, &address->peer)))
+    {
+      /* Existing */
+      return GNUNET_YES;
+    }
+    return GNUNET_NO;
+  }
+  return GNUNET_NO;
+}
+
 /**
  * We have a new address ATS should know. Addresses have to be added with this
  * function before they can be: updated, set in use and destroyed
@@ -1184,14 +1209,9 @@ GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh,
 
   if (NULL != session)
   {
-    s = find_session_id (sh, session, &address->peer);
-    if (NOT_FOUND != s)
+    if (NOT_FOUND != (s = find_session_id (sh, session, &address->peer)))
     {
       /* Already existing, nothing todo */
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Adding duplicate address for peer `%s', plugin `%s', session %p id %u\n",
-                  GNUNET_i2s (&address->peer),
-                  address->transport_name, session, s);
       return GNUNET_SYSERR;
     }
     s = find_empty_session_slot (sh, session, &address->peer);