multicast: simplistic origin_to_all() code to be able to test the psyc service

1 files changed, 9 insertions, 15 deletions

diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index d8d2866a7..ec446a906 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -476,10 +476,10 @@ GNUNET_MULTICAST_replay_response2 (struct GNUNET_MULTICAST_ReplayHandle *rh,
  * @param cfg Configuration to use.
  * @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;
- * @param last_fragment_id Last fragment ID to continue counting fragments from
- *        when restarting the origin.  0 for a new group.
+ * @param next_fragment_id Next fragment ID to continue counting fragments from
+ *        when restarting the origin.  1 for a new group.
  * @param join_cb Function called to approve / disapprove joining of a peer.
- * @param test_cb Function multicast can use to test group membership.
+ * @param mem_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 Function that can be called to replay a message.
  * @param request_cb Function called with message fragments from group members.
@@ -492,16 +492,16 @@ GNUNET_MULTICAST_replay_response2 (struct GNUNET_MULTICAST_ReplayHandle *rh,
 struct GNUNET_MULTICAST_Origin *
 GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                const struct GNUNET_CRYPTO_EccPrivateKey *priv_key,
-                               uint64_t last_fragment_id,
+                               uint64_t next_fragment_id,
                                GNUNET_MULTICAST_JoinCallback join_cb,
-                               GNUNET_MULTICAST_MembershipTestCallback test_cb,
+                               GNUNET_MULTICAST_MembershipTestCallback mem_test_cb,
                                GNUNET_MULTICAST_ReplayFragmentCallback replay_frag_cb,
                                GNUNET_MULTICAST_ReplayMessageCallback replay_msg_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.
  *
@@ -509,8 +509,6 @@ GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * invalidates the respective transmission handle.
  *
  * @param cls Closure.
- * @param fragment_id Set to the unique fragment ID that was generated for
- *        this message.
  * @param[in,out] data_size Initially set to the number of bytes available in
  *        @a data, should be set to the number of bytes written to data.
  * @param[out] data Where to write the body of the message to give to the
@@ -524,7 +522,6 @@ GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  */
 typedef int
 (*GNUNET_MULTICAST_OriginTransmitNotify) (void *cls,
-                                          uint64_t fragment_id,
                                           size_t *data_size,
                                           void *data);
 
@@ -591,7 +588,7 @@ GNUNET_MULTICAST_origin_stop (struct GNUNET_MULTICAST_Origin *origin);
  * @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
- * the group.  The @a test_cb and @a replay_cb functions may be called at
+ * the group.  The @a mem_test_cb and @a replay_cb functions may be called at
  * anytime by the multicast service to support relaying messages to other
  * members of the group.
  *
@@ -611,7 +608,7 @@ GNUNET_MULTICAST_origin_stop (struct GNUNET_MULTICAST_Origin *origin);
  *        identity/pseudonym to peer identity, application-level message to
  *        origin, etc.).
  * @param join_cb Function called to approve / disapprove joining of a peer.
- * @param test_cb Function multicast can use to test group membership.
+ * @param mem_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
  *        client is unable to support replay.
@@ -633,7 +630,7 @@ GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
                               const struct GNUNET_PeerIdentity *relays,
                               const struct GNUNET_MessageHeader *join_request,
                               GNUNET_MULTICAST_JoinCallback join_cb,
-                              GNUNET_MULTICAST_MembershipTestCallback test_cb,
+                              GNUNET_MULTICAST_MembershipTestCallback mem_test_cb,
                               GNUNET_MULTICAST_ReplayFragmentCallback replay_frag_cb,
                               GNUNET_MULTICAST_ReplayMessageCallback replay_msg_cb,
                               GNUNET_MULTICAST_MessageCallback message_cb,
@@ -719,8 +716,6 @@ GNUNET_MULTICAST_member_part (struct GNUNET_MULTICAST_Member *member);
  * invalidates the respective transmission handle.
  *
  * @param cls Closure.
- * @param fragment_id Set to the unique fragment ID that was generated for
- *        this message.
  * @param[in,out] data_size Initially set to the number of bytes available in
  *        @a data, should be set to the number of bytes written to data.
  * @param[out] data Where to write the body of the message to give to the
@@ -734,7 +729,6 @@ GNUNET_MULTICAST_member_part (struct GNUNET_MULTICAST_Member *member);
  */
 typedef int
 (*GNUNET_MULTICAST_MemberTransmitNotify) (void *cls,
-                                          uint64_t fragment_id,
                                           size_t *data_size,
                                           void *data);