diff options
author | Florian Dold <florian.dold@gmail.com> | 2013-06-03 10:53:49 +0000 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2013-06-03 10:53:49 +0000 |
commit | 68403fa780bf94ace2ebc13c2c09463cbbc0b57c (patch) | |
tree | 3442e4f25de90eab67c4f9813cb6e433c50b7482 /src/dv | |
parent | fae7f583f2e11cac15fefcbefef64287ab6915d3 (diff) | |
download | gnunet-68403fa780bf94ace2ebc13c2c09463cbbc0b57c.tar.gz gnunet-68403fa780bf94ace2ebc13c2c09463cbbc0b57c.zip |
- conclude for SET
- consensus with SET
Diffstat (limited to 'src/dv')
-rw-r--r-- | src/dv/gnunet-service-dv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 3b0f0783a..c6ba8eec3 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -1404,7 +1404,6 @@ listen_set_union (void *cls, | |||
1404 | neighbor->my_set = GNUNET_SET_create (cfg, | 1404 | neighbor->my_set = GNUNET_SET_create (cfg, |
1405 | GNUNET_SET_OPERATION_UNION); | 1405 | GNUNET_SET_OPERATION_UNION); |
1406 | neighbor->set_op = GNUNET_SET_accept (request, | 1406 | neighbor->set_op = GNUNET_SET_accept (request, |
1407 | neighbor->my_set /* FIXME: pass later! */, | ||
1408 | GNUNET_SET_RESULT_ADDED, | 1407 | GNUNET_SET_RESULT_ADDED, |
1409 | &handle_set_union_result, | 1408 | &handle_set_union_result, |
1410 | neighbor); | 1409 | neighbor); |
@@ -1428,8 +1427,7 @@ initiate_set_union (void *cls, | |||
1428 | neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK; | 1427 | neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK; |
1429 | neighbor->my_set = GNUNET_SET_create (cfg, | 1428 | neighbor->my_set = GNUNET_SET_create (cfg, |
1430 | GNUNET_SET_OPERATION_UNION); | 1429 | GNUNET_SET_OPERATION_UNION); |
1431 | neighbor->set_op = GNUNET_SET_evaluate (neighbor->my_set /* FIXME: pass later! */, | 1430 | neighbor->set_op = GNUNET_SET_evaluate (&neighbor->peer, |
1432 | &neighbor->peer, | ||
1433 | &neighbor->real_session_id, | 1431 | &neighbor->real_session_id, |
1434 | NULL, | 1432 | NULL, |
1435 | 0 /* FIXME: salt */, | 1433 | 0 /* FIXME: salt */, |