2 files changed, 17 insertions, 9 deletions

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index dca1eb5e9..de585c9af 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2706,17 +2706,17 @@ extern "C"
 /**
  * RPS PUSH message to push own ID to another peer
  */
-#define GNUNET_MESSAGE_TYPE_RPS_PP_PUSH         950
+#define GNUNET_MESSAGE_TYPE_RPS_PP_PUSH           950
 
 /**
  * RPS PULL REQUEST message to request the local view of another peer
  */
-#define GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST 951
+#define GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST   951
 
 /**
  * RPS PULL REPLY message which contains the view of the other peer
  */
-#define GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY   952
+#define GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY     952
 
 
 
@@ -2725,23 +2725,28 @@ extern "C"
 /**
  * RPS CS REQUEST Message for the Client to request (a) random peer(s)
  */
-#define GNUNET_MESSAGE_TYPE_RPS_CS_REQUEST      953
+#define GNUNET_MESSAGE_TYPE_RPS_CS_REQUEST        953
 
 /**
  * RPS CS REPLY Message for the Server to send (a) random peer(s)
  */
-#define GNUNET_MESSAGE_TYPE_RPS_CS_REPLY        954
+#define GNUNET_MESSAGE_TYPE_RPS_CS_REPLY          954
+
+/**
+ * RPS CS REQUEST CANCEL Message for the Client to cancel a request
+ */
+#define GNUNET_MESSAGE_TYPE_RPS_CS_REQUEST_CANCEL 955
 
 /**
  * RPS CS SEED Message for the Client to seed peers into rps
  */
-#define GNUNET_MESSAGE_TYPE_RPS_CS_SEED         955
+#define GNUNET_MESSAGE_TYPE_RPS_CS_SEED           956
 
 #ifdef ENABLE_MALICIOUS
 /**
  * Turn RPS service malicious
  */
-#define GNUNET_MESSAGE_TYPE_RPS_ACT_MALICIOUS   956
+#define GNUNET_MESSAGE_TYPE_RPS_ACT_MALICIOUS     957
 
 #endif /* ENABLE_MALICIOUS */
 
diff --git a/src/include/gnunet_rps_service.h b/src/include/gnunet_rps_service.h
index e99072cbf..47b153b14 100644
--- a/src/include/gnunet_rps_service.h
+++ b/src/include/gnunet_rps_service.h
@@ -56,7 +56,9 @@ struct GNUNET_RPS_Request_Handle;
  * @param num_peers the number of peers returned
  * @param peers array with num_peers PeerIDs
  */
-typedef void (* GNUNET_RPS_NotifyReadyCB) (void *cls, uint64_t num_peers, const struct GNUNET_PeerIdentity *peers);
+typedef void (* GNUNET_RPS_NotifyReadyCB) (void *cls,
+    uint64_t num_peers,
+    const struct GNUNET_PeerIdentity *peers);
 
 /**
  * Connect to the rps service
@@ -125,7 +127,8 @@ GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh);
 GNUNET_RPS_act_malicious (struct GNUNET_RPS_Handle *h,
                           uint32_t type,
                           uint32_t num_peers,
-                          const struct GNUNET_PeerIdentity *ids);
+                          const struct GNUNET_PeerIdentity *ids,
+                          const struct GNUNET_PeerIdentity *target_peer);
 #endif /* ENABLE_MALICIOUS */