psyc/social docs

diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index d35c68f7e5c0cbbcf76e072a2ab038f1c438ddb8..6f859749832f458f28772968ed89b0b6b1bf8e07 100644 (file)
--- 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,
  * @param is_admitted #GNUNET_YES if joining is approved,
  *        #GNUNET_NO if it is disapproved
  * @param method_name Method name for the message transmitted with the response.
- * @param env Environment: transient variables for the message.
+ * @param env Environment containing transient variables for the message, or NULL.
  * @param data_size Size of @a data.
  * @param data Data of the message.
  */
@@ -330,7 +330,8 @@ struct GNUNET_PSYC_MasterTransmitHandle;
  * @param increment_group_generation #GNUNET_YES if we need to increment
  *        the group generation counter after transmitting this message.
  * @param method_name Which method should be invoked.
- * @param env Environment: state operations and transient variables for the message.
+ * @param env Environment containing state operations and transient variables
+ *            for the message, or NULL.
  * @param notify Function to call to obtain the arguments.
  * @param notify_cls Closure for @a notify.
  * @return Transmission handle, NULL on error (i.e. more than one request queued).
@@ -438,7 +439,7 @@ struct GNUNET_PSYC_SlaveTransmitHandle;
  *
  * @param slave Slave handle.
  * @param method_name Which (PSYC) method should be invoked (on host).
- * @param env Environment: transient variables for the message.
+ * @param env Environment containing transient variables for the message, or NULL.
  * @param notify Function to call when we are allowed to transmit (to get data).
  * @param notify_cls Closure for @a notify.
  * @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 d6f7b0781fcd7577e3943038588d54398a8de1ea..eb5bc049ec20d0414605862eba7775f323680c44 100644 (file)
--- 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,
 struct GNUNET_PSYCSTORE_OperationHandle *
 GNUNET_PSYCSTORE_fragment_get (struct GNUNET_PSYCSTORE_Handle *h,
                                const struct GNUNET_HashCode *channel_id,
-                               uint64_t message_id,
+                               uint64_t fragment_id,
                                GNUNET_PSYCSTORE_FragmentResultCallback rcb,
                                void *rcb_cls);
 

diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index b0409d4b2679ebd737832cbba9abaab933b2c6ce..37b5da43d514baff08198642725bc10937066700 100644 (file)
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -337,6 +337,7 @@ struct GNUNET_SOCIAL_Announcement;
  *
  * @param home Home to address the announcement to.
  * @param method_name Method to use for the announcement.
+ * @param env Environment containing variables for the message, or NULL.
  * @param notify Function to call to get the payload of the announcement.
  * @param notify_cls Closure for @a notify.
  * @return NULL on error (announcement already in progress?).
@@ -394,12 +395,11 @@ GNUNET_SOCIAL_home_destroy (struct GNUNET_SOCIAL_Home *home);
  *
  * @param cfg Configuration to contact the social service.
  * @param ego Owner of the home (host).
- * @param address Address of the place to enter (GADS name, i.e. 'room.friend.gads'),
- *        if the name has the form 'HEX.place', GADS is not
- *        used and HEX is assumed to be the hash of the public
- *        key already; 'HEX.zkey' however would refer to
- *        the 'PLACE' record in the GADS zone with the public key
- *        'HEX'.
+ * @param address GADS name of the place to enter.  Either in the form of
+ *        'room.friend.gads', or 'HEX.zkey'.  This latter case refers to the
+ *        'PLACE' record in the GADS zone with the public key 'HEX', and can be
+ *        used to request entry to a pseudonym's place directly.
+ * @param env Environment containing variables for the message, or NULL.
  * @param msg_size Number of bytes in @a msg.
  * @param msg Message to give to the enter callback.
  * @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,
  * @param crypto_address Public key of the place to enter.
  * @param peer Peer to send request to.
  * @param slicer Slicer to use for processing incoming requests from guests.
+ * @param env Environment containing variables for the message, or NULL.
  * @param msg_size Number of bytes in @a msg.
  * @param msg Message to give to the enter callback.
  * @return NULL on errors, otherwise handle to the place.
@@ -533,6 +534,7 @@ struct GNUNET_SOCIAL_TalkRequest;
  *
  * @param place Place where we want to talk to the host.
  * @param method_name Method to invoke on the host.
+ * @param env Environment containing variables for the message, or NULL.
  * @param notify Function to use to get the payload for the method.
  * @param notify_cls Closure for @a notify.
  * @return NULL if we are already trying to talk to the host,