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

* Reseed:

Browse Source 
- Update host lists
    - Switch back to https by default
This commit is contained in:
zzz
2011-10-06 16:06:52 +00:00
parent 2332ac2a69
commit 0c3f84c2da
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ public class ConfigReseedHelper extends HelperBase {
public String modeChecked(int mode) { public String modeChecked(int mode) {
boolean required = _context.getBooleanProperty(Reseeder.PROP_SSL_REQUIRED); boolean required = _context.getBooleanProperty(Reseeder.PROP_SSL_REQUIRED);
boolean disabled = _context.getBooleanPropertyDefaultTrue(Reseeder.PROP_SSL_DISABLE); boolean disabled = _context.getBooleanProperty(Reseeder.PROP_SSL_DISABLE);
if ((mode == 0 && (!disabled) && (!required)) || if ((mode == 0 && (!disabled) && (!required)) ||
(mode == 1 && (!disabled) && required) || (mode == 1 && (!disabled) && required) ||
(mode == 2 && disabled)) (mode == 2 && disabled))

23
router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
View File

@ -56,22 +56,21 @@ public class Reseeder {
* URLs are constructed, and because SSLEepGet doesn't follow redirects. * URLs are constructed, and because SSLEepGet doesn't follow redirects.
*/ */
public static final String DEFAULT_SEED_URL = public static final String DEFAULT_SEED_URL =
"http://netdb.i2p2.de/," + "http://netdb.i2p2.de/" + "," +
"http://reseed.i2p-projekt.de/," + "http://reseed.i2p-projekt.de/" + "," +
"http://forum.i2p2.de/netdb/," + "http://forum.i2p2.de/netdb/" + "," +
/* "http://www.i2pbote.net/netDb/," + NO DATA */ /* "http://www.i2pbote.net/netDb/," + NO DATA */
"http://r31453.ovh.net/static_media/files/netDb/," + /* "http://r31453.ovh.net/static_media/files/netDb/," + DOWN */
"http://cowpuncher.drollette.com/netdb/"; "http://cowpuncher.drollette.com/netdb/" + "," +
"http://75.145.125.59/netDb/";
/** @since 0.8.2 */ /** @since 0.8.2 */
public static final String DEFAULT_SSL_SEED_URL = public static final String DEFAULT_SSL_SEED_URL =
/* "https://a.netdb.i2p2.de/," + bad cert */ "https://netdb.i2p2.de/" + "," +
/* "https://c.netdb.i2p2.de/," + no data */ "https://forum.i2p2.de/netdb/" + "," +
"https://netdb.i2p2.de/," +
"https://forum.i2p2.de/netdb/," +
/* "https://www.i2pbote.net/netDb/," + NO DATA */ /* "https://www.i2pbote.net/netDb/," + NO DATA */
"https://reseed.i2p-projekt.de/," + "https://reseed.i2p-projekt.de/" + "," +
"https://r31453.ovh.net/static_media/files/netDb/," + /* "https://r31453.ovh.net/static_media/files/netDb/," + DOWN */
"https://cowpuncher.drollette.com/netdb/"; "https://cowpuncher.drollette.com/netdb/";
private static final String PROP_INPROGRESS = "net.i2p.router.web.ReseedHandler.reseedInProgress"; private static final String PROP_INPROGRESS = "net.i2p.router.web.ReseedHandler.reseedInProgress";
@ -245,7 +244,7 @@ public class Reseeder {
List<String> URLList = new ArrayList(); List<String> URLList = new ArrayList();
String URLs = _context.getProperty(PROP_RESEED_URL); String URLs = _context.getProperty(PROP_RESEED_URL);
boolean defaulted = URLs == null; boolean defaulted = URLs == null;
boolean SSLDisable = _context.getBooleanPropertyDefaultTrue(PROP_SSL_DISABLE); boolean SSLDisable = _context.getBooleanProperty(PROP_SSL_DISABLE);
if (defaulted) { if (defaulted) {
if (SSLDisable) if (SSLDisable)
URLs = DEFAULT_SEED_URL; URLs = DEFAULT_SEED_URL;