- adapted source tree structure to gradle/maven conventions

- added gradle wrapper
- fixes to adapt to GNUnet changes (new time unit, ...)
- helper process in util
- started implementing testbed
- skeleton for voting tools
- use new mq api
- implemented some more transport api
- mesh

17 files changed, 1290 insertions, 0 deletions

diff --git a/src/main/java/org/gnunet/dht/BlockType.java b/src/main/java/org/gnunet/dht/BlockType.java
new file mode 100644
index 0000000..cf00d38
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/BlockType.java
@@ -0,0 +1,81 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+/**
+ * Information on how to interpret a block of data.
+ */
+public enum BlockType {
+    /**
+     * Any type of block, used as a wildcard when searching.  Should
+     * never be attached to a specific block.
+     */
+    ANY(0),
+    /**
+     * Data block (leaf) in the CHK tree.
+     */
+    DBLOCK(1),
+    /**
+     * Inner block in the CHK tree.
+     */
+    IBLOCK(2),
+    /**
+     * Type of a block representing a keyword search result.  Note that
+     * the values for KBLOCK, SBLOCK and NBLOCK must be consecutive.
+     */
+    KBLOCK(3),
+    /**
+     * Type of a block that is used to advertise content in a namespace.
+     */
+    SBLOCK(4),
+    /**
+     * Type of a block that is used to advertise a namespace.
+     */
+    NBLOCK(5),
+    /**
+     * Type of a block representing a block to be encoded on demand from disk.
+     * Should never appear on the network directly.
+     */
+    FS_ONDEMAND(6),
+    /**
+     * Type of a block that contains a HELLO for a peer (for
+     * DHT find-peer operations).
+     */
+    DHT_HELLO(7),
+    /**
+     * Block for testing.
+     */
+    TEST(8),
+    /**
+     * Block for storing .gnunet-domains
+     */
+    DNS(10),
+    /**
+     * Block for storing record data
+     */
+    NAMERECORD(11);
+
+    public final int val;
+
+    BlockType(int val) {
+        this.val = val;
+    }
+}
diff --git a/src/main/java/org/gnunet/dht/ClientGetMessage.java b/src/main/java/org/gnunet/dht/ClientGetMessage.java
new file mode 100644
index 0000000..cd317fb
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/ClientGetMessage.java
@@ -0,0 +1,51 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+/**
+* Created with IntelliJ IDEA.
+* User: dold
+* Date: 5/2/12
+* Time: 7:05 PM
+* To change this template use File | Settings | File Templates.
+*/
+@UnionCase(143)
+public class ClientGetMessage implements GnunetMessage.Body {
+    /**
+     * Combination of RouteOption.*
+     */
+    @UInt32
+    public int options;
+    @UInt32
+    public int desiredReplicationLevel;
+    @UInt32
+    public int type;
+    @NestedMessage
+    public HashCode key;
+    @UInt64
+    public long uniqueId;
+    @FillWith @UInt8
+    public byte[] xquery;
+}
diff --git a/src/main/java/org/gnunet/dht/ClientGetStopMessage.java b/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
new file mode 100644
index 0000000..4cdee12
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
@@ -0,0 +1,45 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+/**
+* Created with IntelliJ IDEA.
+* User: dold
+* Date: 5/2/12
+* Time: 7:05 PM
+* To change this template use File | Settings | File Templates.
+*/
+@UnionCase(144)
+public class ClientGetStopMessage implements GnunetMessage.Body {
+    @UInt32
+    public int reserved = 0;
+    @UInt64
+    public long unique_id;
+    @NestedMessage
+    public HashCode key;
+}
diff --git a/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java b/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java
new file mode 100644
index 0000000..45bbe60
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java
@@ -0,0 +1,38 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+
+@UnionCase(155)
+public class ClientPutConfirmationMessage implements GnunetMessage.Body {
+    @UInt32
+    public int reserved;
+    /**
+     * UID used to identify request with the response
+     */
+    @UInt64
+    public long uid;
+}
diff --git a/src/main/java/org/gnunet/dht/ClientPutMessage.java b/src/main/java/org/gnunet/dht/ClientPutMessage.java
new file mode 100644
index 0000000..4b63e92
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/ClientPutMessage.java
@@ -0,0 +1,54 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+
+@UnionCase(142)
+public class ClientPutMessage implements GnunetMessage.Body {
+    /**
+     * Type of data to insert, one of BlockType.*
+     */
+    @UInt32
+    public int type;
+    /**
+     * Combination of RouteOption.*
+     */
+    @UInt32
+    public int options;
+    @UInt32
+    public int desiredReplicationLevel;
+    /**
+     * UID used to identify request with the response
+     */
+    @UInt64
+    public long uid;
+    @NestedMessage
+    public AbsoluteTimeMessage expiration;
+    @NestedMessage
+    public HashCode hash;
+    @FillWith @UInt8
+    public byte[] data;
+}
diff --git a/src/main/java/org/gnunet/dht/ClientResultMessage.java b/src/main/java/org/gnunet/dht/ClientResultMessage.java
new file mode 100644
index 0000000..fab614f
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/ClientResultMessage.java
@@ -0,0 +1,56 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+/**
+* Created with IntelliJ IDEA.
+* User: dold
+* Date: 5/2/12
+* Time: 7:06 PM
+* To change this template use File | Settings | File Templates.
+*/
+@UnionCase(145)
+public class ClientResultMessage implements GnunetMessage.Body {
+    @UInt32
+    public int type;
+    @UInt32
+    public int putPathLength;
+    @UInt32
+    public int getPathLength;
+    @UInt64
+    public long uid;
+    @NestedMessage
+    public AbsoluteTimeMessage expiration;
+    @NestedMessage
+    public HashCode key;
+    @VariableSizeArray(lengthField = "putPathLength")
+    public PeerIdentity[] putPath;
+    @VariableSizeArray(lengthField = "getPathLength")
+    public PeerIdentity[] getPath;
+    @FillWith @UInt8
+    public byte[] data;
+}
diff --git a/src/main/java/org/gnunet/dht/DistributedHashTable.java b/src/main/java/org/gnunet/dht/DistributedHashTable.java
new file mode 100644
index 0000000..0a561bf
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/DistributedHashTable.java
@@ -0,0 +1,449 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import com.google.common.base.Charsets;
+import org.gnunet.mq.Envelope;
+import org.gnunet.requests.MatchingRequestContainer;
+import org.gnunet.requests.RequestContainer;
+import org.gnunet.requests.SequentialRequestContainer;
+import org.gnunet.util.*;
+import org.gnunet.util.getopt.Argument;
+import org.gnunet.util.getopt.ArgumentAction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+/**
+ * API for the gnunet dht service.
+ * <p/>
+ * Stores data under a key, distributed across the network.
+ * <p/>
+ */
+public class DistributedHashTable {
+    private static final Logger logger = LoggerFactory
+            .getLogger(DistributedHashTable.class);
+
+    private Client client;
+
+    /**
+     * next UID used on get/monitor requests, incremented after each use.
+     */
+    private long nextUID = 1;
+
+    private MatchingRequestContainer<Long, PutRequest> putRequests;
+    private MatchingRequestContainer<Long, GetRequest> getRequests;
+    private SequentialRequestContainer<MonitorRequest> monitorRequests;
+
+    private class PutRequest extends RequestContainer.Request {
+        public byte[] data;
+        public HashCode key;
+        public int replicationLevel;
+        public AbsoluteTime expiration;
+        public int type;
+        public Continuation cont;
+        public long uid;
+
+        public PutRequest() {
+            this.uid = nextUID++;
+        }
+
+        @Override
+        public Envelope assembleRequest() {
+            final ClientPutMessage cpm = new ClientPutMessage();
+            cpm.data = data;
+            cpm.hash = key;
+            cpm.desiredReplicationLevel = replicationLevel;
+            cpm.expiration = expiration.asMessage();
+            cpm.type = type;
+            cpm.uid = uid;
+            return new Envelope(cpm);
+        }
+
+        public void cancel() {
+        }
+    }
+
+
+    private class GetRequest extends RequestContainer.Request {
+        public long uid;
+        public HashCode key;
+        public ResultCallback cb;
+        public int type;
+        public int replication;
+        public byte[] xquery;
+
+        public GetRequest() {
+            uid = DistributedHashTable.this.nextUID++;
+        }
+
+        @Override
+        public Envelope assembleRequest() {
+            ClientGetMessage gm = new ClientGetMessage();
+            gm.desiredReplicationLevel = replication;
+            gm.type = type;
+            gm.xquery = xquery == null ? new byte[0] : xquery;
+            gm.key = key;
+            gm.uniqueId = uid;
+            return new Envelope(gm);
+        }
+        public void cancel() {
+
+        }
+    }
+
+    private class MonitorRequest extends RequestContainer.Request {
+        public int blockType;
+        public HashCode key;
+        public MonitorGetHandler getHandler;
+        public MonitorGetResponseHandler getResponseHandler;
+        public MonitorPutHandler putHandler;
+
+        @Override
+        public Envelope assembleRequest() {
+            MonitorStartStop mss = new MonitorStartStop();
+            if (key != null) {
+                mss.filter_key = 1;
+                mss.key = key;
+            } else {
+                mss.key = new HashCode();
+            }
+            if (getHandler != null) {
+                mss.get = 1;
+            }
+            if (getResponseHandler != null) {
+                mss.getResp = 1;
+            }
+            if (putHandler != null) {
+                mss.put = 1;
+            }
+            mss.type = blockType;
+            return new Envelope(mss);
+        }
+
+        public void cancel() {
+            // todo: use priority requests
+            MonitorRequest cancelRequest = new MonitorRequest();
+            cancelRequest.getHandler = null;
+            cancelRequest.getResponseHandler = null;
+            cancelRequest.putHandler = null;
+            monitorRequests.addRequest(cancelRequest);
+
+            monitorRequests.addRequest(cancelRequest);
+        }
+    }
+
+    private class DHTMessageReceiver extends RunaboutMessageReceiver {
+        public void visit(ClientPutConfirmationMessage pcm) {
+            PutRequest thePutRequest = putRequests.getRequest(pcm.uid);
+            if (thePutRequest == null) {
+                logger.warn("request UID not found");
+                return;
+            }
+            if (thePutRequest.cont != null) {
+                thePutRequest.cont.cont(true);
+            }
+        }
+
+        public void visit(ClientResultMessage rm) {
+            GetRequest theGetRequest = getRequests.getRequest(rm.uid);
+            if (theGetRequest == null) {
+                logger.warn("request UID not found");
+                return;
+            }
+            theGetRequest.cb.handleResult(AbsoluteTime.fromNetwork(rm.expiration), rm.key, null, null,
+                    BlockType.TEST,
+                    rm.data);
+        }
+
+        public void visit(MonitorGetMessage monitorGetMessage) {
+            for (MonitorRequest monitorRequest : monitorRequests.iter()) {
+                boolean type_ok = (monitorGetMessage.type == BlockType.ANY.val)
+                        || (monitorGetMessage.type == monitorRequest.blockType);
+                boolean key_ok = monitorGetMessage.key.isAllZero()
+                        || monitorGetMessage.key.equals(monitorRequest.key);
+
+                if (key_ok && type_ok && monitorRequest.getHandler != null) {
+                    monitorRequest.getHandler.onGet(monitorGetMessage.options, monitorGetMessage.type,
+                            monitorGetMessage.hop_count, monitorGetMessage.desired_replication_level, monitorGetMessage.getPath,
+                            monitorGetMessage.key);
+                }
+            }
+        }
+
+        public void visit(MonitorGetRespMessage monitorGetRespMessage) {
+            for (MonitorRequest monitorRequest : monitorRequests.iter()) {
+                boolean type_ok = (monitorGetRespMessage.type == BlockType.ANY.val)
+                        || (monitorGetRespMessage.type == monitorRequest.blockType);
+                boolean key_ok = monitorGetRespMessage.key.isAllZero()
+                        || monitorGetRespMessage.key.equals(monitorRequest.key);
+
+                if (key_ok && type_ok && monitorRequest.getResponseHandler != null) {
+                    monitorRequest.getResponseHandler.onGetResponse(
+                            monitorGetRespMessage.type,
+                            monitorGetRespMessage.getPath,
+                            monitorGetRespMessage.putPath,
+                            monitorGetRespMessage.expiration,
+                            monitorGetRespMessage.key,
+                            monitorGetRespMessage.data);
+                }
+            }
+
+        }
+
+        public void visit(MonitorPutMessage monitorPutMessage) {
+            for (MonitorRequest monitorRequest : monitorRequests.iter()) {
+                boolean type_ok = (monitorPutMessage.type == BlockType.ANY.val)
+                        || (monitorPutMessage.type == monitorRequest.blockType);
+                boolean key_ok = monitorPutMessage.key.isAllZero()
+                        || monitorPutMessage.key.equals(monitorRequest.key);
+
+                if (key_ok && type_ok && monitorRequest.putHandler != null) {
+                    monitorRequest.putHandler.onPut(monitorPutMessage.options, monitorPutMessage.type,
+                            monitorPutMessage.hop_count, monitorPutMessage.expirationTime,
+                            monitorPutMessage.putPath, monitorPutMessage.key, monitorPutMessage.data);
+                }
+            }
+        }
+
+        @Override
+        public void handleError() {
+        }
+    }
+
+
+    /**
+     * Create a connection with the DHT service.
+     *
+     * @param cfg the configuration to use
+     */
+    public DistributedHashTable(Configuration cfg) {
+        client = new Client("dht", cfg);
+        client.installReceiver(new DHTMessageReceiver());
+        putRequests = new MatchingRequestContainer<Long, PutRequest>(client);
+        getRequests = new MatchingRequestContainer<Long, GetRequest>(client);
+        monitorRequests = new SequentialRequestContainer<MonitorRequest>(client);
+    }
+
+    /**
+     * Put data into the dht.
+     *
+     * @param key              key key to store the data under
+     * @param data             data data to store
+     * @param replicationLevel how many peers should store this value
+     * @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) {
+        PutRequest pr = new PutRequest();
+        pr.key = key;
+        pr.data = data;
+        pr.replicationLevel = replicationLevel;
+        pr.expiration = expiration;
+        pr.type = type;
+        pr.cont = cont;
+
+        putRequests.addRequest(pr.uid, pr);
+    }
+
+
+    /**
+     * Request results from the DHT.
+     *
+     * @param timeout      timeout for the request
+     * @param type         which type of data do we want to query for? (the DHT does not support TYPE_ANY)
+     * @param key          the key we want to query
+     * @param replication  how many peers do we want to ask?
+     * @param routeOptions extra routing options, null for default
+     * @param xquery       extra query parameters, defaults to null
+     * @param cb           the callback object for results or failure indication
+     * @return a handle to cancel the request
+     */
+    public Cancelable startGet(RelativeTime timeout, int type, HashCode key,
+                               int replication, EnumSet<RouteOption> routeOptions,
+                               byte[] xquery, ResultCallback cb) {
+
+        final GetRequest getRequest = new GetRequest();
+        getRequest.key = key;
+        getRequest.cb = cb;
+        getRequest.type = type;
+        getRequest.replication = type;
+        getRequest.xquery = xquery;
+
+        return getRequests.addRequest(getRequest.uid, getRequest);
+    }
+
+    public Cancelable startMonitor(int blockType, HashCode key, MonitorGetHandler getHandler,
+                                   MonitorGetResponseHandler getResponseHandler,
+                                   MonitorPutHandler putHandler) {
+        MonitorRequest monitorRequest = new MonitorRequest();
+        monitorRequest.blockType = blockType;
+        monitorRequest.key = key;
+        monitorRequest.getHandler = getHandler;
+        monitorRequest.getResponseHandler = getResponseHandler;
+        monitorRequest.putHandler = putHandler;
+
+        return monitorRequests.addRequest(monitorRequest);
+    }
+
+
+    /**
+     * Destroy the connection to the service.
+     */
+    public void destroy() {
+        // there's nothing to sync, just destroy!
+        client.disconnect();
+    }
+
+    public static void main(String[] args) {
+        new Program(args) {
+            @Argument(action = ArgumentAction.SET,
+                    shortname = "p",
+                    longname = "put",
+                    description = "set a value in the DHT; default is get")
+            boolean modePut = false;
+
+            @Argument(action = ArgumentAction.SET,
+                    shortname = "m",
+                    longname = "monitor",
+                    description = "monitor requests going to the local DHT")
+            boolean monitor = false;
+
+
+            @Argument(action = ArgumentAction.STORE_STRING,
+                    shortname = "d",
+                    longname = "data",
+                    description = "data (only used with --put)")
+            String data = null;
+
+            @Argument(action = ArgumentAction.STORE_STRING,
+                    shortname = "k",
+                    longname = "key",
+                    description = "key used for the operation")
+            String key = null;
+
+
+            // todo: implement the following options
+            /*
+            @Argument(action = ArgumentAction.STORE_STRING,
+                    shortname = "t",
+                    longname = "type",
+                    description = "type of data used in this operation")
+            String type = null;
+
+            @Argument(action = ArgumentAction.STORE_STRING,
+                    shortname = "e",
+                    longname = "expire",
+                    description = "expiration (ony use with --put)")
+            String expiration = null;
+            */
+
+
+            @Argument(action = ArgumentAction.STORE_NUMBER,
+                    shortname = "r",
+                    longname = "replication",
+                    description = "desired replication (only used with --put)")
+            int replication = 5;
+
+
+            public void run() {
+                if (modePut) {
+
+                    if (key == null) {
+                        System.out.println("key required");
+                        return;
+                    }
+
+                    if (data == null) {
+                        System.out.println("data required on put");
+                        return;
+                    }
+                    final DistributedHashTable dht = new DistributedHashTable(cfg);
+
+                    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 request sent");
+                            } else {
+                                System.out.println("error");
+                            }
+                            dht.destroy();
+                        }
+                    });
+                } else if (monitor) {
+                    final DistributedHashTable dht = new DistributedHashTable(cfg);
+                    dht.startMonitor(BlockType.TEST.val, null,
+                            new MonitorGetHandler() {
+                                @Override
+                                public void onGet(int options, int type, int hop_count,
+                                                  int desired_replication_level, PeerIdentity[] getPath, HashCode key) {
+                                    System.out.println("get monitored");
+                                }
+                            },
+                            new MonitorGetResponseHandler() {
+                                @Override
+                                public void onGetResponse(int type, PeerIdentity[] getPath, PeerIdentity[] putPath,
+                                                          AbsoluteTimeMessage expiration, HashCode key, byte[] data) {
+                                    System.out.println("get response monitored");
+                                }
+                            },
+                            new MonitorPutHandler() {
+                                @Override
+                                public void onPut(int options, int type, int hop_count, AbsoluteTimeMessage
+                                        expirationTime, PeerIdentity[] putPath, HashCode key, byte[] data) {
+                                    System.out.println("put monitored");
+                                }
+                            });
+                } else { // get
+                    if (key == null) {
+                        System.out.println("key required");
+                        return;
+                    }
+                    if (data != null) {
+                        System.out.println("get does not take data as an option");
+                        return;
+                    }
+
+                    final DistributedHashTable dht = new DistributedHashTable(cfg);
+
+                    dht.startGet(RelativeTime.SECOND, BlockType.TEST.val, new HashCode(key), replication, null,
+                            new byte[0], new ResultCallback() {
+                        @Override
+                        public void handleResult(AbsoluteTime expiration, HashCode key, List<PeerIdentity>
+                                getPath, List<PeerIdentity> putPath, BlockType type, byte[] data) {
+                            System.out.println("got result:");
+                            System.out.println(new String(data, Charsets.UTF_8));
+                        }
+                    });
+                }
+            }
+        }.start();
+    }
+}
diff --git a/src/main/java/org/gnunet/dht/MonitorGetHandler.java b/src/main/java/org/gnunet/dht/MonitorGetHandler.java
new file mode 100644
index 0000000..c7dad7c
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/MonitorGetHandler.java
@@ -0,0 +1,30 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+
+public interface MonitorGetHandler {
+    void onGet(int options, int type, int hop_count, int desired_replication_level, PeerIdentity[] getPath,
+               HashCode key);
+}
diff --git a/src/main/java/org/gnunet/dht/MonitorGetMessage.java b/src/main/java/org/gnunet/dht/MonitorGetMessage.java
new file mode 100644
index 0000000..e96ec96
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/MonitorGetMessage.java
@@ -0,0 +1,75 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.VariableSizeArray;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Message to monitor get requests going through peer, DHT service -> clients.
+ */
+@UnionCase(149)
+public class MonitorGetMessage implements GnunetMessage.Body {
+    /**
+     * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
+     */
+    @UInt32
+    public int options;
+
+    /**
+     * The type of data in the request.
+     */
+    @UInt32
+    public int type;
+
+    /**
+     * Hop count
+     */
+    @UInt32
+    public int hop_count;
+
+    /**
+     * Replication level for this message
+     */
+    @UInt32
+    public int desired_replication_level;
+
+    /**
+     * Number of peers recorded in the outgoing path from source to the
+     * storage location of this message.
+     */
+    @UInt32
+    public int get_path_length;
+
+    /**
+     * The key to store the value under.
+     */
+    @NestedMessage
+    public HashCode key;
+
+    @VariableSizeArray(lengthField = "get_path_length")
+    public PeerIdentity[] getPath;
+}
diff --git a/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java b/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
new file mode 100644
index 0000000..3bf145b
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
@@ -0,0 +1,72 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Message to monitor get results going through peer, DHT service --> clients.
+ */
+@UnionCase(150)
+public class MonitorGetRespMessage implements GnunetMessage.Body {
+    /**
+     * Content type.
+     */
+    @UInt32
+    int type;
+
+    /**
+     * Length of the PUT path that follows (if tracked).
+     */
+    @UInt32
+    int put_path_length;
+
+    /**
+     * Length of the GET path that follows (if tracked).
+     */
+    @UInt32
+    int get_path_length;
+
+    /**
+     * When does the content expire?
+     */
+    @NestedMessage
+    public AbsoluteTimeMessage expiration;
+
+    /**
+     * The key of the corresponding GET request.
+     */
+    @NestedMessage
+    public HashCode key;
+
+    @VariableSizeArray(lengthField = "put_path_length")
+    public PeerIdentity[] putPath;
+
+    @VariableSizeArray(lengthField = "get_path_length")
+    public PeerIdentity[] getPath;
+
+    @FillWith @UInt8
+    public byte[] data;
+}
diff --git a/src/main/java/org/gnunet/dht/MonitorGetResponseHandler.java b/src/main/java/org/gnunet/dht/MonitorGetResponseHandler.java
new file mode 100644
index 0000000..ff03cce
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/MonitorGetResponseHandler.java
@@ -0,0 +1,31 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+
+public interface MonitorGetResponseHandler {
+    void onGetResponse(int type, PeerIdentity[] getPath, PeerIdentity[] putPath, AbsoluteTimeMessage expiration,
+                       HashCode key, byte[] data);
+}
diff --git a/src/main/java/org/gnunet/dht/MonitorPutHandler.java b/src/main/java/org/gnunet/dht/MonitorPutHandler.java
new file mode 100644
index 0000000..0abb79b
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/MonitorPutHandler.java
@@ -0,0 +1,31 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+
+public interface MonitorPutHandler {
+    void onPut(int options, int type, int hop_count, AbsoluteTimeMessage expirationTime, PeerIdentity[] putPath,
+               HashCode key, byte[] data);
+}
diff --git a/src/main/java/org/gnunet/dht/MonitorPutMessage.java b/src/main/java/org/gnunet/dht/MonitorPutMessage.java
new file mode 100644
index 0000000..103c05b
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/MonitorPutMessage.java
@@ -0,0 +1,82 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Message to monitor put requests going through peer, DHT service --> clients.
+ */
+@UnionCase(151)
+public class MonitorPutMessage implements GnunetMessage.Body {
+    /**
+     * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
+     */
+    @UInt32
+    public int options;
+
+    /**
+     * The type of data in the request.
+     */
+    @UInt32
+    public int type;
+
+    /**
+     * Hop count so far.
+     */
+    @UInt32
+    public int hop_count;
+
+    /**
+     * Replication level for this message
+     */
+    @UInt32
+    public int desired_replication_level;
+
+    /**
+     * Number of peers recorded in the outgoing path from source to the
+     * storage location of this message.
+     */
+    @UInt32
+    public int put_path_length;
+
+    /**
+     * How long should this data persist?
+     */
+    @NestedMessage
+    public AbsoluteTimeMessage expirationTime;
+
+    /**
+     * The key to store the value under.
+     */
+    @NestedMessage
+    public HashCode key;
+
+    @VariableSizeArray(lengthField = "put_path_length")
+    public PeerIdentity[] putPath;
+
+    @FillWith @UInt8
+    public byte[] data;
+}
diff --git a/src/main/java/org/gnunet/dht/MonitorStartStop.java b/src/main/java/org/gnunet/dht/MonitorStartStop.java
new file mode 100644
index 0000000..b3f3268
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/MonitorStartStop.java
@@ -0,0 +1,70 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt16;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+/**
+ * Message to request monitoring messages, clients --> DHT service.
+ */
+@UnionCase(153)
+public class MonitorStartStop implements GnunetMessage.Body {
+    /**
+     * The type of data desired, GNUNET_BLOCK_TYPE_ANY for all.
+     */
+    @UInt32
+    public int type;
+
+    /**
+     * Flag whether to notify about GET messages.
+     */
+    @UInt16
+    public int get;
+
+    /**
+     * Flag whether to notify about GET_REPONSE messages.
+     */
+    @UInt16
+    public int getResp;
+
+    /**
+     * Flag whether to notify about PUT messages.
+     */
+    @UInt16
+    public int put;
+
+    /**
+     * Flag whether to use the provided key to filter messages.
+     */
+    @UInt16
+    public int filter_key;
+
+    /*
+    The key to filter messages by.
+     */
+    @NestedMessage
+    public HashCode key;
+}
diff --git a/src/main/java/org/gnunet/dht/ResultCallback.java b/src/main/java/org/gnunet/dht/ResultCallback.java
new file mode 100644
index 0000000..fa5c7ef
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/ResultCallback.java
@@ -0,0 +1,46 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+import org.gnunet.util.AbsoluteTime;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+import java.util.List;
+
+/**
+ * Callback object for requests to the dht
+ */
+public interface ResultCallback {
+    /**
+     * Called when the dht returns a result
+     *
+     * @param expiration expiration of the returned entry
+     * @param key        key of the returned entry
+     * @param getPath    put path of the returned entry
+     * @param putPath    put path of the returned entry
+     * @param type       type of data in the entry
+     * @param data       data of the returned entry
+     */
+    public void handleResult(AbsoluteTime expiration, HashCode key,
+                             List<PeerIdentity> getPath, List<PeerIdentity> putPath,
+                             BlockType type, byte[] data);
+}
diff --git a/src/main/java/org/gnunet/dht/RouteOption.java b/src/main/java/org/gnunet/dht/RouteOption.java
new file mode 100644
index 0000000..b74b528
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/RouteOption.java
@@ -0,0 +1,55 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+package org.gnunet.dht;
+
+/**
+ * Options passed to the dht service for routing requests.
+ */
+enum RouteOption {
+    /**
+     * Default.  Do nothing special.
+     */
+    NONE(0),
+    /**
+     * Each peer along the way should look at 'enc' (otherwise
+     * only the k-peers closest to the key should look at it).
+     */
+    DEMULTIPLEX_EVERYWHERE(1),
+    /**
+     * We should keep track of the route that the message
+     * took in the P2P network.
+     */
+    RECORD_ROUTE(2),
+    /**
+     * This is a 'FIND-PEER' request, so approximate results are fine.
+     */
+    FIND_PEER(4),
+    /**
+     * Possible message option for query key randomization.
+     */
+    BART(8);
+
+    private int val;
+
+    RouteOption(int val) {
+        this.val = val;
+    }
+}
diff --git a/src/main/java/org/gnunet/dht/package-info.java b/src/main/java/org/gnunet/dht/package-info.java
new file mode 100644
index 0000000..3d8c6ed
--- /dev/null
+++ b/src/main/java/org/gnunet/dht/package-info.java
@@ -0,0 +1,24 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+/**
+ * API for the gnunet dht service.
+ */
+package org.gnunet.dht;