[GNUnet-SVN] [gnunet] branch master updated (b00ea4c4a -> 75ac7abc6)

[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 b00ea4c4a Merge branch 'master' of gnunet.org:gnunet
     new da41f8e25 RPS: Track expected number of pushes w. statistics
     new 75ac7abc6 RPS: Do not consider unexpected pull replies as protocol 
violation

The 2 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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 098c71f93..63b530e85 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -3633,8 +3633,6 @@ check_peer_pull_reply (void *cls,
                                 1,
                                 GNUNET_NO);
     }
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
   }
   return GNUNET_OK;
 }
@@ -4404,6 +4402,10 @@ do_round (void *cls)
         "# peers in view at end of round",
         View_size (sub->view),
         GNUNET_NO);
+    GNUNET_STATISTICS_set (stats,
+        "# expected pushes",
+        alpha * sub->view_size_est_need,
+        GNUNET_NO);
   }
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,

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