[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28833 - gnunet/src/include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28833 - gnunet/src/include |
Date: |
Sat, 24 Aug 2013 08:25:10 +0200 |
Author: tg
Date: 2013-08-24 08:25:10 +0200 (Sat, 24 Aug 2013)
New Revision: 28833
Modified:
gnunet/src/include/gnunet_multicast_service.h
gnunet/src/include/gnunet_psyc_service.h
gnunet/src/include/gnunet_psycstore_service.h
gnunet/src/include/gnunet_social_service.h
Log:
multicast: added replay_end(), returning replay handle from join_decision();
removed admitted/effective since where not needed; social: keep_active flag
instead of away
Modified: gnunet/src/include/gnunet_multicast_service.h
===================================================================
--- gnunet/src/include/gnunet_multicast_service.h 2013-08-24 00:47:43 UTC
(rev 28832)
+++ gnunet/src/include/gnunet_multicast_service.h 2013-08-24 06:25:10 UTC
(rev 28833)
@@ -277,7 +277,6 @@
* @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 @@
* 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 @@
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 @@
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,
Modified: gnunet/src/include/gnunet_psyc_service.h
===================================================================
--- gnunet/src/include/gnunet_psyc_service.h 2013-08-24 00:47:43 UTC (rev
28832)
+++ gnunet/src/include/gnunet_psyc_service.h 2013-08-24 06:25:10 UTC (rev
28833)
@@ -258,7 +258,6 @@
* @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 @@
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 @@
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);
/**
Modified: gnunet/src/include/gnunet_psycstore_service.h
===================================================================
--- gnunet/src/include/gnunet_psycstore_service.h 2013-08-24 00:47:43 UTC
(rev 28832)
+++ gnunet/src/include/gnunet_psycstore_service.h 2013-08-24 06:25:10 UTC
(rev 28833)
@@ -134,6 +134,7 @@
* @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.
Modified: gnunet/src/include/gnunet_social_service.h
===================================================================
--- gnunet/src/include/gnunet_social_service.h 2013-08-24 00:47:43 UTC (rev
28832)
+++ gnunet/src/include/gnunet_social_service.h 2013-08-24 06:25:10 UTC (rev
28833)
@@ -372,26 +372,15 @@
* 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);
+GNUNET_SOCIAL_home_get_place (struct GNUNET_SOCIAL_Home *home, int
keep_active);
/**
- * 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);
-
-
-/**
* Leave a home.
* Invalidates home handle.
@@ -627,24 +616,12 @@
* 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);
+GNUNET_SOCIAL_place_leave (struct GNUNET_SOCIAL_Place *place, int keep_active);
-/**
- * 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);
-
-
#if 0 /* keep Emacsens' auto-indent happy */
{
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28833 - gnunet/src/include,
gnunet <=