diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_social_service.h | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h index 47673ad15..c16765462 100644 --- a/src/include/gnunet_social_service.h +++ b/src/include/gnunet_social_service.h | |||
@@ -159,6 +159,7 @@ GNUNET_SOCIAL_slicer_destroy (struct GNUNET_SOCIAL_Slicer *slicer); | |||
159 | * | 159 | * |
160 | * @param cls Closure. | 160 | * @param cls Closure. |
161 | * @param nym Handle for the user who wants to enter. | 161 | * @param nym Handle for the user who wants to enter. |
162 | * @param method_name Method name in the entry request. | ||
162 | * @param variable_count Number of elements in the @a variables array. | 163 | * @param variable_count Number of elements in the @a variables array. |
163 | * @param variables Variables present in the message. | 164 | * @param variables Variables present in the message. |
164 | * @param data_size Number of bytes in @a data. | 165 | * @param data_size Number of bytes in @a data. |
@@ -167,6 +168,7 @@ GNUNET_SOCIAL_slicer_destroy (struct GNUNET_SOCIAL_Slicer *slicer); | |||
167 | typedef void (*GNUNET_SOCIAL_AnswerDoorCallback)(void *cls, | 168 | typedef void (*GNUNET_SOCIAL_AnswerDoorCallback)(void *cls, |
168 | struct GNUNET_SOCIAL_Nym *nym, | 169 | struct GNUNET_SOCIAL_Nym *nym, |
169 | size_t variable_count, | 170 | size_t variable_count, |
171 | const char *method_name, | ||
170 | GNUNET_PSYC_Modifier *variables, | 172 | GNUNET_PSYC_Modifier *variables, |
171 | size_t data_size, | 173 | size_t data_size, |
172 | const void *data); | 174 | const void *data); |
@@ -408,6 +410,7 @@ GNUNET_SOCIAL_home_leave (struct GNUNET_SOCIAL_Home *home); | |||
408 | * the 'PLACE' record of the empty label ("+") in the GADS zone with the | 410 | * the 'PLACE' record of the empty label ("+") in the GADS zone with the |
409 | * nym's public key 'NYMPUBKEY', and can be used to request entry to a | 411 | * nym's public key 'NYMPUBKEY', and can be used to request entry to a |
410 | * pseudonym's place directly. | 412 | * pseudonym's place directly. |
413 | * @param method_name Method name for the message. | ||
411 | * @param env Environment containing variables for the message, or NULL. | 414 | * @param env Environment containing variables for the message, or NULL. |
412 | * @param data_size Number of bytes in @a data. | 415 | * @param data_size Number of bytes in @a data. |
413 | * @param data Payload for the message to give to the enter callback. | 416 | * @param data Payload for the message to give to the enter callback. |
@@ -418,6 +421,7 @@ struct GNUNET_SOCIAL_Place * | |||
418 | GNUNET_SOCIAL_place_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, | 421 | GNUNET_SOCIAL_place_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, |
419 | struct GNUNET_IDENTITY_Ego *ego, | 422 | struct GNUNET_IDENTITY_Ego *ego, |
420 | char *address, | 423 | char *address, |
424 | const char *method_name, | ||
421 | const struct GNUNET_ENV_Environment *env, | 425 | const struct GNUNET_ENV_Environment *env, |
422 | size_t data_size, | 426 | size_t data_size, |
423 | const void *data, | 427 | const void *data, |
@@ -429,22 +433,29 @@ GNUNET_SOCIAL_place_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
429 | * @param cfg Configuration to contact the social service. | 433 | * @param cfg Configuration to contact the social service. |
430 | * @param ego Owner of the home (host). | 434 | * @param ego Owner of the home (host). |
431 | * @param crypto_address Public key of the place to enter. | 435 | * @param crypto_address Public key of the place to enter. |
432 | * @param peer Peer to send request to. | 436 | * @param origin Peer identity of the origin of the underlying multicast group. |
433 | * @param slicer Slicer to use for processing incoming requests from guests. | 437 | * @param relay_count Number of elements in the @a relays array. |
438 | * @param relays Relays for the underlying multicast group. | ||
439 | * @param method_name Method name for the message. | ||
434 | * @param env Environment containing variables for the message, or NULL. | 440 | * @param env Environment containing variables for the message, or NULL. |
435 | * @param data_size Number of bytes in @a data. | 441 | * @param data_size Number of bytes in @a data. |
436 | * @param data Payload for the message to give to the enter callback. | 442 | * @param data Payload for the message to give to the enter callback. |
443 | * @param slicer Slicer to use for processing incoming requests from guests. | ||
437 | * @return NULL on errors, otherwise handle to the place. | 444 | * @return NULL on errors, otherwise handle to the place. |
438 | */ | 445 | */ |
439 | struct GNUNET_SOCIAL_Place * | 446 | struct GNUNET_SOCIAL_Place * |
440 | GNUNET_SOCIAL_place_enter2 (const struct GNUNET_CONFIGURATION_Handle *cfg, | 447 | GNUNET_SOCIAL_place_enter2 (const struct GNUNET_CONFIGURATION_Handle *cfg, |
441 | struct GNUNET_IDENTITY_Ego *ego, | 448 | struct GNUNET_IDENTITY_Ego *ego, |
442 | struct GNUNET_CRYPTO_EccPublicKey *crypto_address, | 449 | struct GNUNET_CRYPTO_EccPublicKey *crypto_address, |
443 | struct GNUNET_PeerIdentity *peer, | 450 | struct GNUNET_PeerIdentity *origin, |
444 | struct GNUNET_SOCIAL_Slicer *slicer, | 451 | size_t count_relays, |
445 | const struct GNUNET_ENV_Environment *env, | 452 | struct GNUNET_PeerIdentity *relays, |
446 | size_t data_size, | 453 | const char *method_name, |
447 | const void *data); | 454 | const struct GNUNET_ENV_Environment *env, |
455 | size_t data_size, | ||
456 | const void *data, | ||
457 | struct GNUNET_SOCIAL_Slicer *slicer, | ||
458 | ); | ||
448 | 459 | ||
449 | 460 | ||
450 | struct GNUNET_SOCIAL_WatchHandle; | 461 | struct GNUNET_SOCIAL_WatchHandle; |