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/include/gnunet_set_service.h | |
parent | fae7f583f2e11cac15fefcbefef64287ab6915d3 (diff) | |
download | gnunet-68403fa780bf94ace2ebc13c2c09463cbbc0b57c.tar.gz gnunet-68403fa780bf94ace2ebc13c2c09463cbbc0b57c.zip |
- conclude for SET
- consensus with SET
Diffstat (limited to 'src/include/gnunet_set_service.h')
-rw-r--r-- | src/include/gnunet_set_service.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h index ce413c0de..2684df00a 100644 --- a/src/include/gnunet_set_service.h +++ b/src/include/gnunet_set_service.h | |||
@@ -257,11 +257,10 @@ GNUNET_SET_destroy (struct GNUNET_SET_Handle *set); | |||
257 | 257 | ||
258 | 258 | ||
259 | /** | 259 | /** |
260 | * Evaluate a set operation with our set and the set of another peer. | 260 | * Create a set operation for evaluation with another peer. |
261 | * The evaluation will not start until the client provides | ||
262 | * a local set with GNUNET_SET_conclude. | ||
261 | * | 263 | * |
262 | * @param set set to use -- FIXME: remove | ||
263 | * this argument, use GNUNET_SET_conclude instead! | ||
264 | * @param salt salt for HKDF (explain more here) | ||
265 | * @param other_peer peer with the other set | 264 | * @param other_peer peer with the other set |
266 | * @param app_id hash for the application using the set | 265 | * @param app_id hash for the application using the set |
267 | * @param context_msg additional information for the request | 266 | * @param context_msg additional information for the request |
@@ -275,8 +274,7 @@ GNUNET_SET_destroy (struct GNUNET_SET_Handle *set); | |||
275 | * @return a handle to cancel the operation | 274 | * @return a handle to cancel the operation |
276 | */ | 275 | */ |
277 | struct GNUNET_SET_OperationHandle * | 276 | struct GNUNET_SET_OperationHandle * |
278 | GNUNET_SET_evaluate (struct GNUNET_SET_Handle *set, | 277 | GNUNET_SET_evaluate (const struct GNUNET_PeerIdentity *other_peer, |
279 | const struct GNUNET_PeerIdentity *other_peer, | ||
280 | const struct GNUNET_HashCode *app_id, | 278 | const struct GNUNET_HashCode *app_id, |
281 | const struct GNUNET_MessageHeader *context_msg, | 279 | const struct GNUNET_MessageHeader *context_msg, |
282 | uint16_t salt, | 280 | uint16_t salt, |
@@ -315,13 +313,13 @@ GNUNET_SET_listen_cancel (struct GNUNET_SET_ListenHandle *lh); | |||
315 | 313 | ||
316 | 314 | ||
317 | /** | 315 | /** |
318 | * Accept a request we got via GNUNET_SET_listen. Must be called | 316 | * Accept a request we got via GNUNET_SET_listen. Must be called during |
319 | * during GNUNET_SET_listen, as the 'struct GNUNET_SET_Request' | 317 | * GNUNET_SET_listen, as the 'struct GNUNET_SET_Request' becomes invalid |
320 | * becomes invalid afterwards. | 318 | * afterwards. |
319 | * Call GNUNET_SET_conclude to provide the local set to use for the operation, | ||
320 | * and to begin the exchange with the remote peer. | ||
321 | * | 321 | * |
322 | * @param request request to accept | 322 | * @param request request to accept |
323 | * @param set set used for the requested operation -- FIXME: remove | ||
324 | * this argument, use GNUNET_SET_conclude instead! | ||
325 | * @param result_mode specified how results will be returned, | 323 | * @param result_mode specified how results will be returned, |
326 | * see 'GNUNET_SET_ResultMode'. | 324 | * see 'GNUNET_SET_ResultMode'. |
327 | * @param result_cb callback for the results | 325 | * @param result_cb callback for the results |
@@ -330,7 +328,6 @@ GNUNET_SET_listen_cancel (struct GNUNET_SET_ListenHandle *lh); | |||
330 | */ | 328 | */ |
331 | struct GNUNET_SET_OperationHandle * | 329 | struct GNUNET_SET_OperationHandle * |
332 | GNUNET_SET_accept (struct GNUNET_SET_Request *request, | 330 | GNUNET_SET_accept (struct GNUNET_SET_Request *request, |
333 | struct GNUNET_SET_Handle *set, | ||
334 | enum GNUNET_SET_ResultMode result_mode, | 331 | enum GNUNET_SET_ResultMode result_mode, |
335 | GNUNET_SET_ResultIterator result_cb, | 332 | GNUNET_SET_ResultIterator result_cb, |
336 | void *cls); | 333 | void *cls); |
@@ -353,9 +350,9 @@ GNUNET_SET_conclude (struct GNUNET_SET_OperationHandle *oh, | |||
353 | 350 | ||
354 | 351 | ||
355 | /** | 352 | /** |
356 | * Cancel the given set operation. FIXME: do clients have | 353 | * Cancel the given set operation. |
357 | * to cancel the operatino if the GNUNET_SET_ResultIterator | 354 | * May not be called after the operation's GNUNET_SET_ResultIterator has been |
358 | * has been called with timeout/error/done? | 355 | * called with a status that indicates error, timeout or done. |
359 | * | 356 | * |
360 | * @param oh set operation to cancel | 357 | * @param oh set operation to cancel |
361 | */ | 358 | */ |