/*
This file is part of GNUnet.
- Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012, 2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
*/
/**
- * @file include/gnunet_multicast_service.h
- * @brief multicast service; establish tunnels to distant peers
- * @author Christian Grothoff
* @author Gabor X Toth
+ * @author Christian Grothoff
+ *
+ * @file
+ * Multicast service; multicast messaging via CADET
+ *
+ * @defgroup multicast Multicast service
+ * Multicast messaging via CADET.
+ * @{
*/
#ifndef GNUNET_MULTICAST_SERVICE_H
/**
* Public key of the sending member.
*/
- struct GNUNET_CRYPTO_EcdsaPublicKey member_key;
+ struct GNUNET_CRYPTO_EcdsaPublicKey member_pub_key;
/**
* ECC signature of the request fragment.
/**
* Maximum size of a multicast message fragment.
*/
-#define GNUNET_MULTICAST_FRAGMENT_MAX_SIZE 63 * 1024
+#define GNUNET_MULTICAST_FRAGMENT_MAX_SIZE (63 * 1024)
#define GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD \
- GNUNET_MULTICAST_FRAGMENT_MAX_SIZE \
- - sizeof (struct GNUNET_MULTICAST_MessageHeader)
+ (GNUNET_MULTICAST_FRAGMENT_MAX_SIZE \
+ - sizeof (struct GNUNET_MULTICAST_MessageHeader))
/**
*
* @param cls
* Closure.
- * @param member_key
+ * @param member_pub_key
* Public key of the member requesting join.
* @param join_msg
* Application-dependent join message from the new member.
*/
typedef void
(*GNUNET_MULTICAST_JoinRequestCallback) (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPublicKey *member_key,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
const struct GNUNET_MessageHeader *join_msg,
struct GNUNET_MULTICAST_JoinHandle *jh);
const struct GNUNET_MessageHeader *join_msg);
-/**
- * Handle to pass back for the answer of a membership test.
- */
-struct GNUNET_MULTICAST_MembershipTestHandle;
-
-
-/**
- * Call informing multicast about the decision taken for a membership test.
- *
- * @param mth
- * Handle that was given for the query.
- * @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_result (struct GNUNET_MULTICAST_MembershipTestHandle *mth,
- int result);
-
-
-/**
- * Method called to test if a member was in the group at a particular time.
- *
- * It is called when a replay request is received to determine if the requested
- * message can be replayed.
- *
- * @param cls
- * Closure.
- * @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_CRYPTO_EcdsaPublicKey *member_key,
- uint64_t message_id,
- uint64_t group_generation,
- struct GNUNET_MULTICAST_MembershipTestHandle *mth);
-
-
/**
* Function called whenever a group member has transmitted a request
* to the origin (other than joining or leaving).
const struct GNUNET_MULTICAST_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);
-
-
/**
* Opaque handle to a replay request from the multicast service.
*/
* @param cls
* Closure (set from GNUNET_MULTICAST_origin_start()
* or GNUNET_MULTICAST_member_join()).
- * @param member_key
+ * @param member_pub_key
* The member requesting replay.
* @param fragment_id
* Which message fragment should be replayed.
*/
typedef void
(*GNUNET_MULTICAST_ReplayFragmentCallback) (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPublicKey *member_key,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
uint64_t fragment_id,
uint64_t flags,
struct GNUNET_MULTICAST_ReplayHandle *rh);
* @param cls
* Closure (set from GNUNET_MULTICAST_origin_start()
* or GNUNET_MULTICAST_member_join()).
- * @param member_key
+ * @param member_pub_key
* The member requesting replay.
* @param message_id
* Which message should be replayed.
*/
typedef void
(*GNUNET_MULTICAST_ReplayMessageCallback) (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPublicKey *member_key,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
uint64_t message_id,
uint64_t fragment_offset,
uint64_t flags,
/**
* Start a multicast group.
*
- * 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 or to the origin. If the joining is
+ * Peers that issue GNUNET_MULTICAST_member_join() can transmit a join request
+ * to 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).
+ * to the origin.
+ *
+ * TODO: This function could optionally offer to advertise the origin in the
+ * P2P overlay network(where?) under the respective public key so that other
+ * peers can find an alternate PeerId to join it. Higher level protocols may
+ * however provide other means of solving the problem of the offline host
+ * (see secushare specs about that) and therefore merely need a way to provide
+ * a list of possible PeerIds.
*
* @param cfg
* Configuration to use.
* 0 for a new group.
* @param join_request_cb
* Function called to approve / disapprove joining of a peer.
- * @param member_test_cb
- * Function multicast can use to test group membership.
* @param replay_frag_cb
* Function that can be called to replay a message fragment.
* @param replay_msg_cb
const struct GNUNET_CRYPTO_EddsaPrivateKey *priv_key,
uint64_t max_fragment_id,
GNUNET_MULTICAST_JoinRequestCallback join_request_cb,
- GNUNET_MULTICAST_MembershipTestCallback member_test_cb,
GNUNET_MULTICAST_ReplayFragmentCallback replay_frag_cb,
GNUNET_MULTICAST_ReplayMessageCallback replay_msg_cb,
GNUNET_MULTICAST_RequestCallback request_cb,
* Configuration to use.
* @param group_key
* ECC public key that identifies the group to join.
- * @param member_key
+ * @param member_pub_key
* ECC key that identifies the member
* and used to sign requests sent to the origin.
* @param origin
* Function called to approve / disapprove joining of a peer.
* @param join_decision_cb
* Function called to inform about the join decision.
- * @param member_test_cb
- * Function multicast can use to test group membership.
* @param replay_frag_cb
* Function that can be called to replay message fragments
* this peer already knows from this group. NULL if this
struct GNUNET_MULTICAST_Member *
GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
const struct GNUNET_CRYPTO_EddsaPublicKey *group_key,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *member_key,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *member_pub_key,
const struct GNUNET_PeerIdentity *origin,
uint16_t relay_count,
const struct GNUNET_PeerIdentity *relays,
const struct GNUNET_MessageHeader *join_request,
GNUNET_MULTICAST_JoinRequestCallback join_request_cb,
GNUNET_MULTICAST_JoinDecisionCallback join_decision_cb,
- GNUNET_MULTICAST_MembershipTestCallback mem_test_cb,
GNUNET_MULTICAST_ReplayFragmentCallback replay_frag_cb,
GNUNET_MULTICAST_ReplayMessageCallback replay_msg_cb,
GNUNET_MULTICAST_MessageCallback message_cb,
* @param flags
* Additional flags for the replay request.
* It is used and defined by GNUNET_MULTICAST_ReplayFragmentCallback
- * @param result_cb
- * Function to call when the replayed message fragment arrives.
- * @param result_cls
- * Closure for @a result_cb.
*
* @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,
- GNUNET_MULTICAST_ResultCallback result_cb,
- void *result_cb_cls);
+ uint64_t flags);
/**
* @param flags
* Additional flags for the replay request.
* It is used & defined by GNUNET_MULTICAST_ReplayMessageCallback
- * @param result_cb
- * Function to call for each replayed message fragment.
- * @param result_cls
- * Closure for @a result_cb.
*
* @return Replay request handle, NULL on error.
*/
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);
+ uint64_t flags);
/**
/* ifndef GNUNET_MULTICAST_SERVICE_H */
#endif
-/* end of gnunet_multicast_service.h */
+
+/** @} */ /* end of group */
projects / oweals / gnunet.git / blobdiff