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

prevent very early NPE

Browse Source
This commit is contained in:
zzz
2012-04-12 14:48:18 +00:00
parent 41419738c5
commit b24085bbe5
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
View File

@ -14,6 +14,7 @@ import net.i2p.data.Destination;
import net.i2p.data.Hash; import net.i2p.data.Hash;
import net.i2p.data.LeaseSet; import net.i2p.data.LeaseSet;
import net.i2p.data.RouterAddress; import net.i2p.data.RouterAddress;
import net.i2p.data.RouterInfo;
import net.i2p.router.CommSystemFacade; import net.i2p.router.CommSystemFacade;
import net.i2p.router.Router; import net.i2p.router.Router;
import net.i2p.router.RouterVersion; import net.i2p.router.RouterVersion;
@ -116,18 +117,21 @@ public class SummaryHelper extends HelperBase {
return _("ERR-Clock Skew of {0}", DataHelper.formatDuration2(Math.abs(skew))); return _("ERR-Clock Skew of {0}", DataHelper.formatDuration2(Math.abs(skew)));
if (_context.router().isHidden()) if (_context.router().isHidden())
return _("Hidden"); return _("Hidden");
RouterInfo routerInfo = _context.router().getRouterInfo();
if (routerInfo == null)
return _("Testing");
int status = _context.commSystem().getReachabilityStatus(); int status = _context.commSystem().getReachabilityStatus();
switch (status) { switch (status) {
case CommSystemFacade.STATUS_OK: case CommSystemFacade.STATUS_OK:
RouterAddress ra = _context.router().getRouterInfo().getTargetAddress("NTCP"); RouterAddress ra = routerInfo.getTargetAddress("NTCP");
if (ra == null || (new NTCPAddress(ra)).isPubliclyRoutable()) if (ra == null || (new NTCPAddress(ra)).isPubliclyRoutable())
return _("OK"); return _("OK");
return _("ERR-Private TCP Address"); return _("ERR-Private TCP Address");
case CommSystemFacade.STATUS_DIFFERENT: case CommSystemFacade.STATUS_DIFFERENT:
return _("ERR-SymmetricNAT"); return _("ERR-SymmetricNAT");
case CommSystemFacade.STATUS_REJECT_UNSOLICITED: case CommSystemFacade.STATUS_REJECT_UNSOLICITED:
if (_context.router().getRouterInfo().getTargetAddress("NTCP") != null) if (routerInfo.getTargetAddress("NTCP") != null)
return _("WARN-Firewalled with Inbound TCP Enabled"); return _("WARN-Firewalled with Inbound TCP Enabled");
if (((FloodfillNetworkDatabaseFacade)_context.netDb()).floodfillEnabled()) if (((FloodfillNetworkDatabaseFacade)_context.netDb()).floodfillEnabled())
return _("WARN-Firewalled and Floodfill"); return _("WARN-Firewalled and Floodfill");
@ -138,7 +142,7 @@ public class SummaryHelper extends HelperBase {
return _("ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart"); return _("ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart");
case CommSystemFacade.STATUS_UNKNOWN: // fallthrough case CommSystemFacade.STATUS_UNKNOWN: // fallthrough
default: default:
ra = _context.router().getRouterInfo().getTargetAddress("SSU"); ra = routerInfo.getTargetAddress("SSU");
if (ra == null && _context.router().getUptime() > 5*60*1000) { if (ra == null && _context.router().getUptime() > 5*60*1000) {
if (getActivePeers() <= 0) if (getActivePeers() <= 0)
return _("ERR-No Active Peers, Check Network Connection and Firewall"); return _("ERR-No Active Peers, Check Network Connection and Firewall");

3
router/java/src/net/i2p/router/Router.java
View File

@ -360,6 +360,9 @@ public class Router implements RouterClock.ClockShiftListener {
return Collections.unmodifiableMap(_config); return Collections.unmodifiableMap(_config);
} }
/**
* Warning, may be null if called very early
*/
public RouterInfo getRouterInfo() { return _routerInfo; } public RouterInfo getRouterInfo() { return _routerInfo; }
/** /**