Changed peerinfo api to distinguish between last element and timeout

1 files changed, 18 insertions, 2 deletions

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 290160414..dd1937f06 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -3006,10 +3006,18 @@ handle_client_request_connect (void *cls,
 static void
 process_hello_retry_send_key (void *cls,
                               const struct GNUNET_PeerIdentity *peer,
-                              const struct GNUNET_HELLO_Message *hello)
+                              const struct GNUNET_HELLO_Message *hello,
+                              const char *err_msg)
 {
   struct Neighbour *n = cls;
 
+  if (err_msg != NULL)
+  {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      _("Error in communication with PEERINFO service\n"));
+        /* return; */
+  }
+
   if (peer == NULL)
     {
 #if DEBUG_CORE
@@ -3318,11 +3326,19 @@ handle_set_key (struct Neighbour *n,
 static void
 process_hello_retry_handle_set_key (void *cls,
                                     const struct GNUNET_PeerIdentity *peer,
-                                    const struct GNUNET_HELLO_Message *hello)
+                                    const struct GNUNET_HELLO_Message *hello,
+                                    const char *err_msg)
 {
   struct Neighbour *n = cls;
   struct SetKeyMessage *sm = n->skm;
 
+  if (err_msg != NULL)
+  {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      _("Error in communication with PEERINFO service\n"));
+        /* return; */
+  }
+
   if (peer == NULL)
     {
       n->skm = NULL;