diff options
author | ng0 <ng0@n0.is> | 2019-02-26 11:40:57 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-02-26 11:40:57 +0000 |
commit | 347064f146ce7e1a5e31bc77b7e822447e36910c (patch) | |
tree | 31f16eb861794a1adc52788f6a2d5367b57320e4 | |
parent | cefc5aa4939fc0946d2ba6349db6631fd9c791ed (diff) | |
parent | 75ac7abc6b640a824bc923ae7444a6e788d40adb (diff) | |
download | gnunet-347064f146ce7e1a5e31bc77b7e822447e36910c.tar.gz gnunet-347064f146ce7e1a5e31bc77b7e822447e36910c.zip |
Merge branch 'master' of gnunet.org:gnunet
-rw-r--r-- | src/rps/gnunet-service-rps.c | 6 |
1 files 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, | |||
3633 | 1, | 3633 | 1, |
3634 | GNUNET_NO); | 3634 | GNUNET_NO); |
3635 | } | 3635 | } |
3636 | GNUNET_break_op (0); | ||
3637 | return GNUNET_SYSERR; | ||
3638 | } | 3636 | } |
3639 | return GNUNET_OK; | 3637 | return GNUNET_OK; |
3640 | } | 3638 | } |
@@ -4404,6 +4402,10 @@ do_round (void *cls) | |||
4404 | "# peers in view at end of round", | 4402 | "# peers in view at end of round", |
4405 | View_size (sub->view), | 4403 | View_size (sub->view), |
4406 | GNUNET_NO); | 4404 | GNUNET_NO); |
4405 | GNUNET_STATISTICS_set (stats, | ||
4406 | "# expected pushes", | ||
4407 | alpha * sub->view_size_est_need, | ||
4408 | GNUNET_NO); | ||
4407 | } | 4409 | } |
4408 | 4410 | ||
4409 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 4411 | LOG (GNUNET_ERROR_TYPE_DEBUG, |