Console: Show correct icon for "Firewalled" network status

This commit is contained in:
str4d
2017-07-02 03:25:36 +00:00
parent 7cd7f01db9
commit 56f6a68ef3
3 changed files with 7 additions and 1 deletions

View File

@ -407,6 +407,9 @@ class SummaryBarRenderer {
case HIDDEN: case HIDDEN:
buf.append("hidden"); buf.append("hidden");
break; break;
case FIREWALLED:
buf.append("firewalled");
break;
case RUNNING: case RUNNING:
buf.append("running"); buf.append("running");
break; break;

View File

@ -132,6 +132,7 @@ public class SummaryHelper extends HelperBase {
public enum NetworkState { public enum NetworkState {
HIDDEN, HIDDEN,
TESTING, TESTING,
FIREWALLED,
RUNNING, RUNNING,
WARN, WARN,
ERROR; ERROR;
@ -221,6 +222,7 @@ public class SummaryHelper extends HelperBase {
return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-SymmetricNAT")); return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-SymmetricNAT"));
case REJECT_UNSOLICITED: case REJECT_UNSOLICITED:
state = NetworkState.FIREWALLED;
case IPV4_DISABLED_IPV6_FIREWALLED: case IPV4_DISABLED_IPV6_FIREWALLED:
if (routerInfo.getTargetAddress("NTCP") != null) if (routerInfo.getTargetAddress("NTCP") != null)
return new NetworkStateMessage(NetworkState.WARN, _t("WARN-Firewalled with Inbound TCP Enabled")); 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")); return new NetworkStateMessage(NetworkState.WARN, _t("WARN-Firewalled and Floodfill"));
//if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0) //if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0)
// return new NetworkStateMessage(NetworkState.WARN, _t("WARN-Firewalled and Fast")); // 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: case DISCONNECTED:
return new NetworkStateMessage(NetworkState.TESTING, _t("Disconnected - check network connection")); return new NetworkStateMessage(NetworkState.TESTING, _t("Disconnected - check network connection"));

View File

@ -15,6 +15,7 @@
- /tunnels: - /tunnels:
- Tag "Local" for translation (and convert to lowercase in CSS) - Tag "Local" for translation (and convert to lowercase in CSS)
- Arabic: ensure our tunnel tables display correctly - Arabic: ensure our tunnel tables display correctly
- Show correct icon for "Firewalled" network status
* I2PSnark: * I2PSnark:
- Fix unclosed <label> - Fix unclosed <label>
- Standalone: - Standalone: