diff options
Diffstat (limited to 'src/include/gnunet_social_service.h')
-rw-r--r-- | src/include/gnunet_social_service.h | 55 |
1 files changed, 22 insertions, 33 deletions
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h index 24aa871ed..62f6ab7c7 100644 --- a/src/include/gnunet_social_service.h +++ b/src/include/gnunet_social_service.h | |||
@@ -339,17 +339,15 @@ typedef void | |||
339 | * This is also called if the @a nym was never given permission to enter | 339 | * This is also called if the @a nym was never given permission to enter |
340 | * (i.e. the @a nym stopped asking to get in). | 340 | * (i.e. the @a nym stopped asking to get in). |
341 | * | 341 | * |
342 | * @param cls Closure. | 342 | * @param cls |
343 | * @param nym Handle for the user who left. | 343 | * Closure. |
344 | * @param variable_count Number of elements in the @a variables array. | 344 | * @param nym |
345 | * @param variables Variables present in the message. | 345 | * Handle for the user who left. |
346 | */ | 346 | */ |
347 | typedef void | 347 | typedef void |
348 | (*GNUNET_SOCIAL_FarewellCallback) (void *cls, | 348 | (*GNUNET_SOCIAL_FarewellCallback) (void *cls, |
349 | struct GNUNET_SOCIAL_Nym *nym, | 349 | const struct GNUNET_SOCIAL_Nym *nym, |
350 | struct GNUNET_ENV_Environment *env, | 350 | struct GNUNET_ENV_Environment *env); |
351 | size_t variable_count, | ||
352 | struct GNUNET_ENV_Modifier *variables); | ||
353 | 351 | ||
354 | 352 | ||
355 | /** | 353 | /** |
@@ -443,12 +441,14 @@ GNUNET_SOCIAL_host_entry_decision (struct GNUNET_SOCIAL_Host *hst, | |||
443 | * #GNUNET_SOCIAL_FarewellCallback is invoked, | 441 | * #GNUNET_SOCIAL_FarewellCallback is invoked, |
444 | * which should be very soon after this call. | 442 | * which should be very soon after this call. |
445 | * | 443 | * |
446 | * @param host Host of the place. | 444 | * @param host |
447 | * @param nym Handle for the entity to be ejected. | 445 | * Host of the place. |
446 | * @param nym | ||
447 | * Handle for the entity to be ejected. | ||
448 | */ | 448 | */ |
449 | void | 449 | void |
450 | GNUNET_SOCIAL_host_eject (struct GNUNET_SOCIAL_Host *host, | 450 | GNUNET_SOCIAL_host_eject (struct GNUNET_SOCIAL_Host *host, |
451 | struct GNUNET_SOCIAL_Nym *nym); | 451 | const struct GNUNET_SOCIAL_Nym *nym); |
452 | 452 | ||
453 | 453 | ||
454 | /** | 454 | /** |
@@ -461,21 +461,8 @@ GNUNET_SOCIAL_host_eject (struct GNUNET_SOCIAL_Host *host, | |||
461 | * | 461 | * |
462 | * @return Public key of nym; | 462 | * @return Public key of nym; |
463 | */ | 463 | */ |
464 | struct GNUNET_CRYPTO_EcdsaPublicKey * | 464 | const struct GNUNET_CRYPTO_EcdsaPublicKey * |
465 | GNUNET_SOCIAL_nym_get_key (struct GNUNET_SOCIAL_Nym *nym); | 465 | GNUNET_SOCIAL_nym_get_key (const struct GNUNET_SOCIAL_Nym *nym); |
466 | |||
467 | |||
468 | /** | ||
469 | * Obtain the private-public key pair of the host. | ||
470 | * | ||
471 | * @param host Host to get the key of. | ||
472 | * @param[out] host_key Set to the private-public key pair of the host. The | ||
473 | * public part is suitable for storing in GNS within a "PLACE" | ||
474 | * record, along with peer IDs to join at. | ||
475 | */ | ||
476 | void | ||
477 | GNUNET_SOCIAL_host_get_key (struct GNUNET_SOCIAL_Host *host, | ||
478 | struct GNUNET_CRYPTO_EddsaPrivateKey *host_key); | ||
479 | 466 | ||
480 | 467 | ||
481 | /** | 468 | /** |
@@ -782,23 +769,25 @@ GNUNET_SOCIAL_guest_talk_cancel (struct GNUNET_SOCIAL_TalkRequest *tr); | |||
782 | 769 | ||
783 | 770 | ||
784 | /** | 771 | /** |
785 | * Leave a place permanently. | 772 | * Leave a place temporarily or permanently. |
786 | * | 773 | * |
787 | * Notifies the owner of the place about leaving, and destroys the place handle. | 774 | * Notifies the owner of the place about leaving, and destroys the place handle. |
788 | * | 775 | * |
789 | * @param place | 776 | * @param place |
790 | * Place to leave permanently. | 777 | * Place to leave. |
791 | * @param keep_active | 778 | * @param keep_active |
792 | * Keep place active after last application disconnected. | 779 | * Keep place active after last application disconnected. |
780 | * #GNUNET_YES or #GNUNET_NO | ||
781 | * @param env | ||
782 | * Optional environment for the leave message if @a keep_active | ||
783 | * is #GNUNET_NO. NULL if not needed. | ||
793 | * @param leave_cb | 784 | * @param leave_cb |
794 | * Function called after the guest left the place | 785 | * Called upon disconnecting from the social service. |
795 | * and disconnected from the social service. | ||
796 | * @param leave_cls | ||
797 | * Closure for @a leave_cb. | ||
798 | */ | 786 | */ |
799 | void | 787 | void |
800 | GNUNET_SOCIAL_guest_leave (struct GNUNET_SOCIAL_Guest *guest, | 788 | GNUNET_SOCIAL_guest_leave (struct GNUNET_SOCIAL_Guest *gst, |
801 | int keep_active, | 789 | int keep_active, |
790 | struct GNUNET_ENV_Environment *env, | ||
802 | GNUNET_ContinuationCallback leave_cb, | 791 | GNUNET_ContinuationCallback leave_cb, |
803 | void *leave_cls); | 792 | void *leave_cls); |
804 | 793 | ||