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

NetDB: Fix b33 lookup looping after failure

Browse Source
This commit is contained in:
zzz
2019-03-27 13:58:56 +00:00
parent 82eea0a8f9
commit ea127d3fd4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
router/java/src/net/i2p/router/client/LookupDestJob.java
View File

@ -104,7 +104,9 @@ class LookupDestJob extends JobImpl {
} catch (RuntimeException re) { } catch (RuntimeException re) {
if (_log.shouldWarn()) if (_log.shouldWarn())
_log.debug("Failed blinding conversion of " + name, re); _log.debug("Failed blinding conversion of " + name, re);
// lookup as a name, which will probably fail // Do NOT lookup as a name, naming service will call us again and infinite loop
name = null;
// h and name both null, runJob will fail immediately
} }
} }
} }
@ -142,10 +144,13 @@ class LookupDestJob extends JobImpl {
_log.debug("Failed name lookup " + _name); _log.debug("Failed name lookup " + _name);
returnFail(); returnFail();
} }
} else { } else if (_hash != null) {
DoneJob done = new DoneJob(getContext()); DoneJob done = new DoneJob(getContext());
// TODO tell router this is an encrypted lookup, skip 38 or earlier ffs? // TODO tell router this is an encrypted lookup, skip 38 or earlier ffs?
getContext().netDb().lookupDestination(_hash, done, _timeout, _fromLocalDest); getContext().netDb().lookupDestination(_hash, done, _timeout, _fromLocalDest);
} else {
// blinding decode fail
returnFail();
} }
} }
@ -199,8 +204,10 @@ class LookupDestJob extends JobImpl {
I2CPMessage msg; I2CPMessage msg;
if (_reqID >= 0) if (_reqID >= 0)
msg = new HostReplyMessage(_sessID, HostReplyMessage.RESULT_FAILURE, _reqID); msg = new HostReplyMessage(_sessID, HostReplyMessage.RESULT_FAILURE, _reqID);
else else if (_hash != null)
msg = new DestReplyMessage(_hash); msg = new DestReplyMessage(_hash);
else
return; // shouldn't happen
try { try {
_runner.doSend(msg); _runner.doSend(msg);
} catch (I2CPMessageException ime) {} } catch (I2CPMessageException ime) {}