[GNUnet-SVN] r32964 - in gnunet-java: . doc src/main/java/org/gnunet/dht src/main/java/org/gnunet/gns src/main/java/org/gnunet/identity src/main/java/org/gnunet/mesh src/main/java/org/gnunet/statistics src/main/java/org/gnunet/util src/main/resources/org/gnunet/construct src/test/java/org/gnunet/dht src/test/java/org/gnunet/mesh

[gnunet]

Author: dold
Date: 2014-04-08 11:11:10 +0200 (Tue, 08 Apr 2014)
New Revision: 32964

Modified:
   gnunet-java/build.gradle
   gnunet-java/doc/gnunet-java-tutorial.tex
   gnunet-java/src/main/java/org/gnunet/dht/DistributedHashTable.java
   gnunet-java/src/main/java/org/gnunet/dht/RouteOption.java
   gnunet-java/src/main/java/org/gnunet/gns/Gns.java
   gnunet-java/src/main/java/org/gnunet/gns/GnsTool.java
   gnunet-java/src/main/java/org/gnunet/identity/Identity.java
   gnunet-java/src/main/java/org/gnunet/mesh/InboundChannelHandler.java
   gnunet-java/src/main/java/org/gnunet/mesh/Mesh.java
   gnunet-java/src/main/java/org/gnunet/statistics/StatisticsTool.java
   gnunet-java/src/main/java/org/gnunet/util/Service.java
   gnunet-java/src/main/resources/org/gnunet/construct/MsgMap.txt
   gnunet-java/src/test/java/org/gnunet/dht/DHTTest.java
   gnunet-java/src/test/java/org/gnunet/mesh/MeshTest.java
Log:
fixes

Modified: gnunet-java/build.gradle
===================================================================
--- gnunet-java/build.gradle    2014-04-08 09:10:48 UTC (rev 32963)
+++ gnunet-java/build.gradle    2014-04-08 09:11:10 UTC (rev 32964)
@@ -87,34 +87,9 @@
     beforeTest{ descr ->
         logger.warn("Starting test ${descr.className} : ${descr.name}")    
     }
-    useJUnit {
-      excludeCategories 'org.gnunet.testcat.ExpensiveTests'
-      excludeCategories 'org.gnunet.testcat.ExperimentalTests'
-    }
 }
 
-task testExpensive(type: Test) {
-    // Print test name, so that we can easily find out
-    // which test does not terminate.
-    beforeTest{ descr ->
-        logger.warn("Starting expensive test ${descr.className} : 
${descr.name}")    
-    }
-    useJUnit {
-      excludeCategories 'org.gnunet.testcat.ExperimentalTests'
-    }
-}
 
-task testExperimental(type: Test) {
-    // Print test name, so that we can easily find out
-    // which test does not terminate.
-    beforeTest{ descr ->
-        logger.warn("Starting experimental test ${descr.className} : 
${descr.name}")    
-    }
-    useJUnit {
-      includeCategories 'org.gnunet.testcat.ExperimentalTes'
-    }
-}
-
 task copyDeps(type: Copy) {
   into "$projectDir/lib"
   from configurations.runtime
@@ -157,3 +132,4 @@
 
 
 javadoc.exclude '**/messages/**'
+

Modified: gnunet-java/doc/gnunet-java-tutorial.tex
===================================================================
--- gnunet-java/doc/gnunet-java-tutorial.tex    2014-04-08 09:10:48 UTC (rev 
32963)
+++ gnunet-java/doc/gnunet-java-tutorial.tex    2014-04-08 09:11:10 UTC (rev 
32964)
@@ -85,7 +85,7 @@
 ask Gradle for the classpath pointing to the internal cache. However, having 
all dependencies in one folder
 is more convenient, especially when using shell wrappers for Java entry points 
later on.}.
 
-Check if if you're on the right track by running the Java client for GNUnet's 
network size estimation service:
+Check if you're on the right track by running the Java client for GNUnet's 
network size estimation service:
 \begin{lstlisting}[language=bash]
 \$ java -cp 'lib/*' org.gnunet.nse.NetworkSizeEstimation
 \end{lstlisting}

Modified: gnunet-java/src/main/java/org/gnunet/dht/DistributedHashTable.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/DistributedHashTable.java  
2014-04-08 09:10:48 UTC (rev 32963)
+++ gnunet-java/src/main/java/org/gnunet/dht/DistributedHashTable.java  
2014-04-08 09:11:10 UTC (rev 32964)
@@ -66,6 +66,7 @@
         public int type;
         public Continuation cont;
         public long uid;
+        private int options;
 
         public PutRequest() {
             this.uid = nextUID++;
@@ -80,6 +81,7 @@
             cpm.expiration = expiration.asMessage();
             cpm.type = type;
             cpm.uid = uid;
+            cpm.options = options;
             return new Envelope(cpm);
         }
 
@@ -95,6 +97,7 @@
         public int type;
         public int replication;
         public byte[] xquery;
+        public int options;
 
         public GetRequest() {
             uid = DistributedHashTable.this.nextUID++;
@@ -108,6 +111,7 @@
             gm.xquery = xquery == null ? new byte[0] : xquery;
             gm.key = key;
             gm.uniqueId = uid;
+            gm.options = options;
             return new Envelope(gm);
         }
         public void onCancel() {
@@ -269,6 +273,10 @@
         pr.expiration = expiration;
         pr.type = type;
         pr.cont = cont;
+        pr.options = 0;
+        for (RouteOption routeOption : routeOptions) {
+            pr.options |= routeOption.val;
+        }
 
         putRequests.addRequest(pr.uid, pr);
     }
@@ -297,6 +305,10 @@
         getRequest.replication = type;
         getRequest.xquery = xquery;
         getRequest.replication = replication;
+        getRequest.options = 0;
+        for (RouteOption routeOption : routeOptions) {
+            getRequest.options |= routeOption.val;
+        }
 
         return getRequests.addRequest(getRequest.uid, getRequest);
     }

Modified: gnunet-java/src/main/java/org/gnunet/dht/RouteOption.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/RouteOption.java   2014-04-08 
09:10:48 UTC (rev 32963)
+++ gnunet-java/src/main/java/org/gnunet/dht/RouteOption.java   2014-04-08 
09:11:10 UTC (rev 32964)
@@ -47,7 +47,7 @@
      */
     BART(8);
 
-    private int val;
+    int val;
 
     RouteOption(int val) {
         this.val = val;

Modified: gnunet-java/src/main/java/org/gnunet/gns/Gns.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/gns/Gns.java   2014-04-08 09:10:48 UTC 
(rev 32963)
+++ gnunet-java/src/main/java/org/gnunet/gns/Gns.java   2014-04-08 09:11:10 UTC 
(rev 32964)
@@ -37,7 +37,24 @@
 public class Gns {
     private static final Logger logger = LoggerFactory
             .getLogger(Gns.class);
+
     /**
+     * Defaults, look in cache, then in DHT.
+     */
+    public static final int LOOKUP_OPTION_DEFAULT = 0;
+
+    /**
+     * Never look in the DHT, keep request to local cache.
+     */
+    public static final int LOOKUP_OPTION_NO_DHT = 1;
+
+    /**
+     * For the rightmost label, only look in the cache (it
+     * is our master zone), for the others, the DHT is OK.
+     */
+    public static final int LOOKUP_OPTION_LOCAL_MASTER = 2;
+
+    /**
      * All pending and active lookup requests.
      */
     private MatchingRequestContainer<Long, 
FixedMessageRequest<LookupResultProcessor>> lookupRequests;
@@ -97,7 +114,7 @@
      * @param name the name to look up
      * @param zone zone to look in
      * @param type the GNS record type to look for
-     * @param onlyCached true to only check locally (not in the DHT)
+     * @param lookupOption a Gns.LOOKUP_OPTION_* value
      * @param shortenZoneKey the private key of the shorten zone (can be NULL);
      *                    specify to enable automatic shortening (given a PSEU
      *                    record, if a given pseudonym is not yet used in the
@@ -108,7 +125,7 @@
      */
     public Cancelable lookup(String name,
                              EcdsaPublicKey zone,
-                             long type, boolean onlyCached,
+                             long type, int lookupOption,
                              EcdsaPrivateKey shortenZoneKey,
                              LookupResultProcessor proc) {
         ClientLookupMessage m = new ClientLookupMessage();
@@ -122,10 +139,11 @@
         }
         m.id = nextUID++;
         m.name = name;
-        m.onlyCached = onlyCached ? 1 : 0;
+        m.onlyCached = lookupOption;
         m.type = type;
         m.zone = zone;
 
+
         return lookupRequests.addRequest(m.id, new 
FixedMessageRequest<LookupResultProcessor>(m, proc));
     }
 

Modified: gnunet-java/src/main/java/org/gnunet/gns/GnsTool.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/gns/GnsTool.java       2014-04-08 
09:10:48 UTC (rev 32963)
+++ gnunet-java/src/main/java/org/gnunet/gns/GnsTool.java       2014-04-08 
09:11:10 UTC (rev 32964)
@@ -56,7 +56,7 @@
                     public void onEgo(Identity.Ego ego) {
                         System.out.println("looking in zone " + 
ego.getPublicKey());
                         final Gns gns = new Gns(getConfiguration());
-                        gns.lookup(name, ego.getPublicKey(), typeId, false, 
null, new LookupResultProcessor() {
+                        gns.lookup(name, ego.getPublicKey(), typeId, 0, null, 
new LookupResultProcessor() {
                             @Override
                             public void process(GnsRecord[] records) {
                                 System.out.println("got " + records.length + " 
records");

Modified: gnunet-java/src/main/java/org/gnunet/identity/Identity.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/identity/Identity.java 2014-04-08 
09:10:48 UTC (rev 32963)
+++ gnunet-java/src/main/java/org/gnunet/identity/Identity.java 2014-04-08 
09:11:10 UTC (rev 32964)
@@ -326,7 +326,8 @@
      * Connect to the identity service.
      *
      * @param configuration configuration to use
-     * @param identityListCallback
+     * @param identityListCallback callback that receives initially the list 
of all egos,
+     *                             and subsequently changes to egos
      */
     public void connect(Configuration configuration, IdentityListCallback 
identityListCallback) {
         this.configuration = configuration;
@@ -449,7 +450,8 @@
 
         public void visit(final UpdateListMessage m) {
             if (m.endOfList != 0) {
-                identityListCallback.onListEnd();
+                if (null != identityListCallback)
+                    identityListCallback.onListEnd();
                 return;
             }
             if (m.nameLength == 0) {
@@ -457,18 +459,21 @@
                 if (null != e) {
                     knownEgos.remove(e);
                 }
-                identityListCallback.onEgoDelete(e);
+                if (null != identityListCallback)
+                    identityListCallback.onEgoDelete(e);
             } else {
                 Ego existingEgo = getEgoForKey(m.privateKey);
                 if (existingEgo == null) {
                     Ego ego = new Ego(m.egoName, m.privateKey);
                     knownEgos.add(ego);
-                    identityListCallback.onEgoAdd(ego);
+                    if (null != identityListCallback)
+                        identityListCallback.onEgoAdd(ego);
                 } else {
                     // rename
                     String oldName = existingEgo.name;
                     existingEgo.name = m.egoName;
-                    identityListCallback.onEgoRename(oldName, existingEgo);
+                    if (null != identityListCallback)
+                        identityListCallback.onEgoRename(oldName, existingEgo);
                 }
             }
         }

Modified: gnunet-java/src/main/java/org/gnunet/mesh/InboundChannelHandler.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mesh/InboundChannelHandler.java        
2014-04-08 09:10:48 UTC (rev 32963)
+++ gnunet-java/src/main/java/org/gnunet/mesh/InboundChannelHandler.java        
2014-04-08 09:11:10 UTC (rev 32964)
@@ -8,5 +8,5 @@
  * @author Florian Dold
  */
 public interface InboundChannelHandler {
-    void onInboundTunnel(Mesh.Channel channel, PeerIdentity initiator);
+    void onInboundChannel(Mesh.Channel channel, PeerIdentity initiator);
 }

Modified: gnunet-java/src/main/java/org/gnunet/mesh/Mesh.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mesh/Mesh.java 2014-04-08 09:10:48 UTC 
(rev 32963)
+++ gnunet-java/src/main/java/org/gnunet/mesh/Mesh.java 2014-04-08 09:11:10 UTC 
(rev 32964)
@@ -237,7 +237,7 @@
                     (m.opt & OPTION_NOBUFFER) != 0, (m.opt & OPTION_NOBUFFER) 
!= 0);
             logger.debug("inbound tunnel {}", m.tunnelId);
             if (inboundChannelHandler != null) {
-                inboundChannelHandler.onInboundTunnel(t, m.otherEnd);
+                inboundChannelHandler.onInboundChannel(t, m.otherEnd);
             }
         }
 

Modified: gnunet-java/src/main/java/org/gnunet/statistics/StatisticsTool.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/StatisticsTool.java 
2014-04-08 09:10:48 UTC (rev 32963)
+++ gnunet-java/src/main/java/org/gnunet/statistics/StatisticsTool.java 
2014-04-08 09:11:10 UTC (rev 32964)
@@ -14,13 +14,13 @@
             shortname = "x",
             longname = "set",
             action = ArgumentAction.SET,
-            description = "watch a value")
+            description = "set a value")
     boolean set;
     @Argument(
             shortname = "w",
             longname = "watch",
             action = ArgumentAction.SET,
-            description = "set a value")
+            description = "watch a value")
     boolean watch;
     @Argument(
             shortname = "n",

Modified: gnunet-java/src/main/java/org/gnunet/util/Service.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/util/Service.java      2014-04-08 
09:10:48 UTC (rev 32963)
+++ gnunet-java/src/main/java/org/gnunet/util/Service.java      2014-04-08 
09:11:10 UTC (rev 32964)
@@ -52,11 +52,9 @@
     private RelativeTime idleTimeout;
     private boolean requireFound;
 
-
-    private Cancelable sigpipeTask;
     private Pipe.SourceChannel sigpipeChannel;
 
-    public Service(String serviceName, RelativeTime idleTimeout, boolean 
requireFound, String[] args) {
+    public Service(String serviceName, RelativeTime idleTimeout, boolean 
requireFound) {
         this.serviceName = serviceName;
         this.idleTimeout = idleTimeout;
         this.requireFound = requireFound;
@@ -109,7 +107,8 @@
             Scheduler.TaskConfiguration t = new 
Scheduler.TaskConfiguration(RelativeTime.FOREVER,
                     new SigpipeTask());
             t.addSelectEvent(p.getSource(), SelectionKey.OP_READ);
-            sigpipeTask = t.schedule();
+            t.setLifeness(false);
+            t.schedule();
             sigpipeChannel = p.getSource();
         }
 
@@ -141,7 +140,7 @@
             }
             if (!stopped) {
                 Scheduler.TaskConfiguration t = new 
Scheduler.TaskConfiguration(RelativeTime.FOREVER, this);
-                sigpipeTask = t.schedule();
+                t.schedule();
             } else {
                 try {
                     sigpipeChannel.close();

Modified: gnunet-java/src/main/resources/org/gnunet/construct/MsgMap.txt
===================================================================
--- gnunet-java/src/main/resources/org/gnunet/construct/MsgMap.txt      
2014-04-08 09:10:48 UTC (rev 32963)
+++ gnunet-java/src/main/resources/org/gnunet/construct/MsgMap.txt      
2014-04-08 09:11:10 UTC (rev 32964)
@@ -34,15 +34,15 @@
 
org.gnunet.util.GnunetMessage$Body|783=org.gnunet.secretsharing.messages.SecretReadyMessage
 
org.gnunet.util.GnunetMessage$Body|780=org.gnunet.secretsharing.messages.GenerateMessage
 
org.gnunet.util.GnunetMessage$Body|781=org.gnunet.secretsharing.messages.ClientDecryptMessage
-org.gnunet.util.GnunetMessage$Body|68=org.gnunet.core.DisconnectNotifyMessage
-org.gnunet.util.GnunetMessage$Body|70=org.gnunet.core.NotifyInboundTrafficMessage
-org.gnunet.util.GnunetMessage$Body|71=org.gnunet.core.NotifyOutboundTrafficMessage
-org.gnunet.util.GnunetMessage$Body|64=org.gnunet.core.InitMessage
-org.gnunet.util.GnunetMessage$Body|65=org.gnunet.core.InitReplyMessage
-org.gnunet.util.GnunetMessage$Body|67=org.gnunet.core.ConnectNotifyMessage
-org.gnunet.util.GnunetMessage$Body|76=org.gnunet.core.SendMessage
-org.gnunet.util.GnunetMessage$Body|74=org.gnunet.core.SendMessageRequest
-org.gnunet.util.GnunetMessage$Body|75=org.gnunet.core.SendMessageReady
+org.gnunet.util.GnunetMessage$Body|68=org.gnunet.core.messages.DisconnectNotifyMessage
+org.gnunet.util.GnunetMessage$Body|70=org.gnunet.core.messages.NotifyInboundTrafficMessage
+org.gnunet.util.GnunetMessage$Body|71=org.gnunet.core.messages.NotifyOutboundTrafficMessage
+org.gnunet.util.GnunetMessage$Body|64=org.gnunet.core.messages.InitMessage
+org.gnunet.util.GnunetMessage$Body|65=org.gnunet.core.messages.InitReplyMessage
+org.gnunet.util.GnunetMessage$Body|67=org.gnunet.core.messages.ConnectNotifyMessage
+org.gnunet.util.GnunetMessage$Body|76=org.gnunet.core.messages.SendMessage
+org.gnunet.util.GnunetMessage$Body|74=org.gnunet.core.messages.SendMessageRequest
+org.gnunet.util.GnunetMessage$Body|75=org.gnunet.core.messages.SendMessageReady
 
org.gnunet.util.GnunetMessage$Body|627=org.gnunet.identity.messages.GetDefaultMessage
 
org.gnunet.util.GnunetMessage$Body|626=org.gnunet.identity.messages.UpdateListMessage
 
org.gnunet.util.GnunetMessage$Body|625=org.gnunet.identity.messages.ResultCodeMessage
@@ -53,9 +53,9 @@
 
org.gnunet.util.GnunetMessage$Body|629=org.gnunet.identity.messages.CreateRequestMessage
 org.gnunet.util.GnunetMessage$Body|321=org.gnunet.nse.StartMessage
 
org.gnunet.util.GnunetMessage$Body|628=org.gnunet.identity.messages.SetDefaultMessage
-org.gnunet.util.GnunetMessage$Body|332=org.gnunet.peerinfo.InfoMessage
-org.gnunet.util.GnunetMessage$Body|333=org.gnunet.peerinfo.InfoEnd
-org.gnunet.util.GnunetMessage$Body|331=org.gnunet.peerinfo.ListAllPeersMessage
+org.gnunet.util.GnunetMessage$Body|332=org.gnunet.peerinfo.messages.InfoMessage
+org.gnunet.util.GnunetMessage$Body|333=org.gnunet.peerinfo.messages.InfoEnd
+org.gnunet.util.GnunetMessage$Body|331=org.gnunet.peerinfo.messages.ListAllPeersMessage
 
org.gnunet.util.GnunetMessage$Body|374=org.gnunet.transport.messages.RequestConnectMessage
 
org.gnunet.util.GnunetMessage$Body|369=org.gnunet.transport.messages.BlacklistInitMessage
 
org.gnunet.util.GnunetMessage$Body|371=org.gnunet.transport.messages.BlacklistReplyMessage
@@ -64,15 +64,15 @@
 
org.gnunet.util.GnunetMessage$Body|383=org.gnunet.transport.messages.AddressIterateResponseMessage
 
org.gnunet.util.GnunetMessage$Body|366=org.gnunet.transport.messages.SetQuotaMessage
 
org.gnunet.util.GnunetMessage$Body|360=org.gnunet.transport.messages.StartMessage
-org.gnunet.util.GnunetMessage$Body|143=org.gnunet.dht.ClientGetMessage
-org.gnunet.util.GnunetMessage$Body|142=org.gnunet.dht.ClientPutMessage
-org.gnunet.util.GnunetMessage$Body|153=org.gnunet.dht.MonitorStartStop
-org.gnunet.util.GnunetMessage$Body|155=org.gnunet.dht.ClientPutConfirmationMessage
-org.gnunet.util.GnunetMessage$Body|144=org.gnunet.dht.ClientGetStopMessage
-org.gnunet.util.GnunetMessage$Body|145=org.gnunet.dht.ClientResultMessage
-org.gnunet.util.GnunetMessage$Body|149=org.gnunet.dht.MonitorGetMessage
-org.gnunet.util.GnunetMessage$Body|150=org.gnunet.dht.MonitorGetRespMessage
-org.gnunet.util.GnunetMessage$Body|151=org.gnunet.dht.MonitorPutMessage
+org.gnunet.util.GnunetMessage$Body|143=org.gnunet.dht.messages.ClientGetMessage
+org.gnunet.util.GnunetMessage$Body|142=org.gnunet.dht.messages.ClientPutMessage
+org.gnunet.util.GnunetMessage$Body|153=org.gnunet.dht.messages.MonitorStartStop
+org.gnunet.util.GnunetMessage$Body|155=org.gnunet.dht.messages.ClientPutConfirmationMessage
+org.gnunet.util.GnunetMessage$Body|144=org.gnunet.dht.messages.ClientGetStopMessage
+org.gnunet.util.GnunetMessage$Body|145=org.gnunet.dht.messages.ClientResultMessage
+org.gnunet.util.GnunetMessage$Body|149=org.gnunet.dht.messages.MonitorGetMessage
+org.gnunet.util.GnunetMessage$Body|150=org.gnunet.dht.messages.MonitorGetRespMessage
+org.gnunet.util.GnunetMessage$Body|151=org.gnunet.dht.messages.MonitorPutMessage
 
org.gnunet.util.GnunetMessage$Body|171=org.gnunet.statistics.messages.GetResponseEndMessage
 
org.gnunet.util.GnunetMessage$Body|170=org.gnunet.statistics.messages.GetResponseMessage
 
org.gnunet.util.GnunetMessage$Body|169=org.gnunet.statistics.messages.GetMessage
@@ -100,4 +100,4 @@
 
org.gnunet.util.GnunetMessage$Body|483=org.gnunet.testbed.messages.ManagePeerServiceMessage
 org.gnunet.gns.records.RecordData|65536=org.gnunet.gns.records.PkeyRecordData
 org.gnunet.gns.records.RecordData|1=org.gnunet.gns.records.ARecordData
-# generated 2014/03/30 01:11:14
+# generated 2014/04/08 10:41:17

Modified: gnunet-java/src/test/java/org/gnunet/dht/DHTTest.java
===================================================================
--- gnunet-java/src/test/java/org/gnunet/dht/DHTTest.java       2014-04-08 
09:10:48 UTC (rev 32963)
+++ gnunet-java/src/test/java/org/gnunet/dht/DHTTest.java       2014-04-08 
09:11:10 UTC (rev 32964)
@@ -42,7 +42,7 @@
 
         final DistributedHashTable dht = new 
DistributedHashTable(ts.getConfiguration());
         dht.put(new HashCode("gnj-test"), new byte[]{1, 2, 3}, 1, 
EnumSet.noneOf(RouteOption.class),
-                BlockType.TEST.val, RelativeTime.HOUR.toAbsolute(), 
RelativeTime.FOREVER, new Continuation() {
+                BlockType.TEST.val, RelativeTime.HOUR.toAbsolute(), new 
Continuation() {
             @Override
             public void cont(boolean success) {
                 putFinished.set(true);
@@ -67,7 +67,7 @@
 
         final DistributedHashTable dht = new 
DistributedHashTable(ts.getConfiguration());
         dht.put(hash1, data, 1, EnumSet.noneOf(RouteOption.class),
-                BlockType.TEST.val, RelativeTime.HOUR.toAbsolute(), 
RelativeTime.FOREVER, new Continuation() {
+                BlockType.TEST.val, RelativeTime.HOUR.toAbsolute(), new 
Continuation() {
             @Override
             public void cont(boolean success) {
                 dht.startGet(RelativeTime.FOREVER, BlockType.TEST.val, hash1, 
1, EnumSet.noneOf(RouteOption.class), null, new ResultCallback() {
@@ -114,7 +114,7 @@
         Scheduler.addDelayed(new RelativeTime(50), new Scheduler.Task() {
             @Override
             public void run(Scheduler.RunContext ctx) {
-                dht.put(hash, data1, 1, EnumSet.noneOf(RouteOption.class), 
BlockType.TEST.val, RelativeTime.HOUR.toAbsolute(), RelativeTime.FOREVER, null);
+                dht.put(hash, data1, 1, EnumSet.noneOf(RouteOption.class), 
BlockType.TEST.val, RelativeTime.HOUR.toAbsolute(), null);
             }
         });
 
@@ -122,7 +122,7 @@
         Scheduler.addDelayed(new RelativeTime(100), new Scheduler.Task() {
             @Override
             public void run(Scheduler.RunContext ctx) {
-                dht.put(hash, data2, 1, EnumSet.noneOf(RouteOption.class), 
BlockType.TEST.val, RelativeTime.HOUR.toAbsolute(), RelativeTime.FOREVER, null);
+                dht.put(hash, data2, 1, EnumSet.noneOf(RouteOption.class), 
BlockType.TEST.val, RelativeTime.HOUR.toAbsolute(), null);
             }
         });
 

Modified: gnunet-java/src/test/java/org/gnunet/mesh/MeshTest.java
===================================================================
--- gnunet-java/src/test/java/org/gnunet/mesh/MeshTest.java     2014-04-08 
09:10:48 UTC (rev 32963)
+++ gnunet-java/src/test/java/org/gnunet/mesh/MeshTest.java     2014-04-08 
09:11:10 UTC (rev 32964)
@@ -28,7 +28,7 @@
         PeerIdentity peerIdentity;
         @Override
         public void onChannelEnd(Mesh.Channel channel) {
-            Mesh.Channel<Void> myChannel = mesh1.createChannel(peerIdentity, 
42, false, true, null);
+            Mesh.Channel myChannel = mesh1.createChannel(peerIdentity, 42, 
false, true);
             myChannel.send(new TestMessage());
         }
     }
@@ -58,7 +58,7 @@
                 // second mesh handle, used to receive the message
                 final Mesh mesh2 = new Mesh(cfg, new InboundChannelHandler() {
                     @Override
-                    public void onInboundTunnel(Mesh.Channel tunnel, 
PeerIdentity initiator) {
+                    public void onInboundChannel(Mesh.Channel tunnel, 
PeerIdentity initiator) {
                         System.out.println("got inbound channel " + initiator);
                     }
                 }, new ChannelEndHandler() {
@@ -69,7 +69,7 @@
                 }, mh, 42);
                 mh.m1 = mesh1;
                 mh.m2 = mesh2;
-                Mesh.Channel<Void> channel = mesh1.createChannel(peerIdentity, 
42, false, true, null);
+                Mesh.Channel channel = mesh1.createChannel(peerIdentity, 42, 
false, true);
                 channel.send(new TestMessage());
             }
         });