Changed peerinfo api to distinguish between last element and timeout

1 files changed, 18 insertions, 2 deletions

diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c
index 95272a555..4c88ae317 100644
--- a/src/hostlist/hostlist-server.c
+++ b/src/hostlist/hostlist-server.c
@@ -178,13 +178,21 @@ check_has_addr (void *cls,
 static void
 host_processor (void *cls,
                 const struct GNUNET_PeerIdentity * peer,
-                const struct GNUNET_HELLO_Message *hello)
+                const struct GNUNET_HELLO_Message *hello,
+                const char *err_msg)
 {
   struct HostSet *results = cls;
   size_t old;
   size_t s;
   int has_addr;
   
+  if (err_msg != NULL)
+  {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      _("Error in communication with PEERINFO service:\n `%s'"), err_msg);
+        return;
+  }
+
   if (peer == NULL)
     {
       pitr = NULL;
@@ -439,17 +447,25 @@ disconnect_handler (void *cls,
  * @param cls closure (not used)
  * @param peer potential peer to connect to
  * @param hello HELLO for this peer (or NULL)
+ * @param err_msg NULL if successful, otherwise contains error message
  */
 static void
 process_notify (void *cls,
                 const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_HELLO_Message *hello)
+                const struct GNUNET_HELLO_Message *hello,
+                const char *err_msg)
 {
   struct HostSet *results;
 #if DEBUG_HOSTLIST_SERVER
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
             "Peerinfo is notifying us to rebuild our hostlist\n");
 #endif
+  if (err_msg != NULL)
+  {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      _("Error in communication with PEERINFO service\n"));
+        /* return; */
+  }
   results = GNUNET_malloc(sizeof(struct HostSet));
   GNUNET_assert (peerinfo != NULL);
   pitr = GNUNET_PEERINFO_iterate (peerinfo,