I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

consume sessiontag after failed tunnel test

Browse Source
This commit is contained in:
zzz
2009-08-30 16:05:33 +00:00
parent c714c1a0c9
commit 5ca2f306b8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
router/java/src/net/i2p/router/tunnel/pool/TestJob.java
View File

@ -28,6 +28,8 @@ class TestJob extends JobImpl {
private TunnelInfo _outTunnel; private TunnelInfo _outTunnel;
private TunnelInfo _replyTunnel; private TunnelInfo _replyTunnel;
private PooledTunnelCreatorConfig _otherTunnel; private PooledTunnelCreatorConfig _otherTunnel;
/** save this so we can tell the SKM to kill it if the test fails */
private SessionTag _encryptTag;
/** base to randomize the test delay on */ /** base to randomize the test delay on */
private static final int TEST_DELAY = 30*1000; private static final int TEST_DELAY = 30*1000;
@ -125,12 +127,12 @@ class TestJob extends JobImpl {
payload.setExpiration(m.getMessageExpiration()); payload.setExpiration(m.getMessageExpiration());
SessionKey encryptKey = getContext().keyGenerator().generateSessionKey(); SessionKey encryptKey = getContext().keyGenerator().generateSessionKey();
SessionTag encryptTag = new SessionTag(true); _encryptTag = new SessionTag(true);
SessionKey sentKey = new SessionKey(); SessionKey sentKey = new SessionKey();
Set sentTags = null; Set sentTags = null;
GarlicMessage msg = GarlicMessageBuilder.buildMessage(getContext(), payload, sentKey, sentTags, GarlicMessage msg = GarlicMessageBuilder.buildMessage(getContext(), payload, sentKey, sentTags,
getContext().keyManager().getPublicKey(), getContext().keyManager().getPublicKey(),
encryptKey, encryptTag); encryptKey, _encryptTag);
if (msg == null) { if (msg == null) {
// overloaded / unknown peers / etc // overloaded / unknown peers / etc
@ -138,7 +140,8 @@ class TestJob extends JobImpl {
return; return;
} }
Set encryptTags = new HashSet(1); Set encryptTags = new HashSet(1);
encryptTags.add(encryptTag); encryptTags.add(_encryptTag);
// Register the single tag with the SKM
getContext().sessionKeyManager().tagsReceived(encryptKey, encryptTags); getContext().sessionKeyManager().tagsReceived(encryptKey, encryptTags);
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
@ -304,8 +307,11 @@ class TestJob extends JobImpl {
public void runJob() { public void runJob() {
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("Timeout: found? " + _found, getAddedBy()); _log.warn("Timeout: found? " + _found, getAddedBy());
if (!_found) if (!_found) {
// don't clog up the SKM with old one-tag tagsets
getContext().sessionKeyManager().consumeTag(_encryptTag);
testFailed(getContext().clock().now() - _started); testFailed(getContext().clock().now() - _started);
}
} }
@Override @Override