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

BuildHandler: Fix NPE (ticket #1738)

Browse Source
This commit is contained in:
zzz
2015-12-18 15:44:11 +00:00
parent c59496f30f
commit d0eaf4d899
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
history.txt
View File

@ -1,3 +1,11 @@
2015-12-18 zzz
* BuildHandler: Fix NPE (ticket #1738)
2015-12-16 zzz
* Profiles:
- Don't use same family in a tunnel
- Reduce IPv6 mask from 8 to 6
2015-12-13 zzz 2015-12-13 zzz
* Data: Optimize router info writes, disable caching * Data: Optimize router info writes, disable caching

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 14; public final static long BUILD = 15;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";

6
router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
View File

@ -648,7 +648,7 @@ class BuildHandler implements Runnable {
// previous test should be sufficient to keep it from getting here but maybe not? // previous test should be sufficient to keep it from getting here but maybe not?
if (!isInGW) { if (!isInGW) {
Hash from = state.fromHash; Hash from = state.fromHash;
if (from == null) if (from == null && state.from != null)
from = state.from.calculateHash(); from = state.from.calculateHash();
if (_context.routerHash().equals(from)) { if (_context.routerHash().equals(from)) {
_context.statManager().addRateData("tunnel.rejectHostile", 1); _context.statManager().addRateData("tunnel.rejectHostile", 1);
@ -658,7 +658,7 @@ class BuildHandler implements Runnable {
} }
if ((!isOutEnd) && (!isInGW)) { if ((!isOutEnd) && (!isInGW)) {
Hash from = state.fromHash; Hash from = state.fromHash;
if (from == null) if (from == null && state.from != null)
from = state.from.calculateHash(); from = state.from.calculateHash();
// Previous and next hop the same? Don't help somebody be evil. Drop it without a reply. // Previous and next hop the same? Don't help somebody be evil. Drop it without a reply.
// A-B-C-A is not preventable // A-B-C-A is not preventable
@ -762,7 +762,7 @@ class BuildHandler implements Runnable {
// We may need another counter above for requests. // We may need another counter above for requests.
if (response == 0 && !isInGW) { if (response == 0 && !isInGW) {
Hash from = state.fromHash; Hash from = state.fromHash;
if (from == null) if (from == null && state.from != null)
from = state.from.calculateHash(); from = state.from.calculateHash();
if (from != null && _throttler.shouldThrottle(from)) { if (from != null && _throttler.shouldThrottle(from)) {
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))