multicast/psyc: added admitted_since arg for join_decision(); social: added nym arg...

diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index f1c4813a45ec0e2160acb57d5a6ef070ac14b160..6ce9ce42c6fbba829cd09e2e14d063afd42061e1 100644 (file)
--- 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 14a8b6e091fd88d010566ca047723e2a4704647e..ec6028772c05597ccc48ac8451bcc2755f2e36d2 100644 (file)
--- 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 fd20536a42e96e8821f8d543da2777980d9585ad..1728d391cb04480d562f51ba867e2fc3b3290fad 100644 (file)
--- 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,