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

[gnunet]

Author: tg
Date: 2013-08-15 18:43:35 +0200 (Thu, 15 Aug 2013)
New Revision: 28668

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: transmit callbacks; social: password for home_advertise()

Modified: gnunet/src/include/gnunet_multicast_service.h
===================================================================
--- gnunet/src/include/gnunet_multicast_service.h       2013-08-15 16:38:17 UTC 
(rev 28667)
+++ gnunet/src/include/gnunet_multicast_service.h       2013-08-15 16:43:35 UTC 
(rev 28668)
@@ -518,7 +518,15 @@
                                GNUNET_MULTICAST_MessageCallback message_cb,
                                void *cls);
 
+/**
+ * Function called to provide data for a transmission from the origin to all 
members.
+ */
+typedef int
+(*GNUNET_MULTICAST_OriginTransmitNotify)(void *cls,
+                                         size_t *data_size,
+                                         void *data);
 
+
 /** 
  * Handle for a request to send a message to all multicast group members
  * (from the origin).
@@ -544,7 +552,7 @@
                                 uint64_t message_id,
                                 uint64_t group_generation,
                                 size_t size,
-                                GNUNET_CONNECTION_TransmitReadyNotify notify,
+                                GNUNET_MULTICAST_OriginTransmitNotify notify,
                                 void *notify_cls);
 
 
@@ -684,6 +692,15 @@
 GNUNET_MULTICAST_member_part (struct GNUNET_MULTICAST_Member *member);
 
 
+/**
+ * Function called to provide data for a transmission from a member to the 
origin.
+ */
+typedef int
+(*GNUNET_MULTICAST_MemberTransmitNotify)(void *cls,
+                                         size_t *data_size,
+                                         void *data);
+
+
 /** 
  * Handle for a message to be delivered from a member to the origin.
  */
@@ -704,7 +721,7 @@
 GNUNET_MULTICAST_member_to_origin (struct GNUNET_MULTICAST_Member *member,
                                    uint64_t message_id,
                                    size_t size,
-                                   GNUNET_CONNECTION_TransmitReadyNotify 
notify,
+                                   GNUNET_MULTICAST_MemberTransmitNotify 
notify,
                                    void *notify_cls);
 
 

Modified: gnunet/src/include/gnunet_psyc_service.h
===================================================================
--- gnunet/src/include/gnunet_psyc_service.h    2013-08-15 16:38:17 UTC (rev 
28667)
+++ gnunet/src/include/gnunet_psyc_service.h    2013-08-15 16:43:35 UTC (rev 
28668)
@@ -343,10 +343,10 @@
  *         #GNUNET_YES if this completes the transmission (all data supplied)
  */
 typedef int
-(*GNUNET_PSYC_MasterReadyNotify)(void *cls,
-                                 uint64_t message_id,
-                                 size_t *data_size,
-                                 void *data);
+(*GNUNET_PSYC_MasterTransmitNotify)(void *cls,
+                                    uint64_t message_id,
+                                    size_t *data_size,
+                                    void *data);
 
 
 
@@ -396,7 +396,7 @@
 GNUNET_PSYC_master_transmit (struct GNUNET_PSYC_Master *master,
                              const char *method_name,
                              const struct GNUNET_ENV_Environment *env,
-                             GNUNET_PSYC_MasterReadyNotify notify,
+                             GNUNET_PSYC_MasterTransmitNotify notify,
                              void *notify_cls,
                              enum GNUNET_PSYC_TransmitFlags flags);
 
@@ -499,9 +499,9 @@
  *         #GNUNET_YES if this completes the transmission (all data supplied).
  */
 typedef int
-(*GNUNET_PSYC_SlaveReadyNotify) (void *cls,
-                                 size_t *data_size,
-                                 char *data);
+(*GNUNET_PSYC_SlaveTransmitNotify) (void *cls,
+                                    size_t *data_size,
+                                    char *data);
 
 
 /**
@@ -530,7 +530,7 @@
 GNUNET_PSYC_slave_transmit (struct GNUNET_PSYC_Slave *slave,
                             const char *method_name,
                             const struct GNUNET_ENV_Environment *env,
-                            GNUNET_PSYC_SlaveReadyNotify notify,
+                            GNUNET_PSYC_SlaveTransmitNotify notify,
                             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-15 16:38:17 UTC (rev 
28667)
+++ gnunet/src/include/gnunet_social_service.h  2013-08-15 16:43:35 UTC (rev 
28668)
@@ -299,13 +299,15 @@
  * @param peers List of peers in the PLACE record that can be used to send join
  *        requests to.
  * @param expiration_time Expiration time of the record, use 0 to remove the 
record.
+ * @param password Password used to encrypt the record.
  */
 void
 GNUNET_SOCIAL_home_advertise (struct GNUNET_SOCIAL_Home *home,
                               const char *name,
                               size_t peer_count,
                               const struct GNUNET_PeerIdentity *peers,
-                              GNUNET_TIME_Relative expiration_time);
+                              GNUNET_TIME_Relative expiration_time,
+                              const char *password);
 
 
 /**