From 9426b6a4b20763de862f2e32a474ebce680f7ed7 Mon Sep 17 00:00:00 2001 From: knaccc Date: Mon, 28 Jan 2019 20:47:52 +0000 Subject: [PATCH] Router status now displaying in GUI --- .../getmonero/i2p/zero/gui/Controller.java | 3 + .../org/getmonero/i2p/zero/RouterWrapper.java | 137 ++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java b/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java index 38b0e4e..3b4b19f 100644 --- a/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java +++ b/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java @@ -158,6 +158,9 @@ public class Controller { bandwidthOut5m.setText(format2dp.format(routerWrapper.get5mRateOutKBps()) + " KBps"); bandwidthOutAll.setText(format2dp.format(routerWrapper.getAvgRateOutKBps()) + " KBps"); totalTransferredOut.setText(format2dp.format(routerWrapper.getTotalOutMB()) + " MB "); + + statusLabel.setText("Status: " + routerWrapper.getReachability().getMessage()); + }); } try { Thread.sleep(1000); } catch (InterruptedException e) {} diff --git a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java index c2ecd0f..ec63430 100644 --- a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java +++ b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java @@ -1,7 +1,13 @@ package org.getmonero.i2p.zero; +import net.i2p.data.router.RouterAddress; +import net.i2p.data.router.RouterInfo; +import net.i2p.router.CommSystemFacade; import net.i2p.router.Router; +import net.i2p.router.RouterContext; +import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.router.transport.FIFOBandwidthRefiller; +import net.i2p.router.transport.TransportUtil; import java.io.File; import java.util.Date; @@ -161,5 +167,136 @@ public class RouterWrapper { return tunnelControl; } + public enum NetworkState { + HIDDEN, + TESTING, + FIREWALLED, + RUNNING, + WARN, + ERROR, + CLOCKSKEW, + VMCOMM; + } + + public static class NetworkStateMessage { + private NetworkState state; + private String msg; + + NetworkStateMessage(NetworkState state, String msg) { + setMessage(state, msg); + } + + public void setMessage(NetworkState state, String msg) { + this.state = state; + this.msg = msg; + } + + public NetworkState getState() { + return state; + } + + public String getMessage() { + return msg; + } + + @Override + public String toString() { + return "(" + state + "; " + msg + ')'; + } + } + + public String _t(String s) { + return s; + } + + final static String PROP_I2NP_NTCP_HOSTNAME = "i2np.ntcp.hostname"; + final static String PROP_I2NP_NTCP_PORT = "i2np.ntcp.port"; + final static String PROP_I2NP_NTCP_AUTO_PORT = "i2np.ntcp.autoport"; + final static String PROP_I2NP_NTCP_AUTO_IP = "i2np.ntcp.autoip"; + + public NetworkStateMessage getReachability() { + RouterContext _context = router.getContext(); + if (_context.commSystem().isDummy()) + return new NetworkStateMessage(NetworkState.VMCOMM, "VM Comm System"); + if (_context.router().getUptime() > 60*1000 && (!_context.router().gracefulShutdownInProgress()) && + !_context.clientManager().isAlive()) + return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-Client Manager I2CP Error - check logs")); // not a router problem but the user should know + // Warn based on actual skew from peers, not update status, so if we successfully offset + // the clock, we don't complain. + //if (!_context.clock().getUpdatedSuccessfully()) + long skew = _context.commSystem().getFramedAveragePeerClockSkew(33); + // Display the actual skew, not the offset + if (Math.abs(skew) > 30*1000) + return new NetworkStateMessage(NetworkState.CLOCKSKEW, _t("ERR-Clock Skew")); + if (_context.router().isHidden()) + return new NetworkStateMessage(NetworkState.HIDDEN, _t("Hidden")); + RouterInfo routerInfo = _context.router().getRouterInfo(); + if (routerInfo == null) + return new NetworkStateMessage(NetworkState.TESTING, _t("Testing")); + + CommSystemFacade.Status status = _context.commSystem().getStatus(); + NetworkState state = NetworkState.RUNNING; + switch (status) { + case OK: + case IPV4_OK_IPV6_UNKNOWN: + case IPV4_OK_IPV6_FIREWALLED: + case IPV4_UNKNOWN_IPV6_OK: + case IPV4_DISABLED_IPV6_OK: + case IPV4_SNAT_IPV6_OK: + RouterAddress ra = routerInfo.getTargetAddress("NTCP"); + if (ra == null) + return new NetworkStateMessage(NetworkState.RUNNING, _t(status.toStatusString())); + byte[] ip = ra.getIP(); + if (ip == null) + return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-Unresolved TCP Address")); + // TODO set IPv6 arg based on configuration? + if (TransportUtil.isPubliclyRoutable(ip, true)) + return new NetworkStateMessage(NetworkState.RUNNING, _t(status.toStatusString())); + return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-Private TCP Address")); + + case IPV4_SNAT_IPV6_UNKNOWN: + case DIFFERENT: + 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")); + // fall through... + case IPV4_FIREWALLED_IPV6_OK: + case IPV4_FIREWALLED_IPV6_UNKNOWN: + if (((FloodfillNetworkDatabaseFacade)_context.netDb()).floodfillEnabled()) + 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(state, _t(status.toStatusString())); + + case DISCONNECTED: + return new NetworkStateMessage(NetworkState.TESTING, _t("Disconnected - check network connection")); + + case HOSED: + return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart")); + + case UNKNOWN: + state = NetworkState.TESTING; + case IPV4_UNKNOWN_IPV6_FIREWALLED: + case IPV4_DISABLED_IPV6_UNKNOWN: + default: + ra = routerInfo.getTargetAddress("SSU"); + if (ra == null && _context.router().getUptime() > 5*60*1000) { + if (_context.commSystem().countActivePeers() <= 0) + return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-No Active Peers, Check Network Connection and Firewall")); + else if (_context.getProperty(PROP_I2NP_NTCP_HOSTNAME) == null || + _context.getProperty(PROP_I2NP_NTCP_PORT) == null) + return new NetworkStateMessage(NetworkState.ERROR, _t("ERR-UDP Disabled and Inbound TCP host/port not set")); + else + return new NetworkStateMessage(NetworkState.WARN, _t("WARN-Firewalled with UDP Disabled")); + } + return new NetworkStateMessage(state, _t(status.toStatusString())); + } + } + + }