I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OCMOSJ: dont send an already-expired msg

Browse Source
This commit is contained in:
zzz
2011-01-19 15:23:44 +00:00
parent 7b9f98721d
commit 96de505b5b
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,10 +127,17 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
// otherwise router config, otherwise default // otherwise router config, otherwise default
_overallExpiration = msg.getExpiration(); _overallExpiration = msg.getExpiration();
if (_overallExpiration > 0) { if (_overallExpiration > 0) {
_overallExpiration = Math.max(_overallExpiration, _start + OVERALL_TIMEOUT_MS_MIN); // Unless it's already expired, set a min and max expiration
_overallExpiration = Math.min(_overallExpiration, _start + OVERALL_TIMEOUT_MS_DEFAULT); if (_overallExpiration <= _start) {
if (_log.shouldLog(Log.INFO)) _overallExpiration = Math.max(_overallExpiration, _start + OVERALL_TIMEOUT_MS_MIN);
_log.info(getJobId() + ": Message Expiration (ms): " + (_overallExpiration - _start)); _overallExpiration = Math.min(_overallExpiration, _start + OVERALL_TIMEOUT_MS_DEFAULT);
if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + ": Message Expiration (ms): " + (_overallExpiration - _start));
} else {
if (_log.shouldLog(Log.WARN))
_log.warn(getJobId() + ": Expired before we got to it");
// runJob() will call dieFatal()
}
} else { } else {
String param = msg.getSenderConfig().getOptions().getProperty(OVERALL_TIMEOUT_MS_PARAM); String param = msg.getSenderConfig().getOptions().getProperty(OVERALL_TIMEOUT_MS_PARAM);
if (param == null) if (param == null)
@ -149,7 +156,6 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + " Default Expiration (ms): " + timeoutMs); _log.info(getJobId() + " Default Expiration (ms): " + timeoutMs);
} }
_finished = false;
} }
/** call once only */ /** call once only */
@ -174,9 +180,14 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
public String getName() { return "Outbound client message"; } public String getName() { return "Outbound client message"; }
public void runJob() { public void runJob() {
long now = getContext().clock().now();
if (now >= _overallExpiration) {
dieFatal();
return;
}
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug(getJobId() + ": Send outbound client message job beginning"); _log.debug(getJobId() + ": Send outbound client message job beginning");
long timeoutMs = _overallExpiration - getContext().clock().now(); long timeoutMs = _overallExpiration - now;
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug(getJobId() + ": preparing to search for the leaseSet for " + _toString); _log.debug(getJobId() + ": preparing to search for the leaseSet for " + _toString);
Hash key = _to.calculateHash(); Hash key = _to.calculateHash();