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

* SSU, confignet: Add support for specifiying multiple addresses

Browse Source
This commit is contained in:
zzz
2013-08-30 10:27:22 +00:00
parent 1933e6239b
commit de5f2940ce
6 changed files with 137 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
View File

@ -1,9 +1,12 @@
package net.i2p.router.web;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import net.i2p.router.Router;
import net.i2p.router.transport.FIFOBandwidthRefiller;
@ -94,9 +97,6 @@ public class ConfigNetHandler extends FormHandler {
public void setUdpHost1(String host) {
_udpHost1 = (host != null ? host.trim() : null);
}
public void setUdpHost2(String host) {
_udpHost2 = (host != null ? host.trim() : null);
}
public void setUdpPort(String port) {
_udpPort = (port != null ? port.trim() : null);
}
@ -160,26 +160,48 @@ public class ConfigNetHandler extends FormHandler {
if (_udpAutoIP != null) {
String uhost = "";
if (_udpAutoIP.equals("fixed")) {
if (_udpHost1 != null && _udpHost1.length() > 0)
uhost = _udpHost1;
else if (_udpHost2 != null && _udpHost2.length() > 0)
uhost = _udpHost2;
else
_udpAutoIP = UDPTransport.DEFAULT_SOURCES;
}
changes.put(UDPTransport.PROP_SOURCES, _udpAutoIP);
boolean valid = true;
if (uhost.length() > 0) {
valid = verifyAddress(uhost);
if (valid) {
if (_settings == null)
_settings = Collections.EMPTY_MAP;
Set<String> addrs = new TreeSet();
for (Object o : _settings.keySet()) {
String k = (String) o;
if (k.startsWith("addr_")) {
String v = k.substring(5);
if (v.length() > 0)
addrs.add(v);
}
}
if (getJettyString("addrnew") != null) {
if (_udpHost1 != null && _udpHost1.length() > 0) {
if (verifyAddress(_udpHost1)) {
addrs.add(_udpHost1);
} else {
error = true;
}
}
}
int tot = addrs.size();
int i = 0;
if (tot > 0) {
StringBuilder buf = new StringBuilder(128);
for (String addr : addrs) {
buf.append(addr);
if (++i < tot)
buf.append(',');
}
uhost = buf.toString();
changes.put(UDPTransport.PROP_EXTERNAL_HOST, uhost);
} else {
error = true;
_udpAutoIP = UDPTransport.DEFAULT_SOURCES;
removes.add(UDPTransport.PROP_EXTERNAL_HOST);
}
} else {
removes.add(UDPTransport.PROP_EXTERNAL_HOST);
// not fixed
if (oldUHost.length() > 0)
removes.add(UDPTransport.PROP_EXTERNAL_HOST);
}
if (valid && ((!oldUdp.equals(_udpAutoIP)) || (!oldUHost.equals(uhost)))) {
changes.put(UDPTransport.PROP_SOURCES, _udpAutoIP);
if ((!oldUdp.equals(_udpAutoIP)) || (!oldUHost.equals(uhost))) {
addFormNotice(_("Updating IP address"));
restartRequired = true;
}

56
apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
View File

@ -1,6 +1,9 @@
package net.i2p.router.web;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import net.i2p.data.DataHelper;
import net.i2p.data.RouterAddress;
@ -18,10 +21,10 @@ import net.i2p.util.Addresses;
public class ConfigNetHelper extends HelperBase {
/** copied from various private components */
public final static String PROP_I2NP_NTCP_HOSTNAME = "i2np.ntcp.hostname";
public final static String PROP_I2NP_NTCP_PORT = "i2np.ntcp.port";
public final static String PROP_I2NP_NTCP_AUTO_PORT = "i2np.ntcp.autoport";
public final static String PROP_I2NP_NTCP_AUTO_IP = "i2np.ntcp.autoip";
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";
private final static String CHECKED = " checked=\"checked\" ";
public String getUdphostname() {
@ -175,9 +178,48 @@ public class ConfigNetHelper extends HelperBase {
return "";
}
public String[] getAddresses() {
ArrayList<String> al = new ArrayList(Addresses.getAddresses());
return al.toArray(new String[al.size()]);
public Set<String> getAddresses() {
// exclude local, include IPv6
return Addresses.getAddresses(false, true);
}
/** @since IPv6 */
public String getAddressSelector() {
Set<String> addrs = getAddresses();
Set<String> configs;
String cs = getUdphostname();
if (cs.length() <= 0) {
configs = Collections.EMPTY_SET;
} else {
configs = new HashSet(4);
String[] ca = cs.split("[,; \r\n\t]");
for (int i = 0; i < ca.length; i++) {
String c = ca[i];
if (c.length() > 0) {
configs.add(c);
addrs.add(c);
}
}
}
StringBuilder buf = new StringBuilder(128);
buf.append("<div class=\"indent\">");
for (String addr : addrs) {
buf.append("\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
"<input type=\"checkbox\" class=\"optbox\" value=\"foo\" name=\"addr_");
buf.append(addr);
buf.append('"');
if (addrs.size() == 1 || configs.contains(addr))
buf.append(CHECKED);
buf.append("> ");
buf.append(addr);
buf.append("<br>");
}
buf.append("\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
"<input type=\"checkbox\" class=\"optbox\" name=\"addrnew\"");
buf.append(CHECKED);
buf.append("><input name =\"udpHost1\" type=\"text\" size=\"16\" />" +
"</div>");
return buf.toString();
}
public String getInboundRate() {