I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Util: Check for NTCP2 in getNetStatus()

Browse Source
This commit is contained in:
zzz
2019-05-02 14:29:59 +00:00
parent 16e05e0dd8
commit b951892c05
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/net/i2p/android/router/util/Util.java
View File

@ -445,10 +445,15 @@ public abstract class Util implements I2PConstants {
case IPV4_UNKNOWN_IPV6_OK: case IPV4_UNKNOWN_IPV6_OK:
case IPV4_DISABLED_IPV6_OK: case IPV4_DISABLED_IPV6_OK:
case IPV4_SNAT_IPV6_OK: case IPV4_SNAT_IPV6_OK:
RouterAddress ra = routerInfo.getTargetAddress("NTCP"); List<RouterAddress> ras = routerInfo.getTargetAddresses("NTCP", "NTCP2");
if (ra == null) if (ras.isEmpty())
return new NetStatus(NetStatus.Level.INFO, toStatusString(ctx, status)); return new NetStatus(NetStatus.Level.INFO, toStatusString(ctx, status));
byte[] ip = ra.getIP(); byte[] ip = null;
for (RouterAddress ra : ras) {
ip = ra.getIP();
if (ip != null)
break;
}
if (ip == null) if (ip == null)
return new NetStatus(NetStatus.Level.ERROR, ctx.getString(R.string.net_status_error_unresolved_tcp)); return new NetStatus(NetStatus.Level.ERROR, ctx.getString(R.string.net_status_error_unresolved_tcp));
// TODO set IPv6 arg based on configuration? // TODO set IPv6 arg based on configuration?
@ -462,7 +467,7 @@ public abstract class Util implements I2PConstants {
case REJECT_UNSOLICITED: case REJECT_UNSOLICITED:
case IPV4_DISABLED_IPV6_FIREWALLED: case IPV4_DISABLED_IPV6_FIREWALLED:
if (routerInfo.getTargetAddress("NTCP") != null) if (routerInfo.getTargetAddresses("NTCP", "NTCP2").isEmpty())
return new NetStatus(NetStatus.Level.WARN, ctx.getString(R.string.net_status_warn_firewalled_inbound_tcp)); return new NetStatus(NetStatus.Level.WARN, ctx.getString(R.string.net_status_warn_firewalled_inbound_tcp));
// fall through... // fall through...
case IPV4_FIREWALLED_IPV6_OK: case IPV4_FIREWALLED_IPV6_OK:
@ -483,7 +488,7 @@ public abstract class Util implements I2PConstants {
case IPV4_UNKNOWN_IPV6_FIREWALLED: case IPV4_UNKNOWN_IPV6_FIREWALLED:
case IPV4_DISABLED_IPV6_UNKNOWN: case IPV4_DISABLED_IPV6_UNKNOWN:
default: default:
ra = routerInfo.getTargetAddress("SSU"); RouterAddress ra = routerInfo.getTargetAddress("SSU");
if (ra == null && rCtx.router().getUptime() > 5 * 60 * 1000) { if (ra == null && rCtx.router().getUptime() > 5 * 60 * 1000) {
if (rCtx.commSystem().countActivePeers() <= 0) if (rCtx.commSystem().countActivePeers() <= 0)
return new NetStatus(NetStatus.Level.ERROR, ctx.getString(R.string.net_status_error_no_active_peers)); return new NetStatus(NetStatus.Level.ERROR, ctx.getString(R.string.net_status_error_no_active_peers));