wip

[oweals/gnunet.git] / src / peerinfo / peerinfo_api_notify.c

diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c
index edcf4f7d038243cb6b1e8a6f7dbadf41cb556d21..eb6e29ce5f71495f87ecdc25e929047c5222680a 100644 (file)
--- 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
@@ -63,9 +63,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 +90,32 @@ 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.
@@ -109,8 +136,7 @@ process_notification (void *cls,
   if (msg == NULL)
     {
       GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
-      nc->client = GNUNET_CLIENT_connect (nc->sched, "peerinfo", nc->cfg);
-      request_notifications (nc);
+      reconnect (nc, NULL);
       return;
     }
   ms = ntohs (msg->size);
@@ -119,7 +145,7 @@ process_notification (void *cls,
     {
       GNUNET_break (0);
       GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
-      nc->client = GNUNET_CLIENT_connect (nc->sched, "peerinfo", nc->cfg);
+      nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
       request_notifications (nc);
       return;
     }
@@ -132,7 +158,7 @@ process_notification (void *cls,
         {
           GNUNET_break (0);
          GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
-         nc->client = GNUNET_CLIENT_connect (nc->sched, "peerinfo", nc->cfg);
+         nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
          request_notifications (nc);
           return;
         }
@@ -142,7 +168,7 @@ process_notification (void *cls,
              "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));
+  nc->callback (nc->callback_cls, &im->peer, hello, NULL);
   receive_notifications (nc);
 }
 
@@ -183,7 +209,7 @@ transmit_notify_request (void *cls,
   if (buf == NULL)
     {
       GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
-      nc->client = GNUNET_CLIENT_connect (nc->sched, "peerinfo", nc->cfg);
+      nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
       request_notifications (nc);
       return 0;
     }
@@ -221,21 +247,19 @@ 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)
 {
   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,
@@ -243,7 +267,6 @@ GNUNET_PEERINFO_notify (const struct GNUNET_CONFIGURATION_Handle *cfg,
       return NULL;
     }
   nc = GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_NotifyContext));
-  nc->sched = sched;
   nc->cfg = cfg;
   nc->client = client;
   nc->callback = callback;
@@ -266,7 +289,10 @@ GNUNET_PEERINFO_notify_cancel (struct GNUNET_PEERINFO_NotifyContext *nc)
       GNUNET_CLIENT_notify_transmit_ready_cancel (nc->init);
       nc->init = NULL;
     }
-  GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+  if (NULL != nc->client)
+    GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+  if (GNUNET_SCHEDULER_NO_TASK != nc->task)
+    GNUNET_SCHEDULER_cancel (nc->task);
   GNUNET_free (nc);
 }