1 files changed, 26 insertions, 15 deletions

diff --git a/src/main/java/org/gnunet/dht/DistributedHashTable.java b/src/main/java/org/gnunet/dht/DistributedHashTable.java
index 0246992..27bac92 100644
--- a/src/main/java/org/gnunet/dht/DistributedHashTable.java
+++ b/src/main/java/org/gnunet/dht/DistributedHashTable.java
@@ -21,6 +21,7 @@
 package org.gnunet.dht;
 
 import com.google.common.base.Charsets;
+import org.gnunet.dht.messages.*;
 import org.gnunet.mq.Envelope;
 import org.gnunet.requests.MatchingRequestContainer;
 import org.gnunet.requests.Request;
@@ -37,7 +38,7 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * API for the gnunet dht service.
+ * API for the GNUnet dht service.
  * <p/>
  * Stores data under a key, distributed across the network.
  * <p/>
@@ -230,6 +231,7 @@ public class DistributedHashTable {
 
         @Override
         public void handleError() {
+            // FIXME
         }
     }
 
@@ -256,12 +258,10 @@ public class DistributedHashTable {
      * @param routeOptions     additional options
      * @param type             type of the data to store
      * @param expiration       how long should the value be stored? TODO: what is the maximum?
-     * @param timeout          how long after we give up on storing the value?
      * @param cont             called after the put operation failed or succeeded
      */
     public void put(HashCode key, byte[] data, int replicationLevel, Set<RouteOption> routeOptions,
-                    int type, AbsoluteTime expiration,
-                    RelativeTime timeout, final Continuation cont) {
+                    int type, AbsoluteTime expiration, final Continuation cont) {
         PutRequest pr = new PutRequest();
         pr.key = key;
         pr.data = data;
@@ -296,10 +296,21 @@ public class DistributedHashTable {
         getRequest.type = type;
         getRequest.replication = type;
         getRequest.xquery = xquery;
+        getRequest.replication = replication;
 
         return getRequests.addRequest(getRequest.uid, getRequest);
     }
 
+    /**
+     * Start monitoring certain types of requests.
+     *
+     * @param blockType block type of requests we're interested in
+     * @param key key we're interested in
+     * @param getHandler listener for get requests
+     * @param getResponseHandler listener for get responses
+     * @param putHandler listener for put requests
+     * @return a handle to cancel the monitoring
+     */
     public Cancelable startMonitor(int blockType, HashCode key, MonitorGetHandler getHandler,
                                    MonitorGetResponseHandler getResponseHandler,
                                    MonitorPutHandler putHandler) {
@@ -389,17 +400,17 @@ public class DistributedHashTable {
 
                     dht.put(new HashCode(key), data.getBytes(), replication, EnumSet.of(RouteOption.NONE),
                             BlockType.TEST.val, AbsoluteTime.now().add(RelativeTime.HOUR),
-                            RelativeTime.SECOND, new Continuation() {
-                        @Override
-                        public void cont(boolean success) {
-                            if (success) {
-                                System.out.println("put getRequestIdentifier sent");
-                            } else {
-                                System.out.println("error");
-                            }
-                            dht.destroy();
-                        }
-                    });
+                            new Continuation() {
+                                @Override
+                                public void cont(boolean success) {
+                                    if (success) {
+                                        System.out.println("put getRequestIdentifier sent");
+                                    } else {
+                                        System.out.println("error");
+                                    }
+                                    dht.destroy();
+                                }
+                            });
                 } else if (monitor) {
                     final DistributedHashTable dht = new DistributedHashTable(cfg);
                     dht.startMonitor(BlockType.TEST.val, null,