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

LeaseSet: Better error messages when decode fails (ticket #2108)

Browse Source
This commit is contained in:
zzz
2017-12-01 15:57:54 +00:00
parent dc13ed6c19
commit 80e3c96f2d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/src/net/i2p/data/LeaseSet.java
View File

@@ -490,7 +490,8 @@ public class LeaseSet extends DatabaseEntry {
// _log.warn("decrypting lease: " + _destination.calculateHash()); // _log.warn("decrypting lease: " + _destination.calculateHash());
int size = _leases.size(); int size = _leases.size();
if (size < 2) if (size < 2)
throw new DataFormatException("Bad number of leases for decryption"); throw new DataFormatException("Bad number of leases decrypting " + _destination.toBase32() +
" - is this destination encrypted?");
int datalen = DATA_LEN * size; int datalen = DATA_LEN * size;
ByteArrayOutputStream baos = new ByteArrayOutputStream(datalen); ByteArrayOutputStream baos = new ByteArrayOutputStream(datalen);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
@@ -539,10 +540,12 @@ public class LeaseSet extends DatabaseEntry {
_decrypted = true; _decrypted = true;
} catch (DataFormatException dfe) { } catch (DataFormatException dfe) {
Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class); Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class);
log.error("Error decrypting lease: " + _destination.calculateHash(), dfe); log.error("Error decrypting " + _destination.toBase32() +
" - is this destination encrypted?", dfe);
} catch (IOException ioe) { } catch (IOException ioe) {
Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class); Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class);
log.error("Error decrypting lease: " + _destination.calculateHash(), ioe); log.error("Error decrypting " + _destination.toBase32() +
" - is this destination encrypted?", ioe);
} }
} }
_checked = true; _checked = true;