From 56f6a68ef3196a7098a31223e19ac96f41ed76ab Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 2 Jul 2017 03:25:36 +0000
Subject: [PATCH] Console: Show correct icon for "Firewalled" network status
---
.../java/src/net/i2p/router/web/SummaryBarRenderer.java | 3 +++
.../java/src/net/i2p/router/web/SummaryHelper.java | 4 +++-
history.txt | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
index 45a4d99580..e243a384be 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -407,6 +407,9 @@ class SummaryBarRenderer {
case HIDDEN:
buf.append("hidden");
break;
+ case FIREWALLED:
+ buf.append("firewalled");
+ break;
case RUNNING:
buf.append("running");
break;
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index 98fc426b06..93275bda00 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -132,6 +132,7 @@ public class SummaryHelper extends HelperBase {
public enum NetworkState {
HIDDEN,
TESTING,
+ FIREWALLED,
RUNNING,
WARN,
ERROR;
@@ -221,6 +222,7 @@ public class SummaryHelper extends HelperBase {
return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-SymmetricNAT"));
case REJECT_UNSOLICITED:
+ state = NetworkState.FIREWALLED;
case IPV4_DISABLED_IPV6_FIREWALLED:
if (routerInfo.getTargetAddress("NTCP") != null)
return new NetworkStateMessage(NetworkState.WARN, _t("WARN-Firewalled with Inbound TCP Enabled"));
@@ -231,7 +233,7 @@ public class SummaryHelper extends HelperBase {
return new NetworkStateMessage(NetworkState.WARN, _t("WARN-Firewalled and Floodfill"));
//if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0)
// return new NetworkStateMessage(NetworkState.WARN, _t("WARN-Firewalled and Fast"));
- return new NetworkStateMessage(NetworkState.RUNNING, _t(status.toStatusString()));
+ return new NetworkStateMessage(state, _t(status.toStatusString()));
case DISCONNECTED:
return new NetworkStateMessage(NetworkState.TESTING, _t("Disconnected - check network connection"));
diff --git a/history.txt b/history.txt
index 5ccba4b161..ba7615bf13 100644
--- a/history.txt
+++ b/history.txt
@@ -15,6 +15,7 @@
- /tunnels:
- Tag "Local" for translation (and convert to lowercase in CSS)
- Arabic: ensure our tunnel tables display correctly
+ - Show correct icon for "Firewalled" network status
* I2PSnark:
- Fix unclosed <label>
- Standalone:
--
GitLab