[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36889 - in gnunet/src: include social
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36889 - in gnunet/src: include social |
Date: |
Mon, 1 Feb 2016 15:59:23 +0100 |
Author: tg
Date: 2016-02-01 15:59:22 +0100 (Mon, 01 Feb 2016)
New Revision: 36889
Modified:
gnunet/src/include/gnunet_psyc_message.h
gnunet/src/include/gnunet_social_service.h
gnunet/src/social/gnunet-service-social.c
gnunet/src/social/social_api.c
gnunet/src/social/test_social.c
Log:
social: api, doc
Modified: gnunet/src/include/gnunet_psyc_message.h
===================================================================
--- gnunet/src/include/gnunet_psyc_message.h 2016-01-31 16:49:21 UTC (rev
36888)
+++ gnunet/src/include/gnunet_psyc_message.h 2016-02-01 14:59:22 UTC (rev
36889)
@@ -208,8 +208,10 @@
/**
* Handle incoming PSYC message.
*
- * @param recv Receive handle.
- * @param msg The message.
+ * @param recv
+ * Receive handle.
+ * @param msg
+ * The message.
*
* @return #GNUNET_OK on success,
* #GNUNET_SYSERR on receive error.
@@ -222,10 +224,14 @@
/**
* Check if @a data contains a series of valid message parts.
*
- * @param data_size Size of @a data.
- * @param data Data.
- * @param[out] first_ptype Type of first message part.
- * @param[out] last_ptype Type of last message part.
+ * @param data_size
+ * Size of @a data.
+ * @param data
+ * Data.
+ * @param[out] first_ptype
+ * Type of first message part.
+ * @param[out] last_ptype
+ * Type of last message part.
*
* @return Number of message parts found in @a data.
* or GNUNET_SYSERR if the message contains invalid parts.
Modified: gnunet/src/include/gnunet_social_service.h
===================================================================
--- gnunet/src/include/gnunet_social_service.h 2016-01-31 16:49:21 UTC (rev
36888)
+++ gnunet/src/include/gnunet_social_service.h 2016-02-01 14:59:22 UTC (rev
36889)
@@ -457,13 +457,20 @@
* reference remains valid until the #GNUNET_SOCIAL_FarewellCallback is invoked
* for it.
*
- * @param cls Closure.
- * @param nym Handle for the user who wants to enter.
- * @param method_name Method name in the entry request.
- * @param variable_count Number of elements in the @a variables array.
- * @param variables Variables present in the message.
- * @param data_size Number of bytes in @a data.
- * @param data Payload given on enter (e.g. a password).
+ * @param cls
+ * Closure.
+ * @param nym
+ * Handle for the user who wants to enter.
+ * @param method_name
+ * Method name in the entry request.
+ * @param variable_count
+ * Number of elements in the @a variables array.
+ * @param variables
+ * Variables present in the message.
+ * @param data
+ * Payload given on enter (e.g. a password).
+ * @param data_size
+ * Number of bytes in @a data.
*/
typedef void
(*GNUNET_SOCIAL_AnswerDoorCallback) (void *cls,
@@ -470,8 +477,8 @@
struct GNUNET_SOCIAL_Nym *nym,
const char *method_name,
struct GNUNET_PSYC_Environment *env,
- size_t data_size,
- const void *data);
+ const void *data,
+ size_t data_size);
/**
@@ -589,14 +596,8 @@
* #GNUNET_YES if @a nym is admitted,
* #GNUNET_NO if @a nym is refused entry,
* #GNUNET_SYSERR if we cannot answer the request.
- * @param method_name
- * Method name for the rejection message.
- * @param env
- * Environment containing variables for the message, or NULL.
- * @param data
- * Data for the rejection message to send back.
- * @param data_size
- * Number of bytes in @a data for method.
+ * @param entry_resp
+ * Entry response message, or NULL.
* @return #GNUNET_OK on success,
* #GNUNET_SYSERR if the message is too large.
*/
@@ -860,14 +861,8 @@
* Number of elements in the @a relays array.
* @param relays
* Relays for the underlying multicast group.
- * @param method_name
- * Method name for the message.
- * @param env
- * Environment containing variables for the message, or NULL.
- * @param data
- * Payload for the message to give to the enter callback.
- * @param data_size
- * Number of bytes in @a data.
+ * @param entry_msg
+ * Entry message.
* @param slicer
* Slicer to use for processing incoming requests from guests.
*
@@ -1190,8 +1185,6 @@
* The place to look the object at.
* @param full_name
* Full name of the object.
- * @param value_size
- * Set to the size of the returned value.
*
* @return NULL if there is no such object at this place.
*/
Modified: gnunet/src/social/gnunet-service-social.c
===================================================================
--- gnunet/src/social/gnunet-service-social.c 2016-01-31 16:49:21 UTC (rev
36888)
+++ gnunet/src/social/gnunet-service-social.c 2016-02-01 14:59:22 UTC (rev
36889)
@@ -3375,6 +3375,8 @@
GNUNET_CONTAINER_multihashmap_put (egos, &ego_pub_hash, ego,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
}
+
+ // FIXME: notify clients about changed ego
}
Modified: gnunet/src/social/social_api.c
===================================================================
--- gnunet/src/social/social_api.c 2016-01-31 16:49:21 UTC (rev 36888)
+++ gnunet/src/social/social_api.c 2016-02-01 14:59:22 UTC (rev 36889)
@@ -848,7 +848,7 @@
struct GNUNET_SOCIAL_Nym *nym = nym_get_or_create (&req->slave_pub_key);
hst->answer_door_cb (hst->cb_cls, nym, method_name, env,
- data_size, data);
+ data, data_size);
} while (0);
if (NULL != env)
Modified: gnunet/src/social/test_social.c
===================================================================
--- gnunet/src/social/test_social.c 2016-01-31 16:49:21 UTC (rev 36888)
+++ gnunet/src/social/test_social.c 2016-02-01 14:59:22 UTC (rev 36889)
@@ -156,8 +156,8 @@
struct GNUNET_SOCIAL_Nym *nym,
const char *method_name,
struct GNUNET_PSYC_Environment *env,
- size_t data_size,
- const void *data);
+ const void *data,
+ size_t data_size);
static void
host_enter ();
@@ -1063,8 +1063,8 @@
struct GNUNET_SOCIAL_Nym *nym,
const char *method_name,
struct GNUNET_PSYC_Environment *env,
- size_t data_size,
- const void *data)
+ const void *data,
+ size_t data_size)
{
join_req_count++;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36889 - in gnunet/src: include social,
gnunet <=