echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix unit tests broken by previous checkin

Browse Source
This commit is contained in:
zzz
2013-10-18 19:58:39 +00:00
parent bdd9900d0d
commit 012e999354
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
router/java/test/junit/net/i2p/router/SSUDemo.java
View File

@ -186,16 +186,12 @@ public class SSUDemo {
} }
private void newPeerRead(RouterInfo ri) { private void newPeerRead(RouterInfo ri) {
OutNetMessage out = new OutNetMessage(_us); FooMessage data = new FooMessage(_us, new byte[] { 0x0, 0x1, 0x2, 0x3 });
// _us.clock() is an ntp synchronized clock. give up on sending this message // _us.clock() is an ntp synchronized clock. give up on sending this message
// if it doesn't get ACKed within the next 10 seconds // if it doesn't get ACKed within the next 10 seconds
out.setExpiration(_us.clock().now() + 10*1000); OutNetMessage out = new OutNetMessage(_us, data, _us.clock().now() + 10*1000, 100, ri);
out.setPriority(100);
out.setTarget(ri);
FooMessage data = new FooMessage(_us, new byte[] { 0x0, 0x1, 0x2, 0x3 });
System.out.println("SEND: " + Base64.encode(data.getData()) + " to " + System.out.println("SEND: " + Base64.encode(data.getData()) + " to " +
ri.getIdentity().calculateHash()); ri.getIdentity().calculateHash());
out.setMessage(data);
// job fired if we can't contact them, or if it takes too long to get an ACK // job fired if we can't contact them, or if it takes too long to get an ACK
out.setOnFailedSendJob(null); out.setOnFailedSendJob(null);
// job fired once the transport gets a full ACK of the message // job fired once the transport gets a full ACK of the message

6
router/java/test/junit/net/i2p/router/message/SendGarlicJob.java
View File

@ -106,17 +106,13 @@ public class SendGarlicJob extends JobImpl {
} }
private void sendGarlic() { private void sendGarlic() {
OutNetMessage msg = new OutNetMessage(getContext());
long when = _message.getMessageExpiration(); // + Router.CLOCK_FUDGE_FACTOR; long when = _message.getMessageExpiration(); // + Router.CLOCK_FUDGE_FACTOR;
msg.setExpiration(when); OutNetMessage msg = new OutNetMessage(getContext(), _message, when, _priority, _config.getRecipient());
msg.setMessage(_message);
msg.setOnFailedReplyJob(_onReplyFailed); msg.setOnFailedReplyJob(_onReplyFailed);
msg.setOnFailedSendJob(_onSendFailed); msg.setOnFailedSendJob(_onSendFailed);
msg.setOnReplyJob(_onReply); msg.setOnReplyJob(_onReply);
msg.setOnSendJob(_onSend); msg.setOnSendJob(_onSend);
msg.setPriority(_priority);
msg.setReplySelector(_replySelector); msg.setReplySelector(_replySelector);
msg.setTarget(_config.getRecipient());
//_log.info("Sending garlic message to [" + _config.getRecipient() + "] encrypted with " + _config.getRecipientPublicKey() + " or " + _config.getRecipient().getIdentity().getPublicKey()); //_log.info("Sending garlic message to [" + _config.getRecipient() + "] encrypted with " + _config.getRecipientPublicKey() + " or " + _config.getRecipient().getIdentity().getPublicKey());
//_log.debug("Garlic config data:\n" + _config); //_log.debug("Garlic config data:\n" + _config);
//msg.setTarget(_target); //msg.setTarget(_target);

6
router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java
View File

@ -83,14 +83,10 @@ class UDPFlooder implements Runnable {
m.setMessageExpiration(_context.clock().now() + 10*1000); m.setMessageExpiration(_context.clock().now() + 10*1000);
m.setUniqueId(_context.random().nextLong(I2NPMessage.MAX_ID_VALUE)); m.setUniqueId(_context.random().nextLong(I2NPMessage.MAX_ID_VALUE));
if (true) { if (true) {
OutNetMessage msg = new OutNetMessage(_context);
msg.setMessage(m);
msg.setExpiration(m.getMessageExpiration());
msg.setPriority(500);
RouterInfo to = _context.netDb().lookupRouterInfoLocally(peer.getRemotePeer()); RouterInfo to = _context.netDb().lookupRouterInfoLocally(peer.getRemotePeer());
if (to == null) if (to == null)
continue; continue;
msg.setTarget(to); OutNetMessage msg = new OutNetMessage(_context, m, m.getMessageExpiration(), 500, to);
// warning, getStatLog() can be null // warning, getStatLog() can be null
//_context.statManager().getStatLog().addData(peer.getRemotePeer().toBase64().substring(0,6), "udp.floodDataSent", 1, 0); //_context.statManager().getStatLog().addData(peer.getRemotePeer().toBase64().substring(0,6), "udp.floodDataSent", 1, 0);