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

SSU: Fix NPE when SSU2 disabled

Browse Source
This commit is contained in:
zzz
2022-12-26 07:21:49 -05:00
parent d16aaab35f
commit d655ad206c
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
View File

@@ -3213,32 +3213,35 @@ class EstablishmentManager {
_log.warn("Failsafe remove OBBH " + state);
}
}
int count = 0;
synchronized(_inboundTokens) {
for (Iterator<Token> iter = _inboundTokens.values().iterator(); iter.hasNext(); ) {
Token tok = iter.next();
if (tok.getExpiration() < now) {
iter.remove();
count++;
if (_inboundTokens != null) {
// SSU2 only
int count = 0;
synchronized(_inboundTokens) {
for (Iterator<Token> iter = _inboundTokens.values().iterator(); iter.hasNext(); ) {
Token tok = iter.next();
if (tok.getExpiration() < now) {
iter.remove();
count++;
}
}
}
}
if (count > 0 && _log.shouldDebug())
_log.debug("Expired " + count + " inbound tokens");
count = 0;
synchronized(_outboundTokens) {
for (Iterator<Token> iter = _outboundTokens.values().iterator(); iter.hasNext(); ) {
Token tok = iter.next();
if (tok.getExpiration() < now) {
iter.remove();
count++;
if (count > 0 && _log.shouldDebug())
_log.debug("Expired " + count + " inbound tokens");
count = 0;
synchronized(_outboundTokens) {
for (Iterator<Token> iter = _outboundTokens.values().iterator(); iter.hasNext(); ) {
Token tok = iter.next();
if (tok.getExpiration() < now) {
iter.remove();
count++;
}
}
}
if (count > 0 && _log.shouldDebug())
_log.debug("Expired " + count + " outbound tokens");
_terminationCounter.clear();
_transport.getIntroManager().cleanup();
}
if (count > 0 && _log.shouldDebug())
_log.debug("Expired " + count + " outbound tokens");
_terminationCounter.clear();
_transport.getIntroManager().cleanup();
}
}
}

2
router/java/src/net/i2p/router/transport/udp/IntroductionManager.java
View File

@@ -1291,7 +1291,7 @@ class IntroductionManager {
* @since 0.9.57
*/
public void cleanup() {
if (_nonceToAlice.isEmpty())
if (_nonceToAlice == null || _nonceToAlice.isEmpty())
return;
for (Iterator<PeerState2> iter = _nonceToAlice.values().iterator(); iter.hasNext(); ) {
PeerState2 state = iter.next();