- Act malicious API complete

- Using multiple trails in PUT/GET

2 files changed, 32 insertions, 9 deletions

diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index 31d66ccf0..7a147b437 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -393,14 +393,31 @@ GNUNET_DHT_monitor_stop (struct GNUNET_DHT_MonitorHandle *handle);
 
 #if ENABLE_MALICIOUS
 /**
- * Turn the DHT service to act malicious depending on @a flag
+ * Type of a Malicious continuation.  You must not call
+ * #GNUNET_DHT_disconnect in this continuation.
+ *
+ * @param cls closure
+ * @param success #GNUNET_OK if the set malicious request was transmitted,
+ *                #GNUNET_NO on timeout,
+ *                #GNUNET_SYSERR on disconnect from service
+ *                after the PUT message was transmitted
+ *                (so we don't know if it was received or not)
+ */
+typedef void (*GNUNET_DHT_ActMaliciousContinuation)(void *cls,
+                                                 int success);
+
+/**
+ * Turn the DHT service to act malicious
  *
  * @param handle the DHT handle
  * @param action 1 to make the service malicious; 0 to make it benign
           FIXME: perhaps make this an enum of known malicious behaviors?
  */
-void
-GNUNET_DHT_malicious (struct GNUNET_DHT_Handle *handle, unsigned int action);
+struct GNUNET_DHT_ActMaliciousHandle *
+GNUNET_DHT_act_malicious (struct GNUNET_DHT_Handle *handle, 
+                      unsigned int action, 
+                      GNUNET_DHT_PutContinuation cont,
+                      void *cont_cls);
 #endif
 
 
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 16dc9ae9a..7e653f551 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2593,22 +2593,28 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_XDHT_P2P_GET 891
 
+/**
+ * Send back peer that considers you are its successor, a confirmation
+ * that you got the notify successor message. 
+ */
+#define GNUNET_MESSAGE_TYPE_XDHT_P2P_NOTIFY_SUCCESSOR_CONFIRMATION 892
+
 #if ENABLE_MALICIOUS
 /**
  * Turn X-VINE DHT service malicious
  */
-#define GNUNET_MESSAGE_TYPE_DHT_ACT_MALICIOUS 892
-#endif
+#define GNUNET_MESSAGE_TYPE_DHT_ACT_MALICIOUS 893
 
 /**
- * Send back peer that considers you are its successor, a confirmation
- * that you got the notify successor message. 
+ * Acknowledge receiving ACT MALICIOUS request
  */
-#define GNUNET_MESSAGE_TYPE_XDHT_P2P_NOTIFY_SUCCESSOR_CONFIRMATION 893
+#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_ACT_MALICIOUS_OK  894
+
+#endif
 /*******************************************************************************/
 
 /**
- * Next available: 903
+ * Next available: 904
  */
 
 /**