/confignet: Clean up display and form handling

for specifying a fixed host name or IP
This commit is contained in:
zzz
2016-02-18 16:10:14 +00:00
parent fa12967873
commit 3a28680162
2 changed files with 17 additions and 12 deletions

View File

@@ -8,6 +8,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import net.i2p.data.DataHelper;
import net.i2p.router.Router; import net.i2p.router.Router;
import net.i2p.router.transport.FIFOBandwidthRefiller; import net.i2p.router.transport.FIFOBandwidthRefiller;
import net.i2p.router.transport.TransportManager; import net.i2p.router.transport.TransportManager;
@@ -164,6 +165,9 @@ public class ConfigNetHandler extends FormHandler {
String oldUdp = _context.getProperty(UDPTransport.PROP_SOURCES, String oldUdp = _context.getProperty(UDPTransport.PROP_SOURCES,
_context.router().isHidden() ? "hidden" : UDPTransport.DEFAULT_SOURCES); _context.router().isHidden() ? "hidden" : UDPTransport.DEFAULT_SOURCES);
String oldUHost = _context.getProperty(UDPTransport.PROP_EXTERNAL_HOST, ""); String oldUHost = _context.getProperty(UDPTransport.PROP_EXTERNAL_HOST, "");
// force change to fixed if user enters a host name/IP
if (_udpHost1 != null && _udpHost1.length() > 0)
_udpAutoIP = "fixed";
if (_udpAutoIP != null) { if (_udpAutoIP != null) {
String uhost = ""; String uhost = "";
if (_udpAutoIP.equals("fixed")) { if (_udpAutoIP.equals("fixed")) {
@@ -173,18 +177,17 @@ public class ConfigNetHandler extends FormHandler {
for (Object o : _settings.keySet()) { for (Object o : _settings.keySet()) {
String k = (String) o; String k = (String) o;
if (k.startsWith("addr_")) { if (k.startsWith("addr_")) {
String v = k.substring(5); String v = DataHelper.stripHTML(k.substring(5));
if (v.length() > 0) if (v.length() > 0)
addrs.add(v); addrs.add(v);
} }
} }
if (getJettyString("addrnew") != null) { if (_udpHost1 != null && _udpHost1.length() > 0) {
if (_udpHost1 != null && _udpHost1.length() > 0) { if (verifyAddress(_udpHost1)) {
if (verifyAddress(_udpHost1)) { addrs.add(_udpHost1);
addrs.add(_udpHost1); } else {
} else { // verifyAddress() outputs form error
error = true; error = true;
}
} }
} }
int tot = addrs.size(); int tot = addrs.size();

View File

@@ -222,10 +222,12 @@ public class ConfigNetHelper extends HelperBase {
buf.append(addr); buf.append(addr);
buf.append("<br>"); buf.append("<br>");
} }
buf.append("\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" + buf.append("\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
"<input type=\"checkbox\" class=\"optbox\" name=\"addrnew\""); if (!addrs.isEmpty()) {
buf.append(CHECKED); buf.append(_t("Add host name or IP"))
buf.append("><input name =\"udpHost1\" type=\"text\" size=\"16\" />" + .append(": ");
}
buf.append("<input name=\"udpHost1\" type=\"text\" size=\"16\" >" +
"</div>"); "</div>");
return buf.toString(); return buf.toString();
} }