Merge branch 'master' of gnunet.org:gnunet

diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 098c71f93188e6c90283315fd150779ab1b09fce..63b530e85bce92333a7a5f6591a9fd2787f516e1 100644 (file)
--- 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,