Merge branch 'master' of gnunet.org:gnunet

[oweals/gnunet.git] / src / multicast / multicast.h

diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h
index 207f9f729ed43c8eec7dfbe44fe9749678fec35c..aeb3c0b41426998f15776a1ccfe35be22c6d972b 100644 (file)
--- a/src/multicast/multicast.h
+++ b/src/multicast/multicast.h
@@ -1,6 +1,6 @@
 /*
      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
@@ -63,12 +63,12 @@ struct MulticastJoinRequestMessage
   /**
    * Public key of the target group.
    */
-  struct GNUNET_CRYPTO_EddsaPublicKey group_key;
+  struct GNUNET_CRYPTO_EddsaPublicKey group_pub_key;
 
   /**
    * Public key of the joining member.
    */
-  struct GNUNET_CRYPTO_EcdsaPublicKey member_key;
+  struct GNUNET_CRYPTO_EcdsaPublicKey member_pub_key;
 
   /**
    * Peer identity of the joining member.
@@ -128,7 +128,7 @@ struct MulticastJoinDecisionMessageHeader
    * C->S: Public key of the member requesting join.
    * S->C: Unused.
    */
-  struct GNUNET_CRYPTO_EcdsaPublicKey member_key;
+  struct GNUNET_CRYPTO_EcdsaPublicKey member_pub_key;
 
   /* Followed by struct MulticastJoinDecisionMessage */
 };
@@ -176,7 +176,7 @@ struct MulticastReplayRequestMessage
    * S->C: Public key of the member requesting replay.
    * C->S: Unused.
    */
-  struct GNUNET_CRYPTO_EcdsaPublicKey member_key;
+  struct GNUNET_CRYPTO_EcdsaPublicKey member_pub_key;
 
   /**
    * ID of the message that is being requested.
@@ -273,7 +273,6 @@ struct MulticastOriginStartMessage
    * we resume operating * a group.
    */
   uint64_t max_fragment_id;
-
 };
 
 
@@ -286,7 +285,7 @@ struct MulticastMemberJoinMessage
 
   uint32_t relay_count GNUNET_PACKED;
 
-  struct GNUNET_CRYPTO_EddsaPublicKey group_key;
+  struct GNUNET_CRYPTO_EddsaPublicKey group_pub_key;
 
   struct GNUNET_CRYPTO_EcdsaPrivateKey member_key;
 
@@ -298,131 +297,6 @@ struct MulticastMemberJoinMessage
 };
 
 
-#if NOT_USED
-/**
- * Message sent from the client to the service to broadcast to all group
- * members.
- */
-struct MulticastBroadcastMessage
-{
-
-  /**
-   *
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * #GNUNET_OK normally, #GNUNET_SYSERR if the origin aborted the
-   * transmission.
-   */
-  int32_t status;
-
-  /**
-   * Message ID.
-   */
-  uint64_t message_id;
-
-  /**
-   * Group generation.
-   */
-  uint64_t group_generation;
-
-  /**
-   * Total message size.
-   */
-  uint64_t total_size;
-
-};
-
-
-/**
- * Message sent from the client to the service to join a multicast group.
- */
-struct MulticastJoinMessage
-{
-
-  /**
-   *
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Number of relays we (think) we already know about.
-   */
-  uint32_t relay_count;
-
-  /**
-   * Public non-ephemeral key of the mutlicast group.
-   */
-  struct GNUNET_CRYPTO_EddsaPublicKey group_key;
-
-  /**
-   * Our private key for the group.
-   */
-  struct GNUNET_CRYPTO_EcdsaPrivateKey member_key;
-
-  /* followed by 'relay_count' `struct GNUNET_PeerIdentity`s */
-
-};
-
-
-
-/**
- * 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;
-
-};
-#endif // NOT_USED
-
 GNUNET_NETWORK_STRUCT_END
 
 #endif