1 files changed, 6 insertions, 57 deletions

diff --git a/src/core/core_api.c b/src/core/core_api.c
index ecfe8b478..d2eaa260d 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -367,9 +367,7 @@ reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct GNUNET_CORE_Handle *h = cls;
 
   h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
-#if DEBUG_CORE
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CORE service after delay\n");
-#endif
   reconnect (h);
 }
 
@@ -546,11 +544,9 @@ request_next_transmission (struct PeerRecord *pr)
   smr->smr_id = htons (th->smr_id = pr->smr_id_gen++);
   GNUNET_CONTAINER_DLL_insert_tail (h->control_pending_head,
                                     h->control_pending_tail, cm);
-#if DEBUG_CORE
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Adding SEND REQUEST for peer `%s' to message queue\n",
        GNUNET_i2s (&pr->peer));
-#endif
   trigger_next_request (h, GNUNET_NO);
 }
 
@@ -580,10 +576,8 @@ transmission_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
      * us from the 'ready' list */
     GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr);
   }
-#if DEBUG_CORE
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Signalling timeout of request for transmission to CORE service\n");
-#endif
   request_next_transmission (pr);
   GNUNET_assert (0 == th->get_message (th->get_message_cls, 0, NULL));
   GNUNET_free (th);
@@ -609,10 +603,8 @@ transmit_message (void *cls, size_t size, void *buf)
   h->cth = NULL;
   if (buf == NULL)
   {
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Transmission failed, initiating reconnect\n");
-#endif
     reconnect_later (h);
     return 0;
   }
@@ -626,11 +618,9 @@ transmit_message (void *cls, size_t size, void *buf)
       trigger_next_request (h, GNUNET_NO);
       return 0;
     }
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Transmitting control message with %u bytes of type %u to core.\n",
          (unsigned int) msize, (unsigned int) ntohs (hdr->type));
-#endif
     memcpy (buf, hdr, msize);
     GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
                                  h->control_pending_tail, cm);
@@ -660,11 +650,9 @@ transmit_message (void *cls, size_t size, void *buf)
       GNUNET_SCHEDULER_cancel (pr->timeout_task);
       pr->timeout_task = GNUNET_SCHEDULER_NO_TASK;
     }
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Transmitting SEND request to `%s' with %u bytes.\n",
          GNUNET_i2s (&pr->peer), (unsigned int) th->msize);
-#endif
     sm = (struct SendMessage *) buf;
     sm->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_SEND);
     sm->priority = htonl (th->priority);
@@ -676,28 +664,22 @@ transmit_message (void *cls, size_t size, void *buf)
         th->get_message (th->get_message_cls,
                          size - sizeof (struct SendMessage), &sm[1]);
 
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Transmitting SEND request to `%s' yielded %u bytes.\n",
          GNUNET_i2s (&pr->peer), ret);
-#endif
     GNUNET_free (th);
     if (0 == ret)
     {
-#if DEBUG_CORE
       LOG (GNUNET_ERROR_TYPE_DEBUG,
            "Size of clients message to peer %s is 0!\n",
            GNUNET_i2s (&pr->peer));
-#endif
       /* client decided to send nothing! */
       request_next_transmission (pr);
       return 0;
     }
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Produced SEND message to core with %u bytes payload\n",
          (unsigned int) ret);
-#endif
     GNUNET_assert (ret >= sizeof (struct GNUNET_MessageHeader));
     if (ret + sizeof (struct SendMessage) >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
     {
@@ -729,17 +711,13 @@ trigger_next_request (struct GNUNET_CORE_Handle *h, int ignore_currently_down)
 
   if ((GNUNET_YES == h->currently_down) && (ignore_currently_down == GNUNET_NO))
   {
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Core connection down, not processing queue\n");
-#endif
     return;
   }
   if (NULL != h->cth)
   {
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG, "Request pending, not processing queue\n");
-#endif
     return;
   }
   if (h->control_pending_head != NULL)
@@ -751,10 +729,8 @@ trigger_next_request (struct GNUNET_CORE_Handle *h, int ignore_currently_down)
         h->ready_peer_head->pending_head->msize + sizeof (struct SendMessage);
   else
   {
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Request queue empty, not processing queue\n");
-#endif
     return;                     /* no pending message */
   }
   h->cth =
@@ -800,11 +776,9 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     return;
   }
   msize = ntohs (msg->size);
-#if DEBUG_CORE > 2
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Processing message of type %u and size %u from core service\n",
        ntohs (msg->type), msize);
-#endif
   switch (ntohs (msg->type))
   {
   case GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY:
@@ -828,18 +802,14 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     {
       /* mark so we don't call init on reconnect */
       h->init = NULL;
-#if DEBUG_CORE
       LOG (GNUNET_ERROR_TYPE_DEBUG, "Connected to core service of peer `%s'.\n",
            GNUNET_i2s (&h->me));
-#endif
       init (h->cls, h, &h->me);
     }
     else
     {
-#if DEBUG_CORE
       LOG (GNUNET_ERROR_TYPE_DEBUG,
            "Successfully reconnected to core service.\n");
-#endif
     }
     /* fake 'connect to self' */
     pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &h->me.hashPubKey);
@@ -871,11 +841,9 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       reconnect_later (h);
       return;
     }
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Received notification about connection from `%s'.\n",
          GNUNET_i2s (&cnm->peer));
-#endif
     if (0 == memcmp (&h->me, &cnm->peer, sizeof (struct GNUNET_PeerIdentity)))
     {
       /* connect to self!? */
@@ -915,11 +883,9 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       return;
     }
     GNUNET_break (0 == ntohl (dnm->reserved));
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Received notification about disconnect from `%s'.\n",
          GNUNET_i2s (&dnm->peer));
-#endif
     pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &dnm->peer.hashPubKey);
     if (pr == NULL)
     {
@@ -954,11 +920,9 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       return;
     }
     em = (const struct GNUNET_MessageHeader *) &(&ntm->ats)[ats_count + 1];
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Received message of type %u and size %u from peer `%4s'\n",
          ntohs (em->type), ntohs (em->size), GNUNET_i2s (&ntm->peer));
-#endif
     pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &ntm->peer.hashPubKey);
     if (pr == NULL)
     {
@@ -1033,11 +997,9 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       reconnect_later (h);
       return;
     }
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Received notification about transmission to `%s'.\n",
          GNUNET_i2s (&ntm->peer));
-#endif
     if ((GNUNET_NO == h->outbound_hdr_only) &&
         (msize !=
          ntohs (em->size) + sizeof (struct NotifyTrafficMessage) +
@@ -1069,11 +1031,9 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       reconnect_later (h);
       return;
     }
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Received notification about transmission readiness to `%s'.\n",
          GNUNET_i2s (&smr->peer));
-#endif
     if (pr->pending_head == NULL)
     {
       /* request must have been cancelled between the original request
@@ -1123,10 +1083,8 @@ init_done_task (void *cls, int success)
     return;                     /* shutdown */
   if (success == GNUNET_NO)
   {
-#if DEBUG_CORE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Failed to exchange INIT with core, retrying\n");
-#endif
     if (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
       reconnect_later (h);
     return;
@@ -1152,9 +1110,6 @@ reconnect (struct GNUNET_CORE_Handle *h)
   uint16_t *ts;
   unsigned int hpos;
 
-#if DEBUG_CORE
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Reconnecting to CORE service\n");
-#endif
   GNUNET_assert (h->client == NULL);
   GNUNET_assert (h->currently_down == GNUNET_YES);
   h->client = GNUNET_CLIENT_connect ("core", h->cfg);
@@ -1185,6 +1140,10 @@ reconnect (struct GNUNET_CORE_Handle *h)
     else
       opt |= GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND;
   }
+  LOG (GNUNET_ERROR_TYPE_INFO, 
+       "(Re)connecting to CORE service, monitoring messages of type %u\n",
+       opt);
+
   init->options = htonl (opt);
   ts = (uint16_t *) & init[1];
   for (hpos = 0; hpos < h->hcnt; hpos++)
@@ -1203,8 +1162,8 @@ reconnect (struct GNUNET_CORE_Handle *h)
  * @param cfg configuration to use
  * @param queue_size size of the per-peer message queue
  * @param cls closure for the various callbacks that follow (including handlers in the handlers array)
- * @param init callback to call on timeout or once we have successfully
- *        connected to the core service; note that timeout is only meaningful if init is not NULL
+ * @param init callback to call once we have successfully
+ *        connected to the core service
  * @param connects function to call on peer connect, can be NULL
  * @param disconnects function to call on peer disconnect / timeout, can be NULL
  * @param inbound_notify function to call for all inbound messages, can be NULL
@@ -1255,9 +1214,7 @@ GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
   GNUNET_assert (h->hcnt <
                  (GNUNET_SERVER_MAX_MESSAGE_SIZE -
                   sizeof (struct InitMessage)) / sizeof (uint16_t));
-#if DEBUG_CORE
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CORE service\n");
-#endif
   reconnect (h);
   return h;
 }
@@ -1275,9 +1232,7 @@ GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle)
 {
   struct ControlMessage *cm;
 
-#if DEBUG_CORE
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from CORE service\n");
-#endif
   if (handle->cth != NULL)
   {
     GNUNET_CLIENT_notify_transmit_ready_cancel (handle->cth);
@@ -1401,18 +1356,14 @@ GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle, int cork,
       GNUNET_break (handle->queue_size != 0);
       GNUNET_break (pr->queue_size == 1);
       GNUNET_free (th);
-#if DEBUG_CORE
       LOG (GNUNET_ERROR_TYPE_DEBUG,
            "Dropping transmission request: cannot drop queue head and limit is one\n");
-#endif
       return NULL;
     }
     if (priority <= minp->priority)
     {
-#if DEBUG_CORE
       LOG (GNUNET_ERROR_TYPE_DEBUG,
            "Dropping transmission request: priority too low\n");
-#endif
       GNUNET_free (th);
       return NULL;              /* priority too low */
     }
@@ -1440,9 +1391,7 @@ GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle, int cork,
                                      th);
   pr->queue_size++;
   /* was the request queue previously empty? */
-#if DEBUG_CORE
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmission request added to queue\n");
-#endif
   if ((pr->pending_head == th) && (pr->ntr_task == GNUNET_SCHEDULER_NO_TASK) &&
       (pr->next == NULL) && (pr->prev == NULL) &&
       (handle->ready_peer_head != pr))