multicast: added replay_end(), returning replay handle from join_decision(); removed admitted/effective since where not needed; social: keep_active flag instead of away

4 files changed, 18 insertions, 35 deletions

diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index e187b963b..01074358e 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -277,7 +277,6 @@ 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
@@ -291,10 +290,9 @@ struct GNUNET_MULTICAST_JoinHandle;
  *        application layer; this response is to be transmitted to the
  *        peer that issued the request even if admission is denied.
  */
-void
+struct GNUNET_MULTICAST_ReplayHandle *
 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);
@@ -514,6 +512,17 @@ GNUNET_MULTICAST_replay (struct GNUNET_MULTICAST_ReplayHandle *rh,
                          const struct GNUNET_MessageHeader *msg,
                          enum GNUNET_MULTICAST_ReplayErrorCode ec);
 
+
+/** 
+ * Indicate the end of the replay session.
+ *
+ * Invalidates the replay handle.
+ *
+ * @param rh Replay session to end.
+ */
+void
+GNUNET_MULTICAST_replay_end (struct GNUNET_MULTICAST_ReplayHandle *rh);
+
 /**
  * Function called to provide data for a transmission for a replay.
  *
@@ -684,7 +693,6 @@ GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
                               size_t relay_count,
                               const struct GNUNET_PeerIdentity *relays,
                               const struct GNUNET_MessageHeader *join_request,
-                              uint64_t max_known_fragment_id,
                               GNUNET_MULTICAST_JoinCallback join_cb,
                               GNUNET_MULITCAST_MembershipTestCallback test_cb,
                               GNUNET_MULITCAST_ReplayCallback replay_cb,
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index ec6028772..7caf8a40f 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -258,7 +258,6 @@ 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
@@ -275,7 +274,6 @@ 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,
@@ -625,8 +623,7 @@ GNUNET_PSYC_channel_slave_add (struct GNUNET_PSYC_Channel *channel,
 void
 GNUNET_PSYC_channel_slave_remove (struct GNUNET_PSYC_Channel *channel,
                                   const struct GNUNET_CRYPTO_EccPublicKey *slave_key,
-                                  uint64_t announced_at,
-                                  uint64_t effective_since);
+                                  uint64_t announced_at);
 
 
 /** 
diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h
index cd93c165f..8fc7dbcd7 100644
--- a/src/include/gnunet_psycstore_service.h
+++ b/src/include/gnunet_psycstore_service.h
@@ -134,6 +134,7 @@ typedef void
  * @param did_join #GNUNET_YES on join, #GNUNET_NO on part.
  * @param announced_at ID of the message that announced the membership change.
  * @param effective_since Message ID this membership change is in effect since.
+ *        For joins it is <= announced_at, for parts it is always 0.
  * @param group_generation In case of a part, the last group generation the
  *        slave has access to.  It has relevance when a larger message have
  *        fragments with different group generations.
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index 0421c1d75..abb749b9b 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -372,23 +372,12 @@ GNUNET_SOCIAL_home_announce_cancel (struct GNUNET_SOCIAL_Announcement *a);
  * Convert our home to a place so we can access it via the place API.
  *
  * @param home Handle for the home.
+ * @param keep_active Keep home active after last application disconnected.
  * @return Place handle for the same home, valid as long as @a home is valid;
  *         do NOT try to GNUNET_SOCIAL_place_leave() this place, it's your home!
  */
 struct GNUNET_SOCIAL_Place *
-GNUNET_SOCIAL_home_get_place (struct GNUNET_SOCIAL_Home *home);
-
-
-/** 
- * Leave a home temporarily, visitors can stay.
- *
- * After leaving, handling of incoming messages are left to other clients of the
- * social service, and stops after the last client exits.
- *
- * @param home Home to leave temporarily (handle becomes invalid).
- */
-void
-GNUNET_SOCIAL_home_away (struct GNUNET_SOCIAL_Home *home);
+GNUNET_SOCIAL_home_get_place (struct GNUNET_SOCIAL_Home *home, int keep_active);
 
 
 /** 
@@ -627,22 +616,10 @@ GNUNET_SOCIAL_place_get_history_cancel (struct GNUNET_SOCIAL_HistoryLesson *hist
  * Notifies the owner of the place about leaving, and destroys the place handle.
  * 
  * @param place Place to leave permanently.
+ * @param keep_active Keep place active after last application disconnected.
  */
 void
-GNUNET_SOCIAL_place_leave (struct GNUNET_SOCIAL_Place *place);
-
-
-/** 
- * Leave a place temporarily.
- *
- * Stop following the conversation for the @a place and destroy the @a place
- * handle.  Only affects the application calling this function, other clients of
- * the service continue receiving the messages.
- *
- * @param place Place to leave temporarily.
- */
-void
-GNUNET_SOCIAL_place_away (struct GNUNET_SOCIAL_Place *place);
+GNUNET_SOCIAL_place_leave (struct GNUNET_SOCIAL_Place *place, int keep_active);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */