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

2005-07-12 jrandom

Browse Source 
* Add some data duplication to avoid a recently injected concurrency problem
      in the session tag manager (thanks redzara and romster).
This commit is contained in:
jrandom
2005-07-12 21:26:07 +00:00
committed by zzz
parent 4c230522a2
commit e9592ed400
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
View File

@ -221,6 +221,11 @@ class TransientSessionKeyManager extends SessionKeyManager {
*
*/
public void tagsDelivered(PublicKey target, SessionKey key, Set sessionTags) {
if (_log.shouldLog(Log.DEBUG)) {
//_log.debug("Tags delivered to set " + set + " on session " + sess);
if (sessionTags.size() > 0)
_log.debug("Tags delivered: " + sessionTags.size() + " for key: " + key.toBase64() + ": " + sessionTags);
}
OutboundSession sess = getSession(target);
if (sess == null) {
createSession(target, key);
@ -229,11 +234,6 @@ class TransientSessionKeyManager extends SessionKeyManager {
sess.setCurrentKey(key);
TagSet set = new TagSet(sessionTags, key, _context.clock().now());
sess.addTags(set);
if (_log.shouldLog(Log.WARN)) {
//_log.debug("Tags delivered to set " + set + " on session " + sess);
if (sessionTags.size() > 0)
_log.warn("Tags delivered: " + sessionTags.size() + " for key: " + key.toBase64() + ": " + sessionTags);
}
}
/**
@ -696,7 +696,7 @@ class TransientSessionKeyManager extends SessionKeyManager {
public Set dropTags() {
Set rv = null;
synchronized (TagSet.this) {
rv = _sessionTags;
rv = new HashSet(_sessionTags);
_sessionTags = Collections.EMPTY_SET;
}
return rv;
@ -707,12 +707,16 @@ class TransientSessionKeyManager extends SessionKeyManager {
}
public boolean contains(SessionTag tag) {
return _sessionTags.contains(tag);
synchronized (TagSet.this) {
return _sessionTags.contains(tag);
}
}
public void consume(SessionTag tag) {
if (contains(tag)) {
_sessionTags.remove(tag);
synchronized (TagSet.this) {
_sessionTags.remove(tag);
}
}
}
@ -721,9 +725,11 @@ class TransientSessionKeyManager extends SessionKeyManager {
return null;
}
SessionTag first = (SessionTag) _sessionTags.iterator().next();
_sessionTags.remove(first);
return first;
synchronized (TagSet.this) {
SessionTag first = (SessionTag) _sessionTags.iterator().next();
_sessionTags.remove(first);
return first;
}
}
public Exception getCreatedBy() { return _createdBy; }