-add identity service to standard build

[oweals/gnunet.git] / src / nse / nse_api.c

diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c
index 2fa8af2e525fbdb54a2ea9e95cdbe25252066bfe..8f44862877b8a775d025096eb2f6972353b79cf5 100644 (file)
--- a/src/nse/nse_api.c
+++ b/src/nse/nse_api.c
@@ -149,23 +149,12 @@ reschedule_connect (struct GNUNET_NSE_Handle *h)
     h->client = NULL;
   }
 
-#if DEBUG_NSE
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Scheduling task to reconnect to nse service in %llu ms.\n",
        h->reconnect_delay.rel_value);
-#endif
   h->reconnect_task =
       GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
-  if (h->reconnect_delay.rel_value == 0)
-  {
-    h->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
-  }
-  else
-  {
-    h->reconnect_delay = GNUNET_TIME_relative_multiply (h->reconnect_delay, 2);
-    h->reconnect_delay =
-        GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS, h->reconnect_delay);
-  }
+  h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay);
 }
 
 
@@ -184,19 +173,15 @@ send_start (void *cls, size_t size, void *buf)
   struct GNUNET_MessageHeader *msg;
 
   h->th = NULL;
-  if (buf == NULL)
+  if (NULL == buf)
   {
     /* Connect error... */
-#if DEBUG_NSE
     LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Shutdown while trying to transmit `%s' request.\n", "START");
-#endif
+         "Error while trying to transmit `%s' request.\n", "START");
     reschedule_connect (h);
     return 0;
   }
-#if DEBUG_NSE
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "START");
-#endif
   GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
 
   msg = (struct GNUNET_MessageHeader *) buf;
@@ -220,25 +205,18 @@ reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct GNUNET_NSE_Handle *h = cls;
 
   h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
-  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
-  {
-    /* shutdown, just give up */
-    return;
-  }
-#if DEBUG_NSE
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Connecting to network size estimation service.\n");
-#endif
-  GNUNET_assert (h->client == NULL);
+  GNUNET_assert (NULL == h->client);
   h->client = GNUNET_CLIENT_connect ("nse", h->cfg);
-  GNUNET_assert (h->client != NULL);
-
+  GNUNET_assert (NULL != h->client);
+  GNUNET_assert (NULL == h->th);
   h->th =
       GNUNET_CLIENT_notify_transmit_ready (h->client,
                                            sizeof (struct GNUNET_MessageHeader),
                                            GNUNET_TIME_UNIT_FOREVER_REL,
                                            GNUNET_NO, &send_start, h);
-  GNUNET_assert (h->th != NULL);
+  GNUNET_assert (NULL != h->th);
 }
 
 
@@ -276,18 +254,18 @@ GNUNET_NSE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
 void
 GNUNET_NSE_disconnect (struct GNUNET_NSE_Handle *h)
 {
-  GNUNET_assert (h != NULL);
+  GNUNET_assert (NULL != h);
   if (h->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
   {
     GNUNET_SCHEDULER_cancel (h->reconnect_task);
     h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
   }
-  if (h->th != NULL)
+  if (NULL != h->th)
   {
     GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
     h->th = NULL;
   }
-  if (h->client != NULL)
+  if (NULL != h->client)
   {
     GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;