[GNUnet-SVN] [gnunet] branch master updated (5794e8023 -> 75885ed26)

[gnunet]

This is an automated email from the git hooks/post-receive script.

julius-buenger pushed a change to branch master
in repository gnunet.

    from 5794e8023 fix rps service: better handling of cadet channels
     new 3215ab6ef rps service: don't send 'ping' twice
     new 85c97d318 fix rps service: don't null out context, just channel
     new 75885ed26 rps service: improve logging - log peer id

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/rps/gnunet-service-rps.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index fcb68b724..8ea10e4ca 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -1225,7 +1225,8 @@ Peers_issue_peer_liveliness_check (const struct 
GNUNET_PeerIdentity *peer)
 
   ret = Peers_insert_peer (peer);
   peer_ctx = get_peer_ctx (peer);
-  if (GNUNET_NO == Peers_check_peer_flag (peer, Peers_ONLINE))
+  if ( (GNUNET_NO == Peers_check_peer_flag (peer, Peers_ONLINE)) &&
+       (NULL == peer_ctx->liveliness_check_pending) )
   {
     check_peer_live (peer_ctx);
   }
@@ -1724,7 +1725,7 @@ destroy_channel (void *cls)
   struct PeerContext *peer_ctx = channel_ctx->peer_ctx;
   uint32_t *channel_flag;
 
-  channel_ctx = NULL;
+  channel_ctx->destruction_task = NULL;
   GNUNET_CADET_channel_destroy (peer_ctx->send_channel_ctx->channel);
   channel_flag = Peers_get_channel_flag (&peer_ctx->peer_id, 
Peers_CHANNEL_ROLE_SENDING);
   Peers_set_channel_flag (channel_flag, Peers_CHANNEL_DESTROING);
@@ -3446,7 +3447,8 @@ check_peer_pull_reply (void *cls,
   if (GNUNET_YES != Peers_check_peer_flag (sender, Peers_PULL_REPLY_PENDING))
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,
-        "Received a pull reply from a peer we didn't request one from!\n");
+        "Received a pull reply from a peer (%s) we didn't request one from!\n",
+        GNUNET_i2s (sender));
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }

-- 
To stop receiving notification emails like this one, please contact
address@hidden