Changeset 7f60ee9

Timestamp:

May 2, 2019 2:25:43 PM (19 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

52b14142, 539f880

Parents:

b9726a0

Message:

Console: NTCP2 check

File:

• apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java (modified) (2 diffs)

apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java

@@ -248 +248 @@
             case IPV4_DISABLED_IPV6_OK:
             case IPV4_SNAT_IPV6_OK:
-                RouterAddress ra = routerInfo.getTargetAddress("NTCP");
-                if (ra == null)
+                List<RouterAddress> ras = routerInfo.getTargetAddresses("NTCP", "NTCP2");
+                if (ras.isEmpty())
                     return new NetworkStateMessage(NetworkState.RUNNING, _t(status.toStatusString()));
-                byte[] ip = ra.getIP();
+                byte[] ip = null;
+                for (RouterAddress ra : ras) {
+                    ip = ra.getIP();
+                    if (ip != null)
+                        break;
+                }
                 if (ip == null)
                     return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-Unresolved TCP Address"));
@@ -288 +293 @@
             case IPV4_DISABLED_IPV6_UNKNOWN:
             default:
-                ra = routerInfo.getTargetAddress("SSU");
+                RouterAddress ra = routerInfo.getTargetAddress("SSU");
                 if (ra == null && _context.router().getUptime() > 5*60*1000) {
                     if (getActivePeers() <= 0)