diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-11-27 09:50:41 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-11-27 09:50:41 +0000 |
commit | 44bb721ef043f99e97d60231438b9e71104d99d7 (patch) | |
tree | 476330cbfe2031fa3e3daecf8bf3c45a5156b800 /src/include/gnunet_set_service.h | |
parent | bf716069e987193e1ee0d06bbc4af245e6ffa821 (diff) | |
download | gnunet-44bb721ef043f99e97d60231438b9e71104d99d7.tar.gz gnunet-44bb721ef043f99e97d60231438b9e71104d99d7.zip |
eliminating useless salt argument, salt can be generated inside of gnunet-service-set
Diffstat (limited to 'src/include/gnunet_set_service.h')
-rw-r--r-- | src/include/gnunet_set_service.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h index 071b5a987..1ff8d85d5 100644 --- a/src/include/gnunet_set_service.h +++ b/src/include/gnunet_set_service.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | (C) 2013 Christian Grothoff (and other contributing authors) | 3 | (C) 2013, 2014 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -296,9 +296,6 @@ GNUNET_SET_destroy (struct GNUNET_SET_Handle *set); | |||
296 | * @param other_peer peer with the other set | 296 | * @param other_peer peer with the other set |
297 | * @param app_id hash for the application using the set | 297 | * @param app_id hash for the application using the set |
298 | * @param context_msg additional information for the request | 298 | * @param context_msg additional information for the request |
299 | * @param salt salt used for the set operation; sometimes set operations | ||
300 | * fail due to hash collisions, using a different salt for each operation | ||
301 | * makes it harder for an attacker to exploit this | ||
302 | * @param result_mode specified how results will be returned, | 299 | * @param result_mode specified how results will be returned, |
303 | * see `enum GNUNET_SET_ResultMode`. | 300 | * see `enum GNUNET_SET_ResultMode`. |
304 | * @param result_cb called on error or success | 301 | * @param result_cb called on error or success |
@@ -309,7 +306,6 @@ struct GNUNET_SET_OperationHandle * | |||
309 | GNUNET_SET_prepare (const struct GNUNET_PeerIdentity *other_peer, | 306 | GNUNET_SET_prepare (const struct GNUNET_PeerIdentity *other_peer, |
310 | const struct GNUNET_HashCode *app_id, | 307 | const struct GNUNET_HashCode *app_id, |
311 | const struct GNUNET_MessageHeader *context_msg, | 308 | const struct GNUNET_MessageHeader *context_msg, |
312 | uint16_t salt, | ||
313 | enum GNUNET_SET_ResultMode result_mode, | 309 | enum GNUNET_SET_ResultMode result_mode, |
314 | GNUNET_SET_ResultIterator result_cb, | 310 | GNUNET_SET_ResultIterator result_cb, |
315 | void *result_cls); | 311 | void *result_cls); |
@@ -326,7 +322,7 @@ GNUNET_SET_prepare (const struct GNUNET_PeerIdentity *other_peer, | |||
326 | * @param app_id id of the application that handles set operation requests | 322 | * @param app_id id of the application that handles set operation requests |
327 | * @param listen_cb called for each incoming request matching the operation | 323 | * @param listen_cb called for each incoming request matching the operation |
328 | * and application id | 324 | * and application id |
329 | * @param listen_cls handle for listen_cb | 325 | * @param listen_cls handle for @a listen_cb |
330 | * @return a handle that can be used to cancel the listen operation | 326 | * @return a handle that can be used to cancel the listen operation |
331 | */ | 327 | */ |
332 | struct GNUNET_SET_ListenHandle * | 328 | struct GNUNET_SET_ListenHandle * |
@@ -389,7 +385,7 @@ GNUNET_SET_commit (struct GNUNET_SET_OperationHandle *oh, | |||
389 | 385 | ||
390 | /** | 386 | /** |
391 | * Cancel the given set operation. | 387 | * Cancel the given set operation. |
392 | * May not be called after the operation's GNUNET_SET_ResultIterator has been | 388 | * May not be called after the operation's `GNUNET_SET_ResultIterator` has been |
393 | * called with a status that indicates error, timeout or done. | 389 | * called with a status that indicates error, timeout or done. |
394 | * | 390 | * |
395 | * @param oh set operation to cancel | 391 | * @param oh set operation to cancel |
@@ -406,12 +402,14 @@ GNUNET_SET_operation_cancel (struct GNUNET_SET_OperationHandle *oh); | |||
406 | * | 402 | * |
407 | * @param set the set to iterate over | 403 | * @param set the set to iterate over |
408 | * @param iter the iterator to call for each element | 404 | * @param iter the iterator to call for each element |
409 | * @param cls closure for 'iter' | 405 | * @param iter_cls closure for @a iter |
410 | * @return GNUNET_YES if the iteration started successfuly, | 406 | * @return #GNUNET_YES if the iteration started successfuly, |
411 | * GNUNET_SYSERR if the set is invalid (e.g. the server crashed, disconnected) | 407 | * #GNUNET_SYSERR if the set is invalid (e.g. the server crashed, disconnected) |
412 | */ | 408 | */ |
413 | int | 409 | int |
414 | GNUNET_SET_iterate (struct GNUNET_SET_Handle *set, GNUNET_SET_ElementIterator iter, void *cls); | 410 | GNUNET_SET_iterate (struct GNUNET_SET_Handle *set, |
411 | GNUNET_SET_ElementIterator iter, | ||
412 | void *iter_cls); | ||
415 | 413 | ||
416 | 414 | ||
417 | #if 0 /* keep Emacsens' auto-indent happy */ | 415 | #if 0 /* keep Emacsens' auto-indent happy */ |