forked from I2P_Developers/i2p.i2p
fix unit test compile
This commit is contained in:
@@ -42,9 +42,9 @@ class LocalClientConnectionRunner extends ClientConnectionRunner {
|
|||||||
* don't instantiate a RequestLeaseSetJob
|
* don't instantiate a RequestLeaseSetJob
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
void requestLeaseSet(LeaseSet set, long expirationTime, Job onCreateJob, Job onFailedJob) {
|
void requestLeaseSet(Hash h, LeaseSet set, long expirationTime, Job onCreateJob, Job onFailedJob) {
|
||||||
RequestVariableLeaseSetMessage msg = new RequestVariableLeaseSetMessage();
|
RequestVariableLeaseSetMessage msg = new RequestVariableLeaseSetMessage();
|
||||||
msg.setSessionId(getSessionId());
|
msg.setSessionId(getSessionId(h));
|
||||||
for (int i = 0; i < set.getLeaseCount(); i++) {
|
for (int i = 0; i < set.getLeaseCount(); i++) {
|
||||||
Lease lease = set.getLease(i);
|
Lease lease = set.getLease(i);
|
||||||
msg.addEndpoint(lease);
|
msg.addEndpoint(lease);
|
||||||
@@ -60,12 +60,12 @@ class LocalClientConnectionRunner extends ClientConnectionRunner {
|
|||||||
* No job queue, so super NPEs
|
* No job queue, so super NPEs
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
void updateMessageDeliveryStatus(MessageId id, long messageNonce, int status) {
|
void updateMessageDeliveryStatus(Destination dest, MessageId id, long messageNonce, int status) {
|
||||||
if (messageNonce <= 0)
|
if (messageNonce <= 0)
|
||||||
return;
|
return;
|
||||||
MessageStatusMessage msg = new MessageStatusMessage();
|
MessageStatusMessage msg = new MessageStatusMessage();
|
||||||
msg.setMessageId(id.getMessageId());
|
msg.setMessageId(id.getMessageId());
|
||||||
msg.setSessionId(getSessionId().getSessionId());
|
msg.setSessionId(getSessionId(dest.calculateHash()).getSessionId());
|
||||||
// has to be >= 0, it is initialized to -1
|
// has to be >= 0, it is initialized to -1
|
||||||
msg.setNonce(messageNonce);
|
msg.setNonce(messageNonce);
|
||||||
msg.setSize(0);
|
msg.setSize(0);
|
||||||
|
@@ -58,12 +58,12 @@ class LocalClientManager extends ClientManager {
|
|||||||
if (runner != null) {
|
if (runner != null) {
|
||||||
runner.receiveMessage(toDest, fromDest, payload);
|
runner.receiveMessage(toDest, fromDest, payload);
|
||||||
if (sender != null)
|
if (sender != null)
|
||||||
sender.updateMessageDeliveryStatus(msgId, messageNonce, MessageStatusMessage.STATUS_SEND_SUCCESS_LOCAL);
|
sender.updateMessageDeliveryStatus(fromDest, msgId, messageNonce, MessageStatusMessage.STATUS_SEND_SUCCESS_LOCAL);
|
||||||
} else {
|
} else {
|
||||||
// remote. ignore.
|
// remote. ignore.
|
||||||
System.out.println("Message " + msgId + " is targeting a REMOTE destination - DROPPED");
|
System.out.println("Message " + msgId + " is targeting a REMOTE destination - DROPPED");
|
||||||
if (sender != null)
|
if (sender != null)
|
||||||
sender.updateMessageDeliveryStatus(msgId, messageNonce, MessageStatusMessage.STATUS_SEND_GUARANTEED_FAILURE);
|
sender.updateMessageDeliveryStatus(fromDest, msgId, messageNonce, MessageStatusMessage.STATUS_SEND_GUARANTEED_FAILURE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -25,6 +25,7 @@ import net.i2p.data.i2cp.GetBandwidthLimitsMessage;
|
|||||||
import net.i2p.data.i2cp.HostLookupMessage;
|
import net.i2p.data.i2cp.HostLookupMessage;
|
||||||
import net.i2p.data.i2cp.HostReplyMessage;
|
import net.i2p.data.i2cp.HostReplyMessage;
|
||||||
import net.i2p.data.i2cp.I2CPMessageException;
|
import net.i2p.data.i2cp.I2CPMessageException;
|
||||||
|
import net.i2p.data.i2cp.SessionConfig;
|
||||||
import net.i2p.data.i2cp.SessionId;
|
import net.i2p.data.i2cp.SessionId;
|
||||||
import net.i2p.router.RouterContext;
|
import net.i2p.router.RouterContext;
|
||||||
|
|
||||||
@@ -43,7 +44,7 @@ class LocalClientMessageEventListener extends ClientMessageEventListener {
|
|||||||
* Immediately send a fake leaseset
|
* Immediately send a fake leaseset
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected void startCreateSessionJob() {
|
protected void startCreateSessionJob(SessionConfig config) {
|
||||||
long exp = _context.clock().now() + 10*60*1000;
|
long exp = _context.clock().now() + 10*60*1000;
|
||||||
LeaseSet ls = new LeaseSet();
|
LeaseSet ls = new LeaseSet();
|
||||||
Lease lease = new Lease();
|
Lease lease = new Lease();
|
||||||
@@ -53,7 +54,7 @@ class LocalClientMessageEventListener extends ClientMessageEventListener {
|
|||||||
Date date = new Date(exp);
|
Date date = new Date(exp);
|
||||||
lease.setEndDate(date);
|
lease.setEndDate(date);
|
||||||
ls.addLease(lease);
|
ls.addLease(lease);
|
||||||
_runner.requestLeaseSet(ls, exp, null, null);
|
_runner.requestLeaseSet(config.getDestination().calculateHash(), ls, exp, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user