-more issues with multicast API

2 files changed, 65 insertions, 5 deletions

diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h
index 5a18af461..95c989707 100644
--- a/src/multicast/multicast.h
+++ b/src/multicast/multicast.h
@@ -243,7 +243,9 @@ struct MulticastReplayRequestMessage
 {
 
   /**
-   *
+   * The message type can be either 
+   * #GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST or
+   * #GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST_CANCEL.
    */
   struct GNUNET_MessageHeader header;
 
@@ -253,17 +255,17 @@ struct MulticastReplayRequestMessage
   uint32_t uid;
 
   /**
-   * 
+   * ID of the message that is being requested.
    */
   uint64_t message_id;
 
   /**
-   * 
+   * Offset of the fragment that is being requested.
    */
   uint64_t fragment_offset;
 
   /**
-   * 
+   * Additional flags for the request.
    */
   uint64_t flags;
 
@@ -271,6 +273,63 @@ struct MulticastReplayRequestMessage
 
 
 
+/**
+ * Message sent from the client to the service to unicast to the group origin.
+ */
+struct MulticastUnicastToOriginMessage
+{
+
+  /**
+   *
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Reserved (always 0).
+   */
+  uint32_t reserved;
+
+  /**
+   * Message ID.
+   */
+  uint64_t message_id;
+
+  /**
+   * Total message size.
+   */
+  uint64_t total_size;
+
+  /* followed by payload */
+
+};
+
+
+/**
+ * Message sent from the client to the service to
+ * cancel unicast to the group origin.
+ */
+struct MulticastUnicastToOriginCancelMessage
+{
+
+  /**
+   *
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Reserved (always 0).
+   */
+  uint32_t reserved;
+
+  /**
+   * Message ID.
+   */
+  uint64_t message_id;
+
+};
+
+
+
 
 
 GNUNET_NETWORK_STRUCT_END
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c
index b8ee42cb3..cc2554c7d 100644
--- a/src/multicast/multicast_api.c
+++ b/src/multicast/multicast_api.c
@@ -515,7 +515,8 @@ struct GNUNET_MULTICAST_MemberRequestHandle
  * 
  * @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 size Number of bytes we want to send to origin. 
+ *             FIXME: this should probably be a uint64_t?
  * @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).