X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Frps%2Frps.h;h=3037e219035e6847d6ec2409f1b2e8ce26c9bfe0;hb=de84eb1d459852cb6973b216559e8ea27b334a98;hp=3ba0cffcf65e0a3673b6c827904c09f964e3735d;hpb=f5b01ce67749faebc26be6c1cb1b064f8c02655e;p=oweals%2Fgnunet.git

diff --git a/src/rps/rps.h b/src/rps/rps.h
index 3ba0cffcf..3037e2190 100644
--- a/src/rps/rps.h
+++ b/src/rps/rps.h
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (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
@@ -14,8 +14,8 @@
 
       You should have received a copy of the GNU General Public License
       along with GNUnet; see the file COPYING.  If not, write to the
-      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02111-1307, USA.
+      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      Boston, MA 02110-1301, USA.
  */
 /**
  * @file rps/rps.h
@@ -37,37 +37,6 @@ GNUNET_NETWORK_STRUCT_BEGIN
  * P2P Messages
 ***********************************************************************/
 
-/**
- * P2P Message to push own ID to other peer.
- */
-struct GNUNET_RPS_P2P_PushMessage
-{
-  /**
-   * Header including size and type in NBO
-   */
-  struct GNUNET_MessageHeader header;
-
-  /** 
-   * TODO Proof of work
-   */
-  uint64_t placeholder;
-};
-
-/**
- * P2P Message to request PeerIDs from other peer.
- */
-struct GNUNET_RPS_P2P_PullRequestMessage
-{
-  /**
-   * Header including size and type in NBO
-   */
-  struct GNUNET_MessageHeader header;
-
-  /* This probably stays empty as we just
-   * infrom the peer of our existence */
-  uint64_t placeholder;
-};
-
 /**
  * P2P Message to send PeerIDs to other peer.
  */
@@ -103,15 +72,14 @@ struct GNUNET_RPS_CS_RequestMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Number of random peer requested
+   * Identifyer of the message.
    */
-  uint32_t num_peers GNUNET_PACKED; 
+  uint32_t id GNUNET_PACKED;
 
   /**
-   * Identifyer of the message.
+   * Number of random peer requested
    */
-  uint64_t n GNUNET_PACKED;
-
+  uint32_t num_peers GNUNET_PACKED;
 };
 
 /**
@@ -120,25 +88,41 @@ struct GNUNET_RPS_CS_RequestMessage
 struct GNUNET_RPS_CS_ReplyMessage
 {
   /**
-   * Type is #GNUNET_MESSAGE_TYPE_RPS_REPLY.
+   * Type is #GNUNET_MESSAGE_TYPE_RPS_CS_REPLY.
    */
   struct GNUNET_MessageHeader header;
 
   /**
    * Identifyer of the message.
    */
-  uint64_t n;
+  uint32_t id GNUNET_PACKED;
 
   /**
    * Number of random peer replied
    */
-  uint64_t num_peers GNUNET_PACKED;
+  uint32_t num_peers GNUNET_PACKED;
 
   /* Followed by num_peers * GNUNET_PeerIdentity */
 };
 
 /**
- * Message from client to service with seed of peers
+ * Message from client to RPS service to cancel request.
+ */
+struct GNUNET_RPS_CS_RequestCancelMessage
+{
+  /**
+   * Header including size and type in NBO
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Identifyer of the message.
+   */
+  uint32_t id GNUNET_PACKED;
+};
+
+/**
+ * Message from client to service with seed of peers.
  */
 struct GNUNET_RPS_CS_SeedMessage
 {
@@ -150,9 +134,45 @@ struct GNUNET_RPS_CS_SeedMessage
   /**
    * Number of peers
    */
-  uint64_t num_peers;
+  uint32_t num_peers GNUNET_PACKED;
 
   /* Followed by num_peers * GNUNET_PeerIdentity */
 };
 
+#ifdef ENABLE_MALICIOUS
+/**
+ * Message from client to service to turn service malicious.
+ */
+struct GNUNET_RPS_CS_ActMaliciousMessage
+{
+  /**
+   * Header including size and type in NBO
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * If the type is 2 this is the attacked peer,
+   * empty otherwise.
+   */
+  struct GNUNET_PeerIdentity attacked_peer;
+
+  /**
+   * Type of malicious behaviour.
+   *
+   * 0 No malicious bahaviour at all
+   * 1 Try to maximise representation
+   * 2 Try to partition the network
+   */
+  uint32_t type GNUNET_PACKED;
+
+  /**
+   * Number of peers
+   */
+  uint32_t num_peers GNUNET_PACKED;
+
+  /* Followed by num_peers * GNUNET_PeerIdentity when the type of malicious
+     behaviour is 1 */
+};
+#endif /* ENABLE_MALICIOUS */
+
 GNUNET_NETWORK_STRUCT_END