guix-env: some update.

[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 479d4bd860b573e13f432ffd24ea0b5521b16b4d..ce226d96e432b775a5a1431fe2b04c499f4c9146 100644 (file)
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -29,7 +29,7 @@
 #include "gnunet_protocols.h"
 #include "peerinfo.h"
 
-#define LOG(kind,...) GNUNET_log_from (kind, "nse-api",__VA_ARGS__)
+#define LOG(kind,...) GNUNET_log_from (kind, "peerinfo-api",__VA_ARGS__)
 
 /**
  * Context for the info handler.
@@ -171,6 +171,23 @@ handle_notification (void *cls,
 }
 
 
+/**
+ * Type of a function to call when we receive a message from the
+ * service.  Call the iterator with the result and (if applicable)
+ * continue to receive more messages or trigger processing the next
+ * event (if applicable).
+ *
+ * @param cls closure
+ * @param msg message received, NULL on timeout or fatal error
+ */
+static void
+handle_end_iteration (void *cls,
+                      const struct GNUNET_MessageHeader *msg)
+{
+  /* these are ignored by the notify API */
+}
+
+
 /**
  * Task to re-try connecting to peerinfo.
  *
@@ -179,19 +196,23 @@ handle_notification (void *cls,
 static void
 reconnect (void *cls)
 {
-  GNUNET_MQ_hd_var_size (notification,
-                         GNUNET_MESSAGE_TYPE_PEERINFO_INFO,
-                         struct InfoMessage);
   struct GNUNET_PEERINFO_NotifyContext *nc = cls;
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_notification_handler (nc),
+    GNUNET_MQ_hd_var_size (notification,
+                           GNUNET_MESSAGE_TYPE_PEERINFO_INFO,
+                           struct InfoMessage,
+                           nc),
+    GNUNET_MQ_hd_fixed_size (end_iteration,
+                             GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END,
+                             struct GNUNET_MessageHeader,
+                             nc),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MQ_Envelope *env;
   struct NotifyMessage *nm;
 
   nc->task = NULL;
-  nc->mq = GNUNET_CLIENT_connecT (nc->cfg,
+  nc->mq = GNUNET_CLIENT_connect (nc->cfg,
                                   "peerinfo",
                                   handlers,
                                   &mq_error_handler,