[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28548 - gnunet/src/include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28548 - gnunet/src/include |
Date: |
Mon, 12 Aug 2013 23:04:24 +0200 |
Author: tg
Date: 2013-08-12 23:04:24 +0200 (Mon, 12 Aug 2013)
New Revision: 28548
Modified:
gnunet/src/include/gnunet_psyc_service.h
gnunet/src/include/gnunet_social_service.h
Log:
psyc/social: slave transmit & guest talk flags
Modified: gnunet/src/include/gnunet_psyc_service.h
===================================================================
--- gnunet/src/include/gnunet_psyc_service.h 2013-08-12 19:28:20 UTC (rev
28547)
+++ gnunet/src/include/gnunet_psyc_service.h 2013-08-12 21:04:24 UTC (rev
28548)
@@ -437,6 +437,11 @@
char *data);
+/**
+ * Flags for transmitting messages to the channel master by a slave.
+ */
+enum GNUNET_PSYC_SlaveTransmitFlags;
+
/**
* Handle for a pending PSYC transmission operation.
*/
@@ -451,6 +456,7 @@
* @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.
+ * @param flags Flags for the message being transmitted.
* @return Transmission handle, NULL on error (i.e. more than one request
queued).
*/
struct GNUNET_PSYC_SlaveTransmitHandle *
@@ -458,7 +464,8 @@
const char *method_name,
const struct GNUNET_ENV_Environment *env,
GNUNET_PSYC_SlaveReadyNotify notify,
- void *notify_cls);
+ void *notify_cls,
+ enum GNUNET_PSYC_SlaveTransmitFlags flags);
/**
Modified: gnunet/src/include/gnunet_social_service.h
===================================================================
--- gnunet/src/include/gnunet_social_service.h 2013-08-12 19:28:20 UTC (rev
28547)
+++ gnunet/src/include/gnunet_social_service.h 2013-08-12 21:04:24 UTC (rev
28548)
@@ -84,8 +84,8 @@
* @param message_id Unique message counter for this message
* (unique only in combination with the given sender for
* this channel).
- * @param header_length Number of modifiers in header.
- * @param header Modifiers present in the message. FIXME: use environment
instead?
+ * @param modifier_count Number of elements in the @a modifiers array.
+ * @param modifiers Modifiers present in the message. FIXME: use environment
instead?
* @param data_offset Byte offset of @a data in the overall data of the method.
* @param data_size Number of bytes in @a data.
* @param data Data stream given to the method (might not be zero-terminated
@@ -95,8 +95,8 @@
typedef int (*GNUNET_SOCIAL_Method)(void *cls,
const char *full_method_name,
uint64_t message_id,
- size_t header_length,
- GNUNET_PSYC_Modifier *header,
+ size_t modifier_count,
+ GNUNET_PSYC_Modifier *modifiers,
uint64_t data_offset,
size_t data_size,
const void *data,
@@ -187,15 +187,15 @@
*
* @param cls Closure.
* @param nym Handle for the user who wants to enter.
- * @param header_length Number of modifiers in header.
- * @param header Modifiers present in the message.
+ * @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).
*/
typedef void (*GNUNET_SOCIAL_AnswerDoorCallback)(void *cls,
struct GNUNET_SOCIAL_Nym *nym,
- size_t header_length,
- GNUNET_PSYC_Modifier *header,
+ size_t variable_count,
+ GNUNET_PSYC_Modifier
*variables,
size_t data_size,
const void *data);
@@ -208,13 +208,13 @@
*
* @param cls Closure.
* @param nym Handle for the user who left.
- * @param header_length Number of modifiers in header.
- * @param header Modifiers present in the message.
+ * @param variable_count Number of elements in the @a variables array.
+ * @param variables Variables present in the message.
*/
typedef void (*GNUNET_SOCIAL_FarewellCallback)(void *cls,
struct GNUNET_SOCIAL_Nym *nym,
- size_t header_length,
- GNUNET_PSYC_Modifier *header);
+ size_t variable_count,
+ GNUNET_PSYC_Modifier
*variables);
/**
@@ -554,6 +554,12 @@
size_t *value_size);
+/**
+ * Flags for talking to the host of a place.
+ */
+enum GNUNET_SOCIAL_TalkFlags;
+
+
/**
* A talk request.
*/
@@ -567,6 +573,7 @@
* @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.
+ * @param flags Flags for the message being sent.
* @return NULL if we are already trying to talk to the host,
* otherwise handle to cancel the request.
*/
@@ -575,7 +582,8 @@
const char *method_name,
const struct GNUNET_ENV_Environment *env,
GNUNET_CONNECTION_TransmitReadyNotify notify,
- void *notify_cls);
+ void *notify_cls,
+ GNUNET_SOCIAL_TalkFlags flags);
/**
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28548 - gnunet/src/include,
gnunet <=