REST: nothing triggers rest

[oweals/gnunet.git] / src / ats / gnunet-service-ats-new.c

diff --git a/src/ats/gnunet-service-ats-new.c b/src/ats/gnunet-service-ats-new.c
index dd65d54a27341eabe00938141884cbe402f1b9c5..b451c8c677128cc96a5763de24e23a54d3d1d050 100644 (file)
--- a/src/ats/gnunet-service-ats-new.c
+++ b/src/ats/gnunet-service-ats-new.c
@@ -213,6 +213,10 @@ suggest_cb (void *cls,
     // FIXME: stats!
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Suggesting address `%s' of peer `%s'\n",
+              address,
+              GNUNET_i2s (pid));
   env = GNUNET_MQ_msg_extra (as,
                             slen,
                             GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION);
@@ -253,6 +257,12 @@ allocate_cb (void *cls,
        losses of sessions (possibly of previous transport), ignore! */
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Allocating %u/%u bytes for %p of peer `%s'\n",
+              ntohl (bw_in.value__),
+              ntohl (bw_out.value__),
+              session,
+              GNUNET_i2s (peer));
   env = GNUNET_MQ_msg (sam,
                       GNUNET_MESSAGE_TYPE_ATS_SESSION_ALLOCATION);
   sam->session_id = session->session_id;
@@ -294,7 +304,7 @@ prop_ntoh (const struct PropertiesNBO *properties,
  */
 static void
 handle_suggest (void *cls,
-               const struct ExpressPreferenceMessage *msg)
+                const struct ExpressPreferenceMessage *msg)
 {
   struct Client *c = cls;
   struct ClientPreference *cp;
@@ -307,6 +317,11 @@ handle_suggest (void *cls,
     GNUNET_SERVICE_client_drop (c->client);
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Client suggested we talk to %s with preference %d at rate %u\n",
+              GNUNET_i2s (&msg->peer),
+              (int) ntohl (msg->pk),
+              (int) ntohl (msg->bw.value__));
   cp = GNUNET_new (struct ClientPreference);
   cp->client = c;
   cp->pref.peer = msg->peer;
@@ -329,7 +344,7 @@ handle_suggest (void *cls,
  */
 static void
 handle_suggest_cancel (void *cls,
-                      const struct ExpressPreferenceMessage *msg)
+                       const struct ExpressPreferenceMessage *msg)
 {
   struct Client *c = cls;
   struct ClientPreference *cp;
@@ -347,9 +362,8 @@ handle_suggest_cancel (void *cls,
        cp = cp->next)
     if ( (cp->pref.pk == (enum GNUNET_MQ_PreferenceKind) ntohl (msg->pk)) &&
         (cp->pref.bw.value__ == msg->bw.value__) &&
-        (0 == memcmp (&cp->pref.peer,
-                      &msg->peer,
-                      sizeof (struct GNUNET_PeerIdentity))) )
+        (0 == GNUNET_memcmp (&cp->pref.peer,
+                      &msg->peer)) )
       break;
   if (NULL == cp)
   {
@@ -464,6 +478,10 @@ handle_session_add (void *cls,
                                     &session->data,
                                     address);
   GNUNET_assert (NULL != session->sh);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Transport has new session %p to %s\n",
+              session,
+              GNUNET_i2s (&message->peer));
   GNUNET_SERVICE_client_continue (c->client);
 }
 
@@ -540,6 +558,10 @@ handle_session_del (void *cls,
                 GNUNET_CONTAINER_multihashmap32_remove (c->details.transport.sessions,
                                                         session->session_id,
                                                         session));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Transport lost session %p to %s\n",
+              session,
+              GNUNET_i2s (&session->data.peer));
   GNUNET_free (session);
   GNUNET_SERVICE_client_continue (c->client);
 }
@@ -749,13 +771,13 @@ GNUNET_SERVICE_MAIN
  &client_disconnect_cb,
  NULL,
  GNUNET_MQ_hd_fixed_size (suggest,
-                         GNUNET_MESSAGE_TYPE_ATS_SUGGEST,
-                         struct ExpressPreferenceMessage,
-                         NULL),
+                          GNUNET_MESSAGE_TYPE_ATS_SUGGEST,
+                          struct ExpressPreferenceMessage,
+                          NULL),
  GNUNET_MQ_hd_fixed_size (suggest_cancel,
-                         GNUNET_MESSAGE_TYPE_ATS_SUGGEST_CANCEL,
-                         struct ExpressPreferenceMessage,
-                         NULL),
+                          GNUNET_MESSAGE_TYPE_ATS_SUGGEST_CANCEL,
+                          struct ExpressPreferenceMessage,
+                          NULL),
  GNUNET_MQ_hd_fixed_size (start,
                          GNUNET_MESSAGE_TYPE_ATS_START,
                          struct GNUNET_MessageHeader,