diff --git a/router/java/build.xml b/router/java/build.xml
index 39325c71e..f17532b5f 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -133,8 +133,8 @@
-
-
+
+
@@ -223,6 +223,11 @@
+
+
+
+
+
diff --git a/router/java/test/junit/net/i2p/data/i2np/DatabaseStoreMessageTest.java b/router/java/test/junit/net/i2p/data/i2np/DatabaseStoreMessageTest.java
index 9c42ee4f5..ed41583e5 100644
--- a/router/java/test/junit/net/i2p/data/i2np/DatabaseStoreMessageTest.java
+++ b/router/java/test/junit/net/i2p/data/i2np/DatabaseStoreMessageTest.java
@@ -25,10 +25,9 @@ public class DatabaseStoreMessageTest extends StructureTest {
public DataStructure createDataStructure() throws DataFormatException {
DatabaseStoreMessage msg = new DatabaseStoreMessage(I2PAppContext.getGlobalContext());
RouterInfo info = (RouterInfo)new RouterInfoTest().createDataStructure();
- msg.setKey(info.getIdentity().getHash());
msg.setMessageExpiration(Clock.getInstance().now());
msg.setUniqueId(666);
- msg.setRouterInfo(info);
+ msg.setEntry(info);
return msg;
}
diff --git a/router/java/test/junit/net/i2p/router/SSUDemo.java b/router/java/test/junit/net/i2p/router/SSUDemo.java
index a1972094a..30db9d173 100644
--- a/router/java/test/junit/net/i2p/router/SSUDemo.java
+++ b/router/java/test/junit/net/i2p/router/SSUDemo.java
@@ -271,7 +271,7 @@ public class SSUDemo {
// is registered as
DatabaseStoreMessage m = (DatabaseStoreMessage)_msg;
try {
- _us.netDb().store(m.getKey(), m.getRouterInfo());
+ _us.netDb().store(m.getKey(), (RouterInfo) m.getEntry());
} catch (IllegalArgumentException iae) {
iae.printStackTrace();
}
diff --git a/router/java/test/junit/net/i2p/router/SubmitMessageHistoryJob.java b/router/java/test/junit/net/i2p/router/SubmitMessageHistoryJob.java
deleted file mode 100644
index 19c8173b7..000000000
--- a/router/java/test/junit/net/i2p/router/SubmitMessageHistoryJob.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package net.i2p.router;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import net.i2p.router.transport.BandwidthLimitedInputStream;
-import net.i2p.util.HTTPSendData;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Job that, if its allowed to, will submit the data gathered by the MessageHistory
- * component to some URL so that the network can be debugged more easily. By default
- * it does not submit any data or touch the message history file, but if the router
- * has the line "router.submitHistory=true", it will send the file that the
- * MessageHistory component is configured to write to once an hour, post it to
- * http://i2p.net/cgi-bin/submitMessageHistory, and then delete that file
- * locally. This should only be used if the MessageHistory component is configured to
- * gather data (via "router.keepHistory=true").
- *
- */
-public class SubmitMessageHistoryJob extends JobImpl {
- private Log _log;
-
- /** default submitting data every hour */
- private final static long DEFAULT_REQUEUE_DELAY = 60*60*1000;
- /**
- * router config param for whether we want to autosubmit (and delete) the
- * history data managed by MessageHistory
- */
- public final static String PARAM_SUBMIT_DATA = "router.submitHistory";
- /** default value for whether we autosubmit the data */
- public final static boolean DEFAULT_SUBMIT_DATA = true;
- /** where the data should be submitted to (via HTTP POST) */
- public final static String PARAM_SUBMIT_URL = "router.submitHistoryURL";
- /** default location */
- public final static String DEFAULT_SUBMIT_URL = "http://i2p.net/cgi-bin/submitMessageHistory";
-
- public SubmitMessageHistoryJob(RouterContext context) {
- super(context);
- _log = context.logManager().getLog(SubmitMessageHistoryJob.class);
- }
-
- public void runJob() {
- if (shouldSubmit()) {
- submit();
- } else {
- _log.debug("Not submitting data");
- // if we didn't submit we can just requeue
- requeue(getRequeueDelay());
- }
- }
-
- /**
- * We don't want this to be run within the jobqueue itself, so fire off a new thread
- * to do the actual submission, enqueueing a new submit job when its done
- */
- private void submit() {
- I2PThread t = new I2PThread(new Runnable() {
- public void run() {
- _log.debug("Submitting data");
- getContext().messageHistory().setPauseFlushes(true);
- String filename = getContext().messageHistory().getFilename();
- send(filename);
- getContext().messageHistory().setPauseFlushes(false);
- Job job = new SubmitMessageHistoryJob(getContext());
- job.getTiming().setStartAfter(getContext().clock().now() + getRequeueDelay());
- getContext().jobQueue().addJob(job);
- }
- });
- t.setName("SubmitData");
- t.setPriority(I2PThread.MIN_PRIORITY);
- t.setDaemon(true);
- t.start();
- }
-
- private void send(String filename) {
- String url = getURL();
- try {
- File dataFile = new File(filename);
- if (!dataFile.exists() || !dataFile.canRead()) {
- _log.warn("Unable to read the message data file [" + dataFile.getAbsolutePath() + "]");
- return;
- }
- long size = dataFile.length();
- FileInputStream fin = new FileInputStream(dataFile);
- BandwidthLimitedInputStream in = new BandwidthLimitedInputStream(getContext(), fin, null, true);
- boolean sent = HTTPSendData.postData(url, size, in);
- fin.close();
- boolean deleted = dataFile.delete();
- _log.debug("Submitted " + size + " bytes? " + sent + " and deleted? " + deleted);
- } catch (IOException ioe) {
- _log.error("Error sending the data", ioe);
- }
- }
-
- private String getURL() {
- String str = getContext().router().getConfigSetting(PARAM_SUBMIT_URL);
- if ( (str == null) || (str.trim().length() <= 0) )
- return DEFAULT_SUBMIT_URL;
- else
- return str.trim();
- }
-
- private boolean shouldSubmit() {
- String str = getContext().router().getConfigSetting(PARAM_SUBMIT_DATA);
- if (str == null) {
- _log.debug("History submit config not specified [" + PARAM_SUBMIT_DATA + "], default = " + DEFAULT_SUBMIT_DATA);
- return DEFAULT_SUBMIT_DATA;
- } else {
- _log.debug("History submit config specified [" + str + "]");
- }
- return Boolean.TRUE.toString().equals(str);
- }
- private long getRequeueDelay() { return DEFAULT_REQUEUE_DELAY; }
- public String getName() { return "Submit Message History"; }
-}
diff --git a/router/java/test/junit/net/i2p/router/message/SendGarlicJob.java b/router/java/test/junit/net/i2p/router/message/SendGarlicJob.java
index fb2c363e2..491b57efd 100644
--- a/router/java/test/junit/net/i2p/router/message/SendGarlicJob.java
+++ b/router/java/test/junit/net/i2p/router/message/SendGarlicJob.java
@@ -78,7 +78,8 @@ public class SendGarlicJob extends JobImpl {
public void runJob() {
long before = getContext().clock().now();
- _message = GarlicMessageBuilder.buildMessage(getContext(), _config, _wrappedKey, _wrappedTags);
+ _message = GarlicMessageBuilder.buildMessage(getContext(), _config, _wrappedKey, _wrappedTags,
+ getContext().sessionKeyManager());
long after = getContext().clock().now();
if ( (after - before) > 1000) {
if (_log.shouldLog(Log.WARN))
diff --git a/router/java/test/junit/net/i2p/router/networkdb/kademlia/KBucketImplTest.java b/router/java/test/junit/net/i2p/router/networkdb/kademlia/KBucketImplTest.java
index 25541a070..185ff21d0 100644
--- a/router/java/test/junit/net/i2p/router/networkdb/kademlia/KBucketImplTest.java
+++ b/router/java/test/junit/net/i2p/router/networkdb/kademlia/KBucketImplTest.java
@@ -43,7 +43,7 @@ public class KBucketImplTest extends TestCase{
int low = 1;
int high = 2000;
- Hash local = Hash.FAKE_HASH;
+ LocalHash local = new LocalHash(Hash.FAKE_HASH);
local.prepareCache();
KBucketImpl bucket = new KBucketImpl(I2PAppContext.getGlobalContext(), local);
bucket.setRange(low, high);
@@ -62,7 +62,7 @@ public class KBucketImplTest extends TestCase{
byte hash[] = new byte[Hash.HASH_LENGTH];
RandomSource.getInstance().nextBytes(hash);
- Hash local = new Hash(hash);
+ LocalHash local = new LocalHash(hash);
local.prepareCache();
KBucketImpl bucket = new KBucketImpl(I2PAppContext.getGlobalContext(), local);
bucket.setRange(low, high);
@@ -74,4 +74,4 @@ public class KBucketImplTest extends TestCase{
assertTrue(bucket.shouldContain(rnd));
}
}
-}
\ No newline at end of file
+}
diff --git a/router/java/test/junit/net/i2p/router/transport/udp/UDPEndpointTest.java b/router/java/test/junit/net/i2p/router/transport/udp/UDPEndpointTest.java
index f88eac0c0..09c0c841a 100644
--- a/router/java/test/junit/net/i2p/router/transport/udp/UDPEndpointTest.java
+++ b/router/java/test/junit/net/i2p/router/transport/udp/UDPEndpointTest.java
@@ -104,7 +104,8 @@ public class UDPEndpointTest {
//try {
if (true) throw new RuntimeException("fixme");
//packet.initialize(priority, expiration, InetAddress.getLocalHost(), _endpoints[curPeer].getListenPort());
- packet.writeData(data, 0, 1024);
+ // Following method is commented out in UDPPacket
+ //packet.writeData(data, 0, 1024);
packet.getPacket().setLength(1024);
int outstanding = _sentNotReceived.size() + 1;
_sentNotReceived.add(new ByteArray(data, 0, 1024));
diff --git a/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java b/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java
index 876bf7e02..a214db4ff 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java
@@ -161,7 +161,7 @@ public class FragmentTest extends TestCase{
protected class SenderImpl implements TunnelGateway.Sender {
public long sendPreprocessed(byte[] preprocessed, TunnelGateway.Receiver receiver) {
- receiver.receiveEncrypted(preprocessed);
+ return receiver.receiveEncrypted(preprocessed);
}
}
protected class ReceiverImpl implements TunnelGateway.Receiver {
@@ -174,6 +174,7 @@ public class FragmentTest extends TestCase{
public long receiveEncrypted(byte[] encrypted) {
_handler.receiveTunnelMessage(encrypted, 0, encrypted.length);
try { Thread.sleep(_delay); } catch (Exception e) {}
+ return -1; // or do we need to return the real message ID?
}
@Override
public Hash getSendTo() {
diff --git a/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java b/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java
index d7590330b..309740f19 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java
@@ -171,6 +171,7 @@ public class InboundGatewayTest extends TestCase{
_handler.receiveTunnelMessage(encrypted, 0, encrypted.length);
+ return -1; // or do we need to return the real message ID?
}
public void receiveComplete(I2NPMessage msg, Hash toRouter, TunnelId toTunnel) {
_received.add(msg);
diff --git a/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java b/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java
index bbc13476a..208a6ba9a 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java
@@ -166,6 +166,7 @@ public class OutboundGatewayTest extends TestCase{
_handler.receiveTunnelMessage(encrypted, 0, encrypted.length);
+ return -1; // or do we need to return the real message ID?
}
public void receiveComplete(I2NPMessage msg, Hash toRouter, TunnelId toTunnel) {
_received.add(msg);