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

Ratchet: Add timeout job in OCMOSJ

Browse Source
This commit is contained in:
zzz
2020-03-29 12:04:13 +00:00
parent eeb7ea4cae
commit 0c4cf5d3cd
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
View File

@ -657,9 +657,12 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
// Per-message flag > 0 overrides per-session option // Per-message flag > 0 overrides per-session option
int tagsToSend = SendMessageOptions.getTagsToSend(sendFlags); int tagsToSend = SendMessageOptions.getTagsToSend(sendFlags);
ReplyCallback callback; ReplyCallback callback;
SendTimeoutJob eciesTimeout;
if (wantACK && _encryptionKey.getType() == EncType.ECIES_X25519) { if (wantACK && _encryptionKey.getType() == EncType.ECIES_X25519) {
callback = new ECIESReplyCallback(replyLeaseSet); eciesTimeout = new SendTimeoutJob(null, null);
callback = new ECIESReplyCallback(replyLeaseSet, eciesTimeout);
} else { } else {
eciesTimeout = null;
callback = null; callback = null;
} }
GarlicMessage msg = OutboundClientMessageJobHelper.createGarlicMessage(getContext(), token, GarlicMessage msg = OutboundClientMessageJobHelper.createGarlicMessage(getContext(), token,
@ -697,6 +700,11 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
onReply = new SendSuccessJob(sessKey, tsh, replyLeaseSet, onFail); onReply = new SendSuccessJob(sessKey, tsh, replyLeaseSet, onFail);
long expiration = Math.max(_overallExpiration, _start + REPLY_TIMEOUT_MS_MIN); long expiration = Math.max(_overallExpiration, _start + REPLY_TIMEOUT_MS_MIN);
selector = new ReplySelector(token, expiration); selector = new ReplySelector(token, expiration);
} else if (wantACK && _encryptionKey.getType() == EncType.ECIES_X25519) {
// Timeout only. ECIESReplyCallback handles the reply (and will cancel the timeout)
onReply = null;
onFail = eciesTimeout;
selector = null;
} else { } else {
onReply = null; onReply = null;
onFail = null; onFail = null;
@ -769,6 +777,11 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
DataHelper.formatDuration(_selector.getExpiration() - _overallExpiration) + DataHelper.formatDuration(_selector.getExpiration() - _overallExpiration) +
" after message, queueing separate timeout job"); " after message, queueing separate timeout job");
} }
} else if (_replyTimeout != null) {
// ECIES
long expiration = Math.max(_overallExpiration, _start + REPLY_TIMEOUT_MS_MIN);
_replyTimeout.getTiming().setStartAfter(expiration);
getContext().jobQueue().addJob(_replyTimeout);
} }
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info(OutboundClientMessageOneShotJob.this.getJobId() + _log.info(OutboundClientMessageOneShotJob.this.getJobId() +
@ -1129,8 +1142,8 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
* @since 0.9.46 * @since 0.9.46
*/ */
private class ECIESReplyCallback extends SendSuccessJob implements ReplyCallback { private class ECIESReplyCallback extends SendSuccessJob implements ReplyCallback {
public ECIESReplyCallback(LeaseSet ls) { public ECIESReplyCallback(LeaseSet ls, SendTimeoutJob timeout) {
super(null, null, ls, null); super(null, null, ls, timeout);
} }
public long getExpiration() { public long getExpiration() {