diff options
-rw-r--r-- | src/include/gnunet_psyc_service.h | 7 | ||||
-rw-r--r-- | src/include/gnunet_psycstore_service.h | 2 | ||||
-rw-r--r-- | src/include/gnunet_social_service.h | 14 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h index d35c68f7e..6f8597498 100644 --- a/src/include/gnunet_psyc_service.h +++ b/src/include/gnunet_psyc_service.h | |||
@@ -226,7 +226,7 @@ typedef int (*GNUNET_PSYC_PartCallback)(void *cls, | |||
226 | * @param is_admitted #GNUNET_YES if joining is approved, | 226 | * @param is_admitted #GNUNET_YES if joining is approved, |
227 | * #GNUNET_NO if it is disapproved | 227 | * #GNUNET_NO if it is disapproved |
228 | * @param method_name Method name for the message transmitted with the response. | 228 | * @param method_name Method name for the message transmitted with the response. |
229 | * @param env Environment: transient variables for the message. | 229 | * @param env Environment containing transient variables for the message, or NULL. |
230 | * @param data_size Size of @a data. | 230 | * @param data_size Size of @a data. |
231 | * @param data Data of the message. | 231 | * @param data Data of the message. |
232 | */ | 232 | */ |
@@ -330,7 +330,8 @@ struct GNUNET_PSYC_MasterTransmitHandle; | |||
330 | * @param increment_group_generation #GNUNET_YES if we need to increment | 330 | * @param increment_group_generation #GNUNET_YES if we need to increment |
331 | * the group generation counter after transmitting this message. | 331 | * the group generation counter after transmitting this message. |
332 | * @param method_name Which method should be invoked. | 332 | * @param method_name Which method should be invoked. |
333 | * @param env Environment: state operations and transient variables for the message. | 333 | * @param env Environment containing state operations and transient variables |
334 | * for the message, or NULL. | ||
334 | * @param notify Function to call to obtain the arguments. | 335 | * @param notify Function to call to obtain the arguments. |
335 | * @param notify_cls Closure for @a notify. | 336 | * @param notify_cls Closure for @a notify. |
336 | * @return Transmission handle, NULL on error (i.e. more than one request queued). | 337 | * @return Transmission handle, NULL on error (i.e. more than one request queued). |
@@ -438,7 +439,7 @@ struct GNUNET_PSYC_SlaveTransmitHandle; | |||
438 | * | 439 | * |
439 | * @param slave Slave handle. | 440 | * @param slave Slave handle. |
440 | * @param method_name Which (PSYC) method should be invoked (on host). | 441 | * @param method_name Which (PSYC) method should be invoked (on host). |
441 | * @param env Environment: transient variables for the message. | 442 | * @param env Environment containing transient variables for the message, or NULL. |
442 | * @param notify Function to call when we are allowed to transmit (to get data). | 443 | * @param notify Function to call when we are allowed to transmit (to get data). |
443 | * @param notify_cls Closure for @a notify. | 444 | * @param notify_cls Closure for @a notify. |
444 | * @return Transmission handle, NULL on error (i.e. more than one request queued). | 445 | * @return Transmission handle, NULL on error (i.e. more than one request queued). |
diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h index d6f7b0781..eb5bc049e 100644 --- a/src/include/gnunet_psycstore_service.h +++ b/src/include/gnunet_psycstore_service.h | |||
@@ -179,7 +179,7 @@ typedef void (*GNUNET_PSYCSTORE_FragmentResultCallback)(void *cls, | |||
179 | struct GNUNET_PSYCSTORE_OperationHandle * | 179 | struct GNUNET_PSYCSTORE_OperationHandle * |
180 | GNUNET_PSYCSTORE_fragment_get (struct GNUNET_PSYCSTORE_Handle *h, | 180 | GNUNET_PSYCSTORE_fragment_get (struct GNUNET_PSYCSTORE_Handle *h, |
181 | const struct GNUNET_HashCode *channel_id, | 181 | const struct GNUNET_HashCode *channel_id, |
182 | uint64_t message_id, | 182 | uint64_t fragment_id, |
183 | GNUNET_PSYCSTORE_FragmentResultCallback rcb, | 183 | GNUNET_PSYCSTORE_FragmentResultCallback rcb, |
184 | void *rcb_cls); | 184 | void *rcb_cls); |
185 | 185 | ||
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h index b0409d4b2..37b5da43d 100644 --- a/src/include/gnunet_social_service.h +++ b/src/include/gnunet_social_service.h | |||
@@ -337,6 +337,7 @@ struct GNUNET_SOCIAL_Announcement; | |||
337 | * | 337 | * |
338 | * @param home Home to address the announcement to. | 338 | * @param home Home to address the announcement to. |
339 | * @param method_name Method to use for the announcement. | 339 | * @param method_name Method to use for the announcement. |
340 | * @param env Environment containing variables for the message, or NULL. | ||
340 | * @param notify Function to call to get the payload of the announcement. | 341 | * @param notify Function to call to get the payload of the announcement. |
341 | * @param notify_cls Closure for @a notify. | 342 | * @param notify_cls Closure for @a notify. |
342 | * @return NULL on error (announcement already in progress?). | 343 | * @return NULL on error (announcement already in progress?). |
@@ -394,12 +395,11 @@ GNUNET_SOCIAL_home_destroy (struct GNUNET_SOCIAL_Home *home); | |||
394 | * | 395 | * |
395 | * @param cfg Configuration to contact the social service. | 396 | * @param cfg Configuration to contact the social service. |
396 | * @param ego Owner of the home (host). | 397 | * @param ego Owner of the home (host). |
397 | * @param address Address of the place to enter (GADS name, i.e. 'room.friend.gads'), | 398 | * @param address GADS name of the place to enter. Either in the form of |
398 | * if the name has the form 'HEX.place', GADS is not | 399 | * 'room.friend.gads', or 'HEX.zkey'. This latter case refers to the |
399 | * used and HEX is assumed to be the hash of the public | 400 | * 'PLACE' record in the GADS zone with the public key 'HEX', and can be |
400 | * key already; 'HEX.zkey' however would refer to | 401 | * used to request entry to a pseudonym's place directly. |
401 | * the 'PLACE' record in the GADS zone with the public key | 402 | * @param env Environment containing variables for the message, or NULL. |
402 | * 'HEX'. | ||
403 | * @param msg_size Number of bytes in @a msg. | 403 | * @param msg_size Number of bytes in @a msg. |
404 | * @param msg Message to give to the enter callback. | 404 | * @param msg Message to give to the enter callback. |
405 | * @param slicer Slicer to use for processing incoming requests from guests. | 405 | * @param slicer Slicer to use for processing incoming requests from guests. |
@@ -422,6 +422,7 @@ GNUNET_SOCIAL_place_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
422 | * @param crypto_address Public key of the place to enter. | 422 | * @param crypto_address Public key of the place to enter. |
423 | * @param peer Peer to send request to. | 423 | * @param peer Peer to send request to. |
424 | * @param slicer Slicer to use for processing incoming requests from guests. | 424 | * @param slicer Slicer to use for processing incoming requests from guests. |
425 | * @param env Environment containing variables for the message, or NULL. | ||
425 | * @param msg_size Number of bytes in @a msg. | 426 | * @param msg_size Number of bytes in @a msg. |
426 | * @param msg Message to give to the enter callback. | 427 | * @param msg Message to give to the enter callback. |
427 | * @return NULL on errors, otherwise handle to the place. | 428 | * @return NULL on errors, otherwise handle to the place. |
@@ -533,6 +534,7 @@ struct GNUNET_SOCIAL_TalkRequest; | |||
533 | * | 534 | * |
534 | * @param place Place where we want to talk to the host. | 535 | * @param place Place where we want to talk to the host. |
535 | * @param method_name Method to invoke on the host. | 536 | * @param method_name Method to invoke on the host. |
537 | * @param env Environment containing variables for the message, or NULL. | ||
536 | * @param notify Function to use to get the payload for the method. | 538 | * @param notify Function to use to get the payload for the method. |
537 | * @param notify_cls Closure for @a notify. | 539 | * @param notify_cls Closure for @a notify. |
538 | * @return NULL if we are already trying to talk to the host, | 540 | * @return NULL if we are already trying to talk to the host, |