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

Reseed: Add SOCKS proxy support (ticket #1130)

Browse Source
This commit is contained in:
zzz
2017-11-17 23:46:45 +00:00
parent d5cc1d83f3
commit 33aac1b125
8 changed files with 172 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java
View File

@ -153,7 +153,10 @@ public class ConfigReseedHandler extends FormHandler {
changes.put(Reseeder.PROP_SSL_DISABLE,
Boolean.toString(disabled));
saveBoolean(Reseeder.PROP_PROXY_ENABLE, "enable");
saveBoolean(Reseeder.PROP_SPROXY_ENABLE, "senable");
String pmode = getJettyString("pmode");
boolean senable = pmode != null && pmode.length() > 0;
changes.put(Reseeder.PROP_SPROXY_ENABLE, Boolean.toString(senable));
saveString(Reseeder.PROP_SPROXY_TYPE, "pmode");
if (_context.router().saveConfig(changes, removes))
addFormNotice(_t("Configuration saved successfully."));
else

14
apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java
View File

@ -60,6 +60,18 @@ public class ConfigReseedHelper extends HelperBase {
return "";
}
/** @since 0.9.33 */
public String pmodeChecked(int mode) {
String c = _context.getProperty(Reseeder.PROP_SPROXY_TYPE, "HTTP");
boolean disabled = !_context.getBooleanProperty(Reseeder.PROP_SPROXY_ENABLE);
if ((mode == 0 && disabled) ||
(mode == 1 && !disabled && c.equals("HTTP")) ||
(mode == 2 && !disabled && c.equals("SOCKS4")) ||
(mode == 3 && !disabled && c.equals("SOCKS5")))
return CHECKED;
return "";
}
public String getEnable() {
return getChecked(Reseeder.PROP_PROXY_ENABLE);
}
@ -69,9 +81,11 @@ public class ConfigReseedHelper extends HelperBase {
return getChecked(Reseeder.PROP_PROXY_AUTH_ENABLE);
}
/****
public String getSenable() {
return getChecked(Reseeder.PROP_SPROXY_ENABLE);
}
****/
/** @since 0.8.9 */
public String getSauth() {