3 files changed, 31 insertions, 12 deletions

diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index 09d5cc4f2..66b17c6e3 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -518,6 +518,14 @@ GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                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
@@ -544,7 +552,7 @@ GNUNET_MULTICAST_origin_to_all (struct GNUNET_MULTICAST_Origin *origin,
                                 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 @@ void
 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 @@ struct GNUNET_MULTICAST_MemberRequestHandle *
 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);
 
 
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index 37b960c6b..14a8b6e09 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -343,10 +343,10 @@ GNUNET_PSYC_master_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  *         #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 @@ struct GNUNET_PSYC_MasterTransmitHandle *
 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_PSYC_slave_part (struct GNUNET_PSYC_Slave *slave);
  *         #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 @@ struct GNUNET_PSYC_SlaveTransmitHandle *
 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);
 
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index b3a5ca236..47673ad15 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -299,13 +299,15 @@ GNUNET_SOCIAL_home_get_key (struct GNUNET_SOCIAL_Home *home,
  * @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);
 
 
 /**