AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2ptunnel: Check for same interface before warning of dup port

Browse Source
This commit is contained in:
zzz
2020-02-29 14:44:07 +00:00
parent d505a2fe76
commit 29f9986f40
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
View File

@@ -420,13 +420,23 @@ public class IndexBean {
": " + port + "</font>";
// dup check, O(n**2)
List<TunnelController> controllers = _group.getControllers();
String ifc = tun.getListenOnInterface();
for (int i = 0; i < controllers.size(); i++) {
if (i == tunnel)
continue;
if (port.equals(controllers.get(i).getListenPort()))
return "<font color=\"red\">" +
_t("Warning - duplicate port") +
": " + port + "</font>";
TunnelController tc = controllers.get(i);
if (port.equals(tc.getListenPort())) {
String ifc2 = tc.getListenOnInterface();
if (DataHelper.eq(ifc, ifc2) ||
"0.0.0.0".equals(ifc) ||
"0.0.0.0".equals(ifc2) ||
"0:0:0:0:0:0:0:0".equals(ifc) ||
"0:0:0:0:0:0:0:0".equals(ifc2)) {
return "<font color=\"red\">" +
_t("Warning - duplicate port") +
": " + port + "</font>";
}
}
}
return port;
}