*/
struct GNUNET_MULTICAST_Origin;
-/**
- * Group membership policies.
- */
-enum GNUNET_MULTICAST_JoinPolicy
+
+enum GNUNET_MULTICAST_MessageFlags
{
- /**
- * Anyone can join the group, without announcing his presence;
- * all messages are always public and can be distributed freely.
- * Joins may be announced, but this is not required.
+ /**
+ * First fragment of a message.
*/
- GNUNET_MULTICAST_JP_ANONYMOUS = 0,
+ GNUNET_MULTICAST_MESSAGE_FIRST_FRAGMENT = 1 << 0,
- /**
- * Origin must approve membership to the group, messages must only be
- * distributed to current group members. This includes the group
- * state as well as transient messages.
+ /**
+ * Last fragment of a message.
*/
- GNUNET_MULTICAST_JP_PRIVATE = 1,
+ GNUNET_MULTICAST_MESSAGE_LAST_FRAGMENT = 1 << 1,
-#if IDEAS_FOR_FUTURE
/**
- * Anyone can freely join the group (no approval required); however,
- * transient messages must only be distributed to current group
- * members, so the origin must still acknowledge that the member
- * joined before transient messages are delivered. As approval is
- * guaranteed, the presistent group state can be synchronized freely
- * immediately, prior to origin confirmation.
- */
- GNUNET_MULTICAST_JP_OPEN = 2,
-
- /**
- * Origin must approve membership to the group, but past messages can be
- * freely distributed to members.
+ * OR'ed flags if message is not fragmented.
*/
- GNUNET_MULTICAST_JP_CLOSED = 3,
-#endif
-
+ GNUNET_MULTICAST_MESSAGE_NOT_FRAGMENTED
+ = GNUNET_MULTICAST_MESSAGE_FIRST_FRAGMENT
+ | GNUNET_MULTICAST_MESSAGE_LAST_FRAGMENT
};
GNUNET_NETWORK_STRUCT_BEGIN
/**
- * Header of a multicast message.
+ * Header of a multicast message fragment.
*
- * This format is public as the replay mechanism must replay messages using the
- * same format. This is needed as we want to integrity-check messages within
+ * This format is public as the replay mechanism must replay message fragments using the
+ * same format. This is needed as we want to integrity-check message fragments within
* the multicast layer to avoid multicasting mal-formed messages.
*/
struct GNUNET_MULTICAST_MessageHeader
{
/**
- * Header for all multicast messages from the origin.
+ * Header for all multicast message fragments from the origin.
*/
struct GNUNET_MessageHeader header;
/**
- * Number of hops this message has taken since the origin.
+ * Number of hops this message fragment has taken since the origin.
*
- * Helpful to determine shortest paths to the origin for responses among
- * honest peers; updated at each hop and thus not signed and not secure.
+ * Helpful to determine shortest paths to the origin among honest peers for
+ * unicast requests from members. Updated at each hop and thus not signed and
+ * not secure.
*/
uint32_t hop_counter GNUNET_PACKED;
/**
- * ECC signature of the message.
+ * ECC signature of the message fragment.
*
* Signature must match the public key of the multicast group.
*/
struct GNUNET_CRYPTO_EccSignature signature;
/**
- * Signature of the multicast message.
+ * Purpose for the signature and size of the signed data.
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
/**
- * Number of the message, monotonically increasing.
+ * Number of the message fragment, monotonically increasing.
+ */
+ uint64_t fragment_id GNUNET_PACKED;
+
+ /**
+ * Byte offset of this @e fragment of the @e message.
+ */
+ uint64_t fragment_offset GNUNET_PACKED;
+
+ /**
+ * Number of the message this fragment belongs to.
+ *
+ * Set in GNUNET_MULTICAST_origin_to_all().
*/
uint64_t message_id GNUNET_PACKED;
/**
* Counter that monotonically increases whenever a member parts the group.
*
+ * Set in GNUNET_MULTICAST_origin_to_all().
+ *
* It has significance in case of replay requests: when a member has missed
* messages and gets a replay request: in this case if the @a group_generation
* is still the same before and after the missed messages, it means that no
*/
uint64_t group_generation GNUNET_PACKED;
+ /**
+ * Flags for this message fragment.
+ */
+ enum GNUNET_MULTICAST_MessageFlags flags GNUNET_PACKED;
+
+ /* Followed by message body. */
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Header of a request from a member to the origin.
+ *
+ * FIXME: this struct is going to be internal.
+ */
+struct GNUNET_MULTICAST_RequestHeader
+{
+ /**
+ * Header for all requests from a member to the origin.
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Public key of the sending member.
+ */
+ struct GNUNET_CRYPTO_EccPublicKey member_key;
+
/**
- * Difference between the current @a message_id and the @a message_id of the
- * preceeding non-transient message.
- *
- * Zero for transient messages, @c UINT64_MAX for the first message, or any
- * other message creating a full state reset by the origin. By subtracting
- * @a state_delta from @a message_id, it is possible to calculate the message
- * ID of the preceeding non-transient message and thus quickly traverse all
- * state changes up to the last full state reset by the origin. This is
- * useful as it allows joining clients to quickly reassemble the state while
- * skipping over transient messages (and doing so without having to trust
- * intermediaries to do it right, as the indices in the chain are signed). If
- * the state chain is getting too long, the origin can choose to originate a
- * state message with a state_delta of UINT64_MAX, thereby starting a new
- * chain. The origin will then have to re-create the full state with state
- * update messages following the state reset message.
+ * ECC signature of the request fragment.
*
- * Open question: needed in multicast, or just have this in PSYC; still might
- * be useful for selective fetching of messages. Still, that again should
- * that not be done by PSYC?
+ * Signature must match the public key of the multicast group.
+ */
+ struct GNUNET_CRYPTO_EccSignature signature;
+
+ /**
+ * Purpose for the signature and size of the signed data.
*/
- uint64_t state_delta GNUNET_PACKED;
+ struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+ /**
+ * Number of the request fragment, monotonically increasing.
+ */
+ uint64_t fragment_id GNUNET_PACKED;
+
+ /**
+ * Byte offset of this @e fragment of the @e request.
+ */
+ uint64_t fragment_offset GNUNET_PACKED;
/**
- * Header for the message body.
+ * Number of the request this fragment belongs to.
*
- * Three message types are specifically understood by multicast, namely "peer
- * join", "peer part", and "group terminated". Multicast will use those
- * messages to update its list of candidates for content distribution. All
- * other message types are application-specific.
+ * Set in GNUNET_MULTICAST_origin_to_all().
+ */
+ uint64_t request_id GNUNET_PACKED;
+
+ /**
+ * Flags for this request.
*/
- struct GNUNET_MessageHeader body;
+ enum GNUNET_MULTICAST_MessageFlags flags GNUNET_PACKED;
- /* followed by message body */
+ /* Followed by request body. */
};
GNUNET_NETWORK_STRUCT_END
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
- * Handle that identifies a join request.
+ * Header of a join request sent to the origin or another member.
*
- * Used to match calls to #GNUNET_MULTICAST_JoinCallback to the
- * corresponding calls to GNUNET_MULTICAST_join_decision().
+ * FIXME: this struct is going to be internal.
*/
-struct GNUNET_MULTICAST_JoinHandle;
+struct GNUNET_MULTICAST_JoinRequest {
+ /**
+ * Header for the join request.
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * ECC signature of the rest of the fields of the join request.
+ *
+ * Signature must match the public key of the joining member.
+ */
+ struct GNUNET_CRYPTO_EccSignature signature;
+
+ /**
+ * Purpose for the signature and size of the signed data.
+ */
+ struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+ /**
+ * Public key of the target group.
+ */
+ struct GNUNET_CRYPTO_EccPublicKey group_key;
+
+ /**
+ * Public key of the joining member.
+ */
+ struct GNUNET_CRYPTO_EccPublicKey member_key;
+
+ /**
+ * Peer identity of the joining member.
+ */
+ struct GNUNET_PeerIdentity member_peer;
+
+ /* Followed by request body. */
+};
+
+GNUNET_NETWORK_STRUCT_END
+
/**
- * Handle that identifies a part request.
+ * Handle that identifies a join request.
*
- * Used to match calls to #GNUNET_MULTICAST_PartCallback to the
- * corresponding calls to GNUNET_MULTICAST_part_ack().
+ * Used to match calls to #GNUNET_MULTICAST_JoinCallback to the
+ * corresponding calls to #GNUNET_MULTICAST_join_decision().
*/
-struct GNUNET_MULTICAST_PartHandle;
+struct GNUNET_MULTICAST_JoinHandle;
/**
* #GNUNET_MULTICAST_JoinCallback.
*
* @param jh Join request handle.
- * @param join_response Message to send in response to the joining peer;
- * can also be used to redirect the peer to a different group at the
- * application layer; this response is to be transmitted to the
- * peer that issued the request even if admission is denied.
* @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
* be the multicast origin) is a good candidate for building the
* multicast tree. Note that it is unnecessary to specify our own
* peer identity in this array.
+ * @param join_response Message to send in response to the joining peer;
+ * can also be used to redirect the peer to a different group at the
+ * application layer; this response is to be transmitted to the
+ * peer that issued the request even if admission is denied.
*/
void
GNUNET_MULTICAST_join_decision (struct GNUNET_MULTICAST_JoinHandle *jh,
- const struct GNUNET_MessageHeader *join_response,
int is_admitted,
+ uint64_t admitted_since,
unsigned int relay_count,
- const struct GNUNET_PeerIdentity *relays);
-
-
-/**
- * Part acknowledgment.
- *
- * @param ph Part handle.
- */
-void
-GNUNET_MULTICAST_part_ack (struct GNUNET_MULTICAST_PartHandle *ph);
+ const struct GNUNET_PeerIdentity *relays,
+ const struct GNUNET_MessageHeader *join_response);
/**
* with the decision.
*
* @param cls Closure.
- * @param peer Identity of the peer that wants to join.
- * @param msg Application-dependent join message from the new user
+ * @param peer Identity of the member that wants to join.
+ * @param join_req Application-dependent join message from the new member
* (might, for example, contain a user,
* bind user identity/pseudonym to peer identity, application-level
* message to origin, etc.).
* @param jh Join handle to pass to GNUNET_MULTICAST_join_decison().
*/
-typedef void (*GNUNET_MULTICAST_JoinCallback)(void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *msg,
- struct GNUNET_MULTICAST_JoinHandle *jh);
-
-
-/**
- * Method called whenever another peer wants to part the multicast group.
- *
- * A part request must always be honoured, and answered with GNUNET_MULTICAST_part_ack();
- *
- * @param cls Closure.
- * @param peer Identity of the peer that wants to part.
- * @param msg Application-dependent part message from the leaving user.
- * @param ph Part handle.
- */
-typedef void (*GNUNET_MULTICAST_PartCallback)(void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *msg,
- struct GNUNET_MULTICAST_PartHandle *ph);
+typedef void
+(*GNUNET_MULTICAST_JoinCallback) (void *cls,
+ const struct GNUNET_EccPublicKey *member_key,
+ const struct GNUNET_MessageHeader *join_req,
+ struct GNUNET_MULTICAST_JoinHandle *jh);
/**
/**
- * Call informing multicast about the decision taken for membership test.
+ * Call informing multicast about the decision taken for a membership test.
*
* @param mth Handle that was given for the query.
- * @param decision #GNUNET_YES if peer was a member, #GNUNET_NO if peer was not a member,
- * #GNUNET_SYSERR if we cannot answer the membership test.
+ * @param result #GNUNET_YES if peer was a member, #GNUNET_NO if peer was not a member,
+ * #GNUNET_SYSERR if we cannot answer the membership test.
*/
void
-GNUNET_MULTICAST_membership_test_answer (struct GNUNET_MULTICAST_MembershipTestHandle *mth,
- int decision);
+GNUNET_MULTICAST_membership_test_result (struct GNUNET_MULTICAST_MembershipTestHandle *mth,
+ int result);
/**
* message can be replayed.
*
* @param cls Closure.
- * @param peer Identity of the peer that we want to test.
- * @param message_id Message ID for which we want to do the test.
+ * @param member_key Identity of the member that we want to test.
+ * @param message_id Message ID for which to perform the test.
+ * @param group_generation Group generation of the message. It has relevance if
+ * the message consists of multiple fragments with different group
+ * generations.
* @param mth Handle to give to GNUNET_MULTICAST_membership_test_answer().
*/
-typedef void (*GNUNET_MULTICAST_MembershipTestCallback)(void *cls,
- const struct GNUNET_PeerIdentity *peer,
- uint64_t message_id,
- struct GNUNET_MULTICAST_MembershipTestHandle *mth);
+typedef void
+(*GNUNET_MULTICAST_MembershipTestCallback) (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKey *member_key,
+ uint64_t message_id,
+ uint64_t group_generation,
+ struct GNUNET_MULTICAST_MembershipTestHandle *mth);
/**
- * Function called whenever a group member has transmitted a message
+ * Function called whenever a group member has transmitted a request
* to the origin (other than joining or leaving).
*
* @param cls Closure (set from GNUNET_MULTICAST_origin_start).
* @param sender Identity of the sender.
- * @param request_id Unique counter for the request from this sender to this origin. FIXME: needed?
- * @param msg Message to the origin.
+ * @param req Request to the origin.
+ * @param flags Flags for the request.
*/
-typedef void (*GNUNET_MULTICAST_RequestCallback) (void *cls,
- const struct GNUNET_PeerIdentity *sender,
- uint64_t request_id,
- const struct GNUNET_MessageHeader *msg);
+typedef void
+(*GNUNET_MULTICAST_RequestCallback) (void *cls,
+ const struct GNUNET_EccPublicKey *member_key,
+ const struct GNUNET_MessageHeader *req,
+ enum GNUNET_MULTICAST_MessageFlags flags);
/**
- * Function called whenever a group member is receiving a message from
+ * Function called whenever a group member is receiving a message fragment from
* the origin.
*
* If admission to the group is denied, this function is called once with the
* then a second time with NULL to indicate that the connection failed for good.
*
* @param cls Closure (set from GNUNET_MULTICAST_member_join())
- * @param message_id Unique number of the message, 0 for response to join request,
- * normal message IDs in either direction start at 1.
* @param msg Message from the origin, NULL if the origin shut down
* (or we were kicked out, and we should thus call
* GNUNET_MULTICAST_member_part() next)
*/
-typedef void (*GNUNET_MULTICAST_MessageCallback) (void *cls,
- uint64_t message_id,
- const struct GNUNET_MULTICAST_MessageHeader *msg);
+typedef void
+(*GNUNET_MULTICAST_MessageCallback) (void *cls,
+ const struct GNUNET_MessageHeader *msg);
+
+
+/**
+ * Function called with the result of an asynchronous operation.
+ *
+ * @see GNUNET_MULTICAST_replay_fragment()
+ *
+ * @param result Result of the operation.
+ */
+typedef void
+(*GNUNET_MULTICAST_ResultCallback) (void *cls,
+ int result);
/**
* group is left, the replay handle must no longer be used.
*
* @param cls Closure (set from GNUNET_MULTICAST_origin_start()
- * or GNUNET_MULTICAST_member_join()).
+ * or GNUNET_MULTICAST_member_join()).
+ * @param member_key The member requesting replay.
+ * @param fragment_id Which message fragment should be replayed.
+ * @param flags Flags for the replay.
+ * @param rh Handle to pass to message transmit function.
+ */
+typedef void
+(*GNUNET_MULTICAST_ReplayFragmentCallback) (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKey *member_key,
+ uint64_t fragment_id,
+ uint64_t flags,
+ struct GNUNET_MULTICAST_ReplayHandle *rh);
+
+/**
+ * Functions with this signature are called whenever the multicast service needs
+ * a message to be replayed.
+ *
+ * Implementations of this function MUST call GNUNET_MULTICAST_replay() ONCE
+ * (with a message or an error); however, if the origin is destroyed or the
+ * group is left, the replay handle must no longer be used.
+ *
+ * @param cls Closure (set from GNUNET_MULTICAST_origin_start()
+ * or GNUNET_MULTICAST_member_join()).
+ * @param member_key The member requesting replay.
* @param message_id Which message should be replayed.
+ * @param fragment_offset Offset of the fragment within of @a message_id to be replayed.
+ * @param flags Flags for the replay.
* @param rh Handle to pass to message transmit function.
*/
-typedef void (*GNUNET_MULTICAST_ReplayCallback) (void *cls,
- uint64_t message_id,
- struct GNUNET_MULTICAST_ReplayHandle *rh);
+typedef void
+(*GNUNET_MULTICAST_ReplayMessageCallback) (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKey *member_key,
+ uint64_t message_id,
+ uint64_t fragment_offset,
+ uint64_t flags,
+ struct GNUNET_MULTICAST_ReplayHandle *rh);
/**
/**
* Everything is fine.
- */
+ */
GNUNET_MULTICAST_REC_OK = 0,
/**
- * Message has been discarded (likely transient message that was too old).
- */
- GNUNET_MULTICAST_REC_TRANSIENT_LOST = 1,
+ * Message fragment not found in the message store.
+ *
+ * Either discarded if it is too old, or not arrived yet if this member has
+ * missed some messages.
+ */
+ GNUNET_MULTICAST_REC_NOT_FOUND = 1,
/**
- * Message ID counter was larger than the highest counter this
+ * Fragment ID counter was larger than the highest counter this
* replay function has ever encountered; thus it is likely the
* origin never sent it and we're at the HEAD of the multicast
* stream as far as this node is concerned.
- */
+ *
+ * FIXME: needed?
+ */
GNUNET_MULTICAST_REC_PAST_HEAD = 2,
+ /**
+ * Access is denied to the requested fragment, membership test did not pass.
+ */
+ GNUNET_MULTICAST_REC_ACCESS_DENIED = 3,
+
/**
* Internal error (i.e. database error). Try some other peer.
- */
- GNUNET_MULTICAST_REC_INTERNAL_ERROR = 3
+ */
+ GNUNET_MULTICAST_REC_INTERNAL_ERROR = 4
};
/**
- * Replay a message from the multicast group.
+ * Replay a message fragment for the multicast group.
*
* @param rh Replay handle identifying which replay operation was requested.
- * @param msg Replayed message, NULL if unknown/error.
+ * @param msg Replayed message fragment, NULL if unknown/error.
* @param ec Error code.
*/
void
GNUNET_MULTICAST_replay (struct GNUNET_MULTICAST_ReplayHandle *rh,
- const struct GNUNET_MULTICAST_MessageHeader *msg,
- enum GNUNET_MULTICAST_ReplayErrorCode ec);
+ const struct GNUNET_MessageHeader *msg,
+ enum GNUNET_MULTICAST_ReplayErrorCode ec);
+
+/**
+ * Function called to provide data for a transmission for a replay.
+ *
+ * @see GNUNET_MULTICAST_replay2()
+ */
+typedef int
+(*GNUNET_MULTICAST_ReplayTransmitNotify)(void *cls,
+ size_t *data_size,
+ void *data);
+
+/**
+ * Replay a message for the multicast group.
+ *
+ * @param rh Replay handle identifying which replay operation was requested.
+ * @param notify Function to call to get the message.
+ * @param notify_cls Closure for @a notify.
+ */
+void
+GNUNET_MULTICAST_replay2 (struct GNUNET_MULTICAST_ReplayHandle *rh,
+ GNUNET_MULTICAST_ReplayTransmitNotify notify,
+ void *notify_cls);
/**
* Will advertise the origin in the P2P overlay network under the respective
* public key so that other peer can find this peer to join it. Peers that
* issue GNUNET_MULTICAST_member_join() can then transmit a join request to
- * either an existing group member (if the @a join_policy is permissive) or to
- * the origin. If the joining is approved, the member is cleared for @e replay
- * and will begin to receive messages transmitted to the group. If joining is
- * disapproved, the failed candidate will be given a response. Members in the
- * group can send messages to the origin (one at a time).
+ * either an existing group member or to the origin. If the joining is
+ * approved, the member is cleared for @e replay and will begin to receive
+ * messages transmitted to the group. If joining is disapproved, the failed
+ * candidate will be given a response. Members in the group can send messages
+ * to the origin (one at a time).
*
* @param cfg Configuration to use.
- * @param cls Closure for the various callbacks that follow.
* @param priv_key ECC key that will be used to sign messages for this
- * multicast session; public key is used to identify the
- * multicast group; FIXME: we'll likely want to use
- * NOT the p521 curve here, but a cheaper one in the future.
- * @param join_policy What is the membership policy of the group?
- * @param replay_cb Function that can be called to replay a message.
- * @param test_cb Function multicast can use to test group membership.
+ * multicast session; public key is used to identify the multicast group;
+ * FIXME: we'll likely want to use NOT the p521 curve here, but a cheaper
+ * one in the future.
+ * @param last_fragment_id Last fragment ID to continue counting fragments from
+ * when restarting the origin. 0 for a new group.
* @param join_cb Function called to approve / disapprove joining of a peer.
- * @param part_cb Function called when a member wants to part the group.
- * @param request_cb Function called with messages from group members.
+ * @param test_cb Function multicast can use to test group membership.
+ * @param replay_cb Function that can be called to replay a message.
+ * @param request_cb Function called with message fragments from group members.
+ * @param message_cb Function called with the message fragments sent to the
+ * network by GNUNET_MULTICAST_origin_to_all(). These message fragments
+ * should be stored for answering replay requests later.
+ * @param cls Closure for the various callbacks that follow.
* @return Handle for the origin, NULL on error.
*/
struct GNUNET_MULTICAST_Origin *
-GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
- void *cls,
- const struct GNUNET_CRYPTO_EccPrivateKey *priv_key,
- enum GNUNET_MULTICAST_JoinPolicy join_policy,
- GNUNET_MULITCAST_ReplayCallback replay_cb,
- GNUNET_MULITCAST_MembershipTestCallback test_cb,
- GNUNET_MULTICAST_JoinCallback join_cb,
- GNUNET_MULTICAST_PartCallback part_cb,
- GNUNET_MULTICAST_RequestCallback request_cb);
+GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const struct GNUNET_CRYPTO_EccPrivateKey *priv_key,
+ uint64_t last_fragment_id,
+ GNUNET_MULTICAST_JoinCallback join_cb,
+ GNUNET_MULITCAST_MembershipTestCallback test_cb,
+ GNUNET_MULITCAST_ReplayCallback replay_cb,
+ GNUNET_MULTICAST_RequestCallback request_cb,
+ 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);
/**
* Send a message to the multicast group.
*
* @param origin Handle to the multicast group.
+ * @param message_id Application layer ID for the message. Opaque to multicast.
+ * @param group_generation Group generation of the message. Documented in
+ * GNUNET_MULTICAST_MessageHeader.
* @param size Number of bytes to transmit.
- * @param cb Function to call to get the message.
- * @param cb_cls Closure for @a cb.
+ * FIXME: Needed? The end of the message can be flagged with a last fragment flag.
+ * @param notify Function to call to get the message.
+ * @param notify_cls Closure for @a notify.
* @return NULL on error (i.e. request already pending).
*/
struct GNUNET_MULTICAST_OriginMessageHandle *
GNUNET_MULTICAST_origin_to_all (struct GNUNET_MULTICAST_Origin *origin,
- size_t size,
- GNUNET_CONNECTION_TransmitReadyNotify cb,
- void *cb_cls);
+ uint64_t message_id,
+ uint64_t group_generation,
+ size_t size,
+ GNUNET_MULTICAST_OriginTransmitNotify notify,
+ void *notify_cls);
/**
/**
- * End a multicast group.
+ * Stop a multicast group.
*
- * @param origin multicast group to terminate
+ * @param origin Multicast group to stop.
*/
void
-GNUNET_MULTICAST_origin_end (struct GNUNET_MULTICAST_Origin *origin);
+GNUNET_MULTICAST_origin_stop (struct GNUNET_MULTICAST_Origin *origin);
/**
* Join a multicast group.
*
* The entity joining is always the local peer. Further information about the
- * candidate can be provided in the @a join_req message. If the join fails, the
+ * candidate can be provided in the @a join_request message. If the join fails, the
* @a message_cb is invoked with a (failure) response and then with NULL. If
* the join succeeds, outstanding (state) messages and ongoing multicast
* messages will be given to the @a message_cb until the member decides to part
* members of the group.
*
* @param cfg Configuration to use.
- * @param cls Closure for callbacks.
- * @param pub_key ECC key that identifies the group.
- * @param origin Peer identity of the origin.
- * @param max_known_message_id Largest known message ID to the replay service;
- * all messages with IDs larger than this ID will be replayed if
+ * @param group_key ECC public key that identifies the group to join.
+ * @param member_key ECC key that identifies the member and used to sign
+ * requests sent to the origin.
+ * @param origin Peer ID of the origin to send unicast requsets to. If NULL,
+ * unicast requests are sent back via multiple hops on the reverse path
+ * of multicast messages.
+ * @param relay_count Number of peers in the @a relays array.
+ * @param relays Peer identities of members of the group, which serve as relays
+ * and can be used to join the group at. and send the @a join_request to.
+ * If empty, the @a join_request is sent directly to the @a origin.
+ * @param join_request Application-dependent join request to be passed to the peer
+ * @a relay (might, for example, contain a user, bind user
+ * identity/pseudonym to peer identity, application-level message to
+ * origin, etc.).
+ * @param max_known_fragment_id Largest known message fragment ID to the replay
+ * service; all messages with IDs larger than this ID will be replayed if
* possible (lower IDs will be considered known and thus only
* be replayed upon explicit request).
- * @param max_known_state_message_id Largest known message ID with a non-zero
- * value for the @e state_delta; state messages with
- * larger IDs than this value will be replayed with high priority
- * (lower IDs will be considered known and thus only
- * be replayed upon explicit request).
+ * FIXME: needed? can be optional or moved to a separate function.
+ * @param join_cb Function called to approve / disapprove joining of a peer.
+ * @param test_cb Function multicast can use to test group membership.
* @param replay_cb Function that can be called to replay messages
* this peer already knows from this group; NULL if this
* client is unable to support replay.
- * @param test_cb Function multicast can use to test group membership.
- * @param message_cb Function to be called for all messages we
+ * @param message_cb Function to be called for all message fragments we
* receive from the group, excluding those our @a replay_cb
* already has.
- * @param join_req Application-dependent join message to be passed to origin
- * (might, for example, contain a user
- * bind user identity/pseudonym to peer identity, application-level
- * message to origin, etc.).
+ * @param cls Closure for callbacks.
* @return Handle for the member, NULL on error.
*/
struct GNUNET_MULTICAST_Member *
-GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
- void *cls,
- const struct GNUNET_CRYPTO_EccPublicKey *pub_key,
+GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const struct GNUNET_CRYPTO_EccPublicKey *group_key,
+ const struct GNUNET_CRYPTO_EccPrivateKey *member_key,
const struct GNUNET_PeerIdentity *origin,
- uint64_t max_known_message_id,
- uint64_t max_known_state_message_id,
- GNUNET_MULTICAST_ReplayCallback replay_cb,
- GNUNET_MULITCAST_MembershipTestCallback test_cb,
- GNUNET_MULTICAST_MessageCallback message_cb,
- const struct GNUNET_MessageHeader *join_req);
+ 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,
+ GNUNET_MULTICAST_MessageCallback message_cb,
+ void *cls);
/**
/**
- * Request a message to be replayed.
+ * Request a fragment to be replayed by fragment ID.
+ *
+ * Useful if messages below the @e max_known_fragment_id given when joining are
+ * needed and not known to the client.
+ *
+ * @param member Membership handle.
+ * @param fragment_id ID of a message fragment that this client would like to
+ see replayed.
+ * @param flags Additional flags for the replay request. It is used and defined
+ * by the replay callback. FIXME: which replay callback? FIXME: use enum?
+ * FIXME: why not pass reply cb here?
+ * @return Replay request handle, NULL on error.
+ */
+struct GNUNET_MULTICAST_MemberReplayHandle *
+GNUNET_MULTICAST_member_replay_fragment (struct GNUNET_MULTICAST_Member *member,
+ uint64_t fragment_id,
+ uint64_t flags);
+
+
+/**
+ * Request a message fr to be replayed.
*
- * Useful if messages below the @e max_known_*_id's given when joining are
+ * Useful if messages below the @e max_known_fragment_id given when joining are
* needed and not known to the client.
*
* @param member Membership handle.
- * @param message_id ID of a message that this client would like to see replayed.
- * @param message_cb Function to be called for the replayed message.
- * @param message_cb_cls Closure for @a message_cb.
+ * @param fragment_id ID of a message fragment that this client would like to
+ see replayed.
+ * @param message_id ID of a message that this client would like to see
+ * replayed. Typically only one of the @a fragment_id and @a message_id
+ * is given. Specifying a @a message_id would return the last fragment
+ * of the message, which allows requesting the preceding fragments of the
+ * message by looking at the @e fragment_delta header field.
+ * @param flags Additional flags for the replay request. It is used & defined
+ * by the replay callback. E.g. the PSYC service would use this to
+ * implement state synchronization.
+ * @param result_cb Function to be called for the replayed message.
+ * @param result_cb_cls Closure for @a message_cb.
* @return Replay request handle, NULL on error.
*/
struct GNUNET_MULTICAST_MemberReplayHandle *
-GNUNET_MULTICAST_member_request_replay (struct GNUNET_MULTICAST_Member *member,
- uint64_t message_id,
- GNUNET_MULTICAST_MessageCallback message_cb,
- void *message_cb_cls);
+GNUNET_MULTICAST_member_replay_message (struct GNUNET_MULTICAST_Member *member,
+ uint64_t message_id,
+ uint64_t fragment_offset,
+ uint64_t flags,
+ GNUNET_MULTICAST_ResultCallback result_cb,
+ void *result_cb_cls);
/**
* @param rh Request to cancel.
*/
void
-GNUNET_MULTICAST_member_request_replay_cancel (struct GNUNET_MULTICAST_MemberReplayHandle *rh);
+GNUNET_MULTICAST_member_replay_cancel (struct GNUNET_MULTICAST_MemberReplayHandle *rh);
/**
* Part a multicast group.
*
+ * Disconnects from all group members and invalidates the @a member handle.
+ *
+ * An application-dependent part message can be transmitted beforehand using
+ * #GNUNET_MULTICAST_member_to_origin())
+ *
* @param member Membership handle.
*/
void
GNUNET_MULTICAST_member_part (struct GNUNET_MULTICAST_Member *member);
+/**
+ * Function called to provide data for a transmission from a member to the origin.
+ *
+ * @param cls closure
+ * @param data_size number of bytes available in @a data
+ * @param data where to copy data for transmission
+ * @return number of bytes copied to data
+ */
+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.
*/
/**
- * Send a message to the origin of the multicast group.
+ * Send a message to the origin of the multicast group.
*
* @param member Membership handle.
+ * @param message_id Application layer ID for the message. Opaque to multicast.
* @param size Number of bytes we want to send to origin.
- * @param cb Callback to call to get the message.
- * @param cb_cls Closure for @a cb.
+ * @param notify Callback to call to get the message.
+ * @param notify_cls Closure for @a notify.
* @return Handle to cancel request, NULL on error (i.e. request already pending).
*/
struct GNUNET_MULTICAST_MemberRequestHandle *
GNUNET_MULTICAST_member_to_origin (struct GNUNET_MULTICAST_Member *member,
- size_t size,
- GNUNET_CONNECTION_TransmitReadyNotify cb,
- void *cb_cls);
+ uint64_t message_id,
+ size_t size,
+ GNUNET_MULTICAST_MemberTransmitNotify notify,
+ void *notify_cls);
/**
GNUNET_MULTICAST_member_to_origin_cancel (struct GNUNET_MULTICAST_MemberRequestHandle *rh);
-
#if 0 /* keep Emacsens' auto-indent happy */
{
#endif
projects / oweals / gnunet.git / blobdiff