X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpeerinfo%2Fpeerinfo_api_notify.c;h=b9e83c9e75344629f771fbc6371a4d977d07da3a;hb=211fd52268a5ae7856273dd8d8b3b3ed427beadb;hp=edcf4f7d038243cb6b1e8a6f7dbadf41cb556d21;hpb=6c32edc3932553c01d329d026150046ebf95b38f;p=oweals%2Fgnunet.git

diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c
index edcf4f7d0..b9e83c9e7 100644
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -30,6 +30,8 @@
 #include "gnunet_time_lib.h"
 #include "peerinfo.h"
 
+#define LOG(kind,...) GNUNET_log_from (kind, "nse-api",__VA_ARGS__)
+
 /**
  * Context for the info handler.
  */
@@ -63,9 +65,10 @@ struct GNUNET_PEERINFO_NotifyContext
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 
   /**
-   * Scheduler.
+   * Tasked used for delayed re-connection attempt.
    */
-  struct GNUNET_SCHEDULER_Handle *sched;
+  GNUNET_SCHEDULER_TaskIdentifier task;
+
 };
 
 
@@ -89,6 +92,30 @@ static void
 receive_notifications (struct GNUNET_PEERINFO_NotifyContext *nc);
 
 
+/**
+ * Task to re-try connecting to peerinfo.
+ *
+ * @param cls the 'struct GNUNET_PEERINFO_NotifyContext'
+ * @param tc scheduler context
+ */
+static void
+reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct GNUNET_PEERINFO_NotifyContext *nc = cls;
+
+  nc->task = GNUNET_SCHEDULER_NO_TASK;
+  nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
+  if (NULL == nc->client)
+  {
+    /* ugh */
+    nc->task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect, nc);
+    return;
+  }
+  request_notifications (nc);
+}
+
+
 /**
  * Receive a peerinfo information message, process it and
  * go for more.
@@ -97,9 +124,7 @@ receive_notifications (struct GNUNET_PEERINFO_NotifyContext *nc);
  * @param msg message received, NULL on timeout or fatal error
  */
 static void
-process_notification (void *cls,
-		      const struct
-		      GNUNET_MessageHeader * msg)
+process_notification (void *cls, const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_PEERINFO_NotifyContext *nc = cls;
   const struct InfoMessage *im;
@@ -107,42 +132,39 @@ process_notification (void *cls,
   uint16_t ms;
 
   if (msg == NULL)
-    {
-      GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
-      nc->client = GNUNET_CLIENT_connect (nc->sched, "peerinfo", nc->cfg);
-      request_notifications (nc);
-      return;
-    }
+  {
+    GNUNET_CLIENT_disconnect (nc->client);
+    reconnect (nc, NULL);
+    return;
+  }
   ms = ntohs (msg->size);
   if ((ms < sizeof (struct InfoMessage)) ||
       (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_PEERINFO_INFO))
-    {
-      GNUNET_break (0);
-      GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
-      nc->client = GNUNET_CLIENT_connect (nc->sched, "peerinfo", nc->cfg);
-      request_notifications (nc);
-      return;
-    }
+  {
+    GNUNET_break (0);
+    GNUNET_CLIENT_disconnect (nc->client);
+    nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
+    request_notifications (nc);
+    return;
+  }
   im = (const struct InfoMessage *) msg;
   hello = NULL;
   if (ms > sizeof (struct InfoMessage) + sizeof (struct GNUNET_MessageHeader))
+  {
+    hello = (const struct GNUNET_HELLO_Message *) &im[1];
+    if (ms != sizeof (struct InfoMessage) + GNUNET_HELLO_size (hello))
     {
-      hello = (const struct GNUNET_HELLO_Message *) &im[1];
-      if (ms != sizeof (struct InfoMessage) + GNUNET_HELLO_size (hello))
-        {
-          GNUNET_break (0);
-	  GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
-	  nc->client = GNUNET_CLIENT_connect (nc->sched, "peerinfo", nc->cfg);
-	  request_notifications (nc);
-          return;
-        }
+      GNUNET_break (0);
+      GNUNET_CLIENT_disconnect (nc->client);
+      nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
+      request_notifications (nc);
+      return;
     }
-#if DEBUG_PEERINFO
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-	      "Received information about peer `%s' from peerinfo database\n",
-	      GNUNET_i2s (&im->peer));
-#endif
-  nc->callback (nc->callback_cls, &im->peer, hello, ntohl (im->trust));
+  }
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Received information about peer `%s' from peerinfo database\n",
+       GNUNET_i2s (&im->peer));
+  nc->callback (nc->callback_cls, &im->peer, hello, NULL);
   receive_notifications (nc);
 }
 
@@ -156,10 +178,8 @@ process_notification (void *cls,
 static void
 receive_notifications (struct GNUNET_PEERINFO_NotifyContext *nc)
 {
-  GNUNET_CLIENT_receive (nc->client,
-			 &process_notification,
-			 nc,
-			 GNUNET_TIME_UNIT_FOREVER_REL);
+  GNUNET_CLIENT_receive (nc->client, &process_notification, nc,
+                         GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
 
@@ -171,22 +191,20 @@ receive_notifications (struct GNUNET_PEERINFO_NotifyContext *nc)
  * @param buf where the callee should write the message
  * @return number of bytes written to buf
  */
-static size_t 
-transmit_notify_request (void *cls,
-			 size_t size, 
-			 void *buf)
+static size_t
+transmit_notify_request (void *cls, size_t size, void *buf)
 {
   struct GNUNET_PEERINFO_NotifyContext *nc = cls;
   struct GNUNET_MessageHeader hdr;
 
   nc->init = NULL;
   if (buf == NULL)
-    {
-      GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
-      nc->client = GNUNET_CLIENT_connect (nc->sched, "peerinfo", nc->cfg);
-      request_notifications (nc);
-      return 0;
-    }
+  {
+    GNUNET_CLIENT_disconnect (nc->client);
+    nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
+    request_notifications (nc);
+    return 0;
+  }
   GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
   hdr.size = htons (sizeof (struct GNUNET_MessageHeader));
   hdr.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY);
@@ -206,12 +224,12 @@ static void
 request_notifications (struct GNUNET_PEERINFO_NotifyContext *nc)
 {
   GNUNET_assert (NULL == nc->init);
-  nc->init =GNUNET_CLIENT_notify_transmit_ready (nc->client,
-						 sizeof (struct GNUNET_MessageHeader),
-						 GNUNET_TIME_UNIT_FOREVER_REL,
-						 GNUNET_YES,
-						 &transmit_notify_request,
-						 nc);
+  nc->init =
+      GNUNET_CLIENT_notify_transmit_ready (nc->client,
+                                           sizeof (struct GNUNET_MessageHeader),
+                                           GNUNET_TIME_UNIT_FOREVER_REL,
+                                           GNUNET_YES, &transmit_notify_request,
+                                           nc);
 }
 
 
@@ -221,33 +239,29 @@ request_notifications (struct GNUNET_PEERINFO_NotifyContext *nc)
  * peers and then only signals changes.
  *
  * @param cfg configuration to use
- * @param sched scheduler to use
  * @param callback the method to call for each peer
  * @param callback_cls closure for callback
  * @return NULL on error
  */
 struct GNUNET_PEERINFO_NotifyContext *
 GNUNET_PEERINFO_notify (const struct GNUNET_CONFIGURATION_Handle *cfg,
-			struct GNUNET_SCHEDULER_Handle *sched,
-			GNUNET_PEERINFO_Processor callback,
-			void *callback_cls)
+                        GNUNET_PEERINFO_Processor callback, void *callback_cls)
 {
   struct GNUNET_PEERINFO_NotifyContext *nc;
   struct GNUNET_CLIENT_Connection *client;
 
-  client = GNUNET_CLIENT_connect (sched, "peerinfo", cfg);
+  client = GNUNET_CLIENT_connect ("peerinfo", cfg);
   if (client == NULL)
-    {      
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  _("Could not connect to `%s' service.\n"), "peerinfo");
-      return NULL;
-    }
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING, _("Could not connect to `%s' service.\n"),
+         "peerinfo");
+    return NULL;
+  }
   nc = GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_NotifyContext));
-  nc->sched = sched;
   nc->cfg = cfg;
   nc->client = client;
   nc->callback = callback;
-  nc->callback_cls = callback_cls; 
+  nc->callback_cls = callback_cls;
   request_notifications (nc);
   return nc;
 }
@@ -262,11 +276,14 @@ void
 GNUNET_PEERINFO_notify_cancel (struct GNUNET_PEERINFO_NotifyContext *nc)
 {
   if (NULL != nc->init)
-    {
-      GNUNET_CLIENT_notify_transmit_ready_cancel (nc->init);
-      nc->init = NULL;
-    }
-  GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+  {
+    GNUNET_CLIENT_notify_transmit_ready_cancel (nc->init);
+    nc->init = NULL;
+  }
+  if (NULL != nc->client)
+    GNUNET_CLIENT_disconnect (nc->client);
+  if (GNUNET_SCHEDULER_NO_TASK != nc->task)
+    GNUNET_SCHEDULER_cancel (nc->task);
   GNUNET_free (nc);
 }