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

Fix inbound tunnel tests by using the correct SKM

Browse Source
This commit is contained in:
zzz
2009-09-04 14:20:20 +00:00
parent de07705671
commit 58e960ceb5
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package net.i2p.router.tunnel.pool;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import net.i2p.crypto.SessionKeyManager;
import net.i2p.data.Certificate; import net.i2p.data.Certificate;
import net.i2p.data.SessionKey; import net.i2p.data.SessionKey;
import net.i2p.data.SessionTag; import net.i2p.data.SessionTag;
@ -130,12 +131,13 @@ class TestJob extends JobImpl {
payload.setExpiration(m.getMessageExpiration()); payload.setExpiration(m.getMessageExpiration());
SessionKey encryptKey = getContext().keyGenerator().generateSessionKey(); SessionKey encryptKey = getContext().keyGenerator().generateSessionKey();
_encryptTag = new SessionTag(true); SessionTag encryptTag = new SessionTag(true);
_encryptTag = encryptTag;
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
@ -143,9 +145,15 @@ 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 // Register the single tag with the appropriate SKM
if (_cfg.isInbound() && !_pool.getSettings().isExploratory()) {
SessionKeyManager skm = getContext().clientManager().getClientSessionKeyManager(_pool.getSettings().getDestination());
if (skm != null)
skm.tagsReceived(encryptKey, encryptTags);
} else {
getContext().sessionKeyManager().tagsReceived(encryptKey, encryptTags); getContext().sessionKeyManager().tagsReceived(encryptKey, encryptTags);
}
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Sending garlic test of " + _outTunnel + " / " + _replyTunnel); _log.debug("Sending garlic test of " + _outTunnel + " / " + _replyTunnel);
@ -312,7 +320,13 @@ class TestJob extends JobImpl {
_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 // don't clog up the SKM with old one-tag tagsets
if (_cfg.isInbound() && !_pool.getSettings().isExploratory()) {
SessionKeyManager skm = getContext().clientManager().getClientSessionKeyManager(_pool.getSettings().getDestination());
if (skm != null)
skm.consumeTag(_encryptTag);
} else {
getContext().sessionKeyManager().consumeTag(_encryptTag); getContext().sessionKeyManager().consumeTag(_encryptTag);
}
testFailed(getContext().clock().now() - _started); testFailed(getContext().clock().now() - _started);
} }
} }