summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabor X Toth <*@tg-x.net>2013-08-19 06:44:51 +0000
committerGabor X Toth <*@tg-x.net>2013-08-19 06:44:51 +0000
commit76c34b131d62f4dac8766b725251e6474b4b2b85 (patch)
tree004a5e572c11e9e81c172b5582780147f4c0c282 /src
parent83fc4b5ec139300250383fc3c6577b9333a309c6 (diff)
multicast/psyc: added admitted_since arg for join_decision(); social: added nym arg for the method cb
Diffstat (limited to 'src')
-rw-r--r--src/include/gnunet_multicast_service.h2
-rw-r--r--src/include/gnunet_psyc_service.h2
-rw-r--r--src/include/gnunet_social_service.h2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index f1c4813a4..6ce9ce42c 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -277,6 +277,7 @@ struct GNUNET_MULTICAST_JoinHandle;
* @param jh Join request handle.
* @param is_admitted #GNUNET_YES if joining is approved,
* #GNUNET_NO if it is disapproved
+ * @param admitted_since Message ID the member is admitted since.
* @param relay_count Number of relays given.
* @param relays Array of suggested peers that might be useful relays to use
* when joining the multicast group (essentially a list of peers that
@@ -293,6 +294,7 @@ struct GNUNET_MULTICAST_JoinHandle;
void
GNUNET_MULTICAST_join_decision (struct GNUNET_MULTICAST_JoinHandle *jh,
int is_admitted,
+ uint64_t admitted_since,
unsigned int relay_count,
const struct GNUNET_PeerIdentity *relays,
const struct GNUNET_MessageHeader *join_response);
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index 14a8b6e09..ec6028772 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -258,6 +258,7 @@ typedef int
* @param jh Join request handle.
* @param is_admitted #GNUNET_YES if joining is approved,
* #GNUNET_NO if it is disapproved.
+ * @param admitted_since Message ID the member is admitted since.
* @param relay_count Number of relays given.
* @param relays Array of suggested peers that might be useful relays to use
* when joining the multicast group (essentially a list of peers that
@@ -274,6 +275,7 @@ typedef int
void
GNUNET_PSYC_join_decision (struct GNUNET_PSYC_JoinHandle *jh,
int is_admitted,
+ uint64_t admitted_since,
unsigned int relay_count,
const struct GNUNET_PeerIdentity *relays,
const char *method_name,
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index fd20536a4..1728d391c 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -73,6 +73,7 @@ struct GNUNET_SOCIAL_Slicer;
* to a @e method.
*
* @param cls Closure.
+ * @param nym The sender of the message. NULL for the ego's own messages to the home.
* @param full_method_name Original method name from PSYC (may be more
* specific than the registered method name due to try-and-slice matching).
@@ -88,6 +89,7 @@ struct GNUNET_SOCIAL_Slicer;
* @param flags Message flags indicating fragmentation status.
*/
typedef int (*GNUNET_SOCIAL_Method)(void *cls,
+ struct GNUNET_SOCIAL_Nym *nym,
const char *full_method_name,
uint64_t message_id,
size_t modifier_count,