[GNUnet-SVN] r28695 - gnunet/src/include

[gnunet]

Author: tg
Date: 2013-08-19 08:44:51 +0200 (Mon, 19 Aug 2013)
New Revision: 28695

Modified:
   gnunet/src/include/gnunet_multicast_service.h
   gnunet/src/include/gnunet_psyc_service.h
   gnunet/src/include/gnunet_social_service.h
Log:
multicast/psyc: added admitted_since arg for join_decision(); social: added nym 
arg for the method cb

Modified: gnunet/src/include/gnunet_multicast_service.h
===================================================================
--- gnunet/src/include/gnunet_multicast_service.h       2013-08-18 20:47:51 UTC 
(rev 28694)
+++ gnunet/src/include/gnunet_multicast_service.h       2013-08-19 06:44:51 UTC 
(rev 28695)
@@ -277,6 +277,7 @@
  * @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 @@
 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);

Modified: gnunet/src/include/gnunet_psyc_service.h
===================================================================
--- gnunet/src/include/gnunet_psyc_service.h    2013-08-18 20:47:51 UTC (rev 
28694)
+++ gnunet/src/include/gnunet_psyc_service.h    2013-08-19 06:44:51 UTC (rev 
28695)
@@ -258,6 +258,7 @@
  * @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 @@
 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,

Modified: gnunet/src/include/gnunet_social_service.h
===================================================================
--- gnunet/src/include/gnunet_social_service.h  2013-08-18 20:47:51 UTC (rev 
28694)
+++ gnunet/src/include/gnunet_social_service.h  2013-08-19 06:44:51 UTC (rev 
28695)
@@ -73,6 +73,7 @@
  * 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 @@
  * @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,