NSE client almost working

12 files changed, 236 insertions, 16 deletions

diff --git a/test/org/gnunet/construct/ConstructTest.java b/test/org/gnunet/construct/ConstructTest.java
index 5c4c741..f9055ec 100644
--- a/test/org/gnunet/construct/ConstructTest.java
+++ b/test/org/gnunet/construct/ConstructTest.java
@@ -1,17 +1,10 @@
 package org.gnunet.construct;
 
-import java.math.BigInteger;
-
-import org.gnunet.messages.MessageHeader;
-import org.gnunet.messages.QueryMessage;
-import org.gnunet.messages.SimpleTestMessage;
-import org.gnunet.messages.SimpleTestMessage2;
-import org.gnunet.messages.SizeTestMessage;
-import org.gnunet.messages.StringMessage;
-import org.gnunet.messages.VarTestMessage;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.math.BigInteger;
+
 public class ConstructTest {
 
 
@@ -94,7 +87,7 @@ public class ConstructTest {
     public void test_QueryMessage() {
         QueryMessage qm = new QueryMessage();
         qm.header = new MessageHeader();
-        qm.header.type = 0x42;
+        qm.header.messageType = 0x42;
         qm.query = 0x43;
         qm.varsize = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
                 14, 15 };
@@ -105,8 +98,8 @@ public class ConstructTest {
 
         QueryMessage qm2 = Construct.parseAs(a, 0, QueryMessage.class);
 
-        Assert.assertEquals(qm.header.size, qm2.header.size);
-        Assert.assertEquals(qm.header.type, qm2.header.type);
+        Assert.assertEquals(qm.header.messageSize, qm2.header.messageSize);
+        Assert.assertEquals(qm.header.messageType, qm2.header.messageType);
         Assert.assertEquals(qm.query, qm2.query);
 
         Assert.assertArrayEquals(qm.varsize, qm2.varsize);
@@ -135,8 +128,8 @@ public class ConstructTest {
     public void test_MessageHeader() {
         MessageHeader h1 = new MessageHeader();
 
-        h1.size = 42;
-        h1.type = 52;
+        h1.messageSize = 42;
+        h1.messageType = 52;
 
         byte[] a = Construct.toBinary(h1);
 
@@ -146,7 +139,7 @@ public class ConstructTest {
 
         Assert.assertArrayEquals(a, b);
 
-        Assert.assertEquals(h1.size, h2.size);
-        Assert.assertEquals(h1.type, h2.type);
+        Assert.assertEquals(h1.messageSize, h2.messageSize);
+        Assert.assertEquals(h1.messageType, h2.messageType);
     }
 }
diff --git a/test/org/gnunet/construct/QueryMessage.java b/test/org/gnunet/construct/QueryMessage.java
new file mode 100644
index 0000000..d337c51
--- /dev/null
+++ b/test/org/gnunet/construct/QueryMessage.java
@@ -0,0 +1,14 @@
+package org.gnunet.construct;
+
+@MessageId(0x123)
+public class QueryMessage implements Message {
+
+    @Nested
+    public MessageHeader header;
+
+    @UInt8
+    public int query;
+
+    @ByteFill
+    public byte[] varsize;
+}
diff --git a/test/org/gnunet/construct/SimpleTestMessage.java b/test/org/gnunet/construct/SimpleTestMessage.java
new file mode 100644
index 0000000..0460151
--- /dev/null
+++ b/test/org/gnunet/construct/SimpleTestMessage.java
@@ -0,0 +1,17 @@
+package org.gnunet.construct;
+
+@MessageId(3210)
+public class SimpleTestMessage implements Message {
+
+    @UInt8
+    public short v1;
+
+    @UInt8
+    public short v2;
+
+    @Nested
+    public SimpleTestMessage2 mn;
+    
+    @FixedSizeArray(length=5)
+    public SimpleTestMessage2[] mns;
+}
diff --git a/test/org/gnunet/construct/SimpleTestMessage2.java b/test/org/gnunet/construct/SimpleTestMessage2.java
new file mode 100644
index 0000000..0fa4f66
--- /dev/null
+++ b/test/org/gnunet/construct/SimpleTestMessage2.java
@@ -0,0 +1,9 @@
+package org.gnunet.construct;
+
+//@MessageId(321)
+public class SimpleTestMessage2 implements Message {
+
+    @UInt32
+    public long value;
+
+}
diff --git a/test/org/gnunet/construct/SizeTestMessage.java b/test/org/gnunet/construct/SizeTestMessage.java
new file mode 100644
index 0000000..b4ef79e
--- /dev/null
+++ b/test/org/gnunet/construct/SizeTestMessage.java
@@ -0,0 +1,15 @@
+package org.gnunet.construct;
+
+@MessageId(987)
+public class SizeTestMessage implements Message {
+
+    @FrameSize
+    @UInt16
+    public long totalSize;
+
+    @UInt16
+    public long someValue;
+    
+    @ByteFill
+    public byte[] rest;
+}
diff --git a/test/org/gnunet/construct/StringMessage.java b/test/org/gnunet/construct/StringMessage.java
new file mode 100644
index 0000000..bb9f399
--- /dev/null
+++ b/test/org/gnunet/construct/StringMessage.java
@@ -0,0 +1,12 @@
+package org.gnunet.construct;
+
+public class StringMessage implements Message {
+    @UInt8
+    public int num;
+    
+    @ZeroTerminatedString
+    public String str;
+    
+    @UInt8
+    public int num2;
+}
diff --git a/test/org/gnunet/construct/VarTestMessage.java b/test/org/gnunet/construct/VarTestMessage.java
new file mode 100644
index 0000000..a0c2de7
--- /dev/null
+++ b/test/org/gnunet/construct/VarTestMessage.java
@@ -0,0 +1,9 @@
+package org.gnunet.construct;
+
+public class VarTestMessage implements Message {
+    @UInt16
+    public long length;
+    
+    @VariableSizeArray(lengthField="length")
+    public SimpleTestMessage2[] msgs;
+}
diff --git a/test/org/gnunet/services/ConfigUtil.java b/test/org/gnunet/services/ConfigUtil.java
new file mode 100644
index 0000000..0a92d9a
--- /dev/null
+++ b/test/org/gnunet/services/ConfigUtil.java
@@ -0,0 +1,52 @@
+package org.gnunet.services;
+
+import java.io.*;
+import java.net.URL;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: dold
+ * Date: 1/3/12
+ * Time: 12:17 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class ConfigUtil {
+    static File copyConfigResource(String resName) {
+        URL res = StatisticsServiceTest.class.getResource("nse.conf");
+
+        File tmpFile;
+
+        try {
+            tmpFile = File.createTempFile("cfg", null);
+        } catch (IOException e) {
+            throw new IOError(e);
+        }
+
+        FileOutputStream tmpFileStream;
+        try {
+            tmpFileStream = new FileOutputStream(tmpFile);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException("temp file deleted externally");
+        }
+
+
+        InputStream resStream;
+        try {
+            resStream = res.openStream();
+        } catch (IOException e) {
+            throw new IOError(e);
+        }
+
+        int b;
+        try {
+            while ((b=resStream.read()) != -1) {
+                tmpFileStream.write(b);
+            }
+            tmpFileStream.close();
+        } catch (IOException e) {
+            throw new IOError(e);
+        }
+
+        return tmpFile;
+    }
+}
diff --git a/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java b/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java
new file mode 100644
index 0000000..acd4cd6
--- /dev/null
+++ b/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java
@@ -0,0 +1,37 @@
+package org.gnunet.services;
+
+
+import org.gnunet.service.NetworkSizeEstimationService;
+import org.gnunet.util.Configuration;
+import org.gnunet.util.Scheduler;
+import org.junit.Test;
+
+import java.io.File;
+
+public class NetworkSizeEstimationServiceTest {
+    @Test
+    public void test_1() {
+
+        File tmpFile = ConfigUtil.copyConfigResource("nse.conf");
+
+        /*
+        Process p;
+        try {
+            String[] cmd = {"gnunet-service-statistics", "-c", tmpFile.getAbsolutePath()};
+            p = Runtime.getRuntime().exec(cmd);
+        } catch (IOException e) {
+            throw new IOError(e);
+        }
+        */
+
+        Configuration cfg = new Configuration(tmpFile.getAbsolutePath());
+
+        NetworkSizeEstimationService svc = new NetworkSizeEstimationService(cfg);
+
+        System.out.println("starting scheduler");
+
+        Scheduler.run(Scheduler.NO_TASK);
+
+        // p.destroy();
+    }
+}
diff --git a/test/org/gnunet/services/StatisticsServiceTest.java b/test/org/gnunet/services/StatisticsServiceTest.java
new file mode 100644
index 0000000..86d177f
--- /dev/null
+++ b/test/org/gnunet/services/StatisticsServiceTest.java
@@ -0,0 +1,38 @@
+package org.gnunet.services;
+
+
+import org.gnunet.service.StatisticsService;
+import org.gnunet.util.Configuration;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOError;
+import java.io.IOException;
+
+public class StatisticsServiceTest {
+
+
+
+    @Test
+    public void test_1() {
+
+        
+        File tmpFile = ConfigUtil.copyConfigResource("statistics.conf");
+
+        Process p;
+        try {
+            String[] cmd = {"gnunet-service-statistics", "-c", tmpFile.getAbsolutePath()};
+            p = Runtime.getRuntime().exec(cmd);
+        } catch (IOException e) {
+            throw new IOError(e);
+        }
+
+        Configuration cfg = new Configuration(tmpFile.getAbsolutePath());
+
+
+
+        StatisticsService s = new StatisticsService(cfg);
+
+        p.destroy();
+    }
+}
diff --git a/test/org/gnunet/services/nse.conf b/test/org/gnunet/services/nse.conf
new file mode 100644
index 0000000..da0c18a
--- /dev/null
+++ b/test/org/gnunet/services/nse.conf
@@ -0,0 +1,24 @@
+[nse]
+AUTOSTART = YES
+PORT = 2097
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-nse
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+# UNIXPATH = /tmp/test-nse-service-nse.unix
+# UNIX_MATCH_UID = YES
+# UNIX_MATCH_GID = YES
+PROOFFILE = $SERVICEHOME/.nse-proof
+HISTOGRAM = $SERVICEHOME/nse-history.log
+
+# How 'slowly' should the proof-of-work be constructed (delay
+# between rounds); sane values between 0 and ~1000.
+WORKDELAY = 5 ms
+
+# Note: changing any of the values below will make this peer
+# completely incompatible with other peers!
+INTERVAL = 1 h
+# 26 is about 10 minutes on a modern i7 (single-core)
+WORKBITS = 26
\ No newline at end of file
diff --git a/test/org/gnunet/services/statistics.conf b/test/org/gnunet/services/statistics.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/org/gnunet/services/statistics.conf