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

Updates after review:

Browse Source 
Remove meeh.i2p as update host (ticket #1515)
Re-add 193.xxx https reseed
Fix SocketManagerFactory property handling
Restore UPnP locale fix lost in the merge
i2ptunnel finals
I2NP unique id fixes
duplicate done() in ReseedChecker
bigger langbox in CSS
reformatting
Javadocs
This commit is contained in:
zzz
2015-04-11 19:34:34 +00:00
parent 69a0324e86
commit dd265bbd54
23 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
View File

@ -44,6 +44,7 @@ public class TunnelController implements Logging {
private List<I2PSession> _sessions;
private volatile TunnelState _state;
/** @since 0.9.19 */
private enum TunnelState {
START_ON_LOAD,
STARTING,
@ -849,6 +850,7 @@ public class TunnelController implements Logging {
return true;
}
/** @since 0.9.19 */
private synchronized void changeState(TunnelState state) {
_state = state;
}

4
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
View File

@ -44,8 +44,8 @@ public class GeneralHelper {
private static final String OPT = TunnelController.PFX_OPTION;
private I2PAppContext _context;
protected TunnelControllerGroup _group;
private final I2PAppContext _context;
protected final TunnelControllerGroup _group;
public GeneralHelper(TunnelControllerGroup tcg) {
this(I2PAppContext.getGlobalContext(), tcg);

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

@ -53,7 +53,7 @@ public class IndexBean {
private String _curNonce;
//private long _nextNonce;
private TunnelConfig _config;
private final TunnelConfig _config;
private boolean _removeConfirmed;
private int _hashCashValue;
private int _certType;

2
apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
View File

@ -227,7 +227,7 @@ public class I2PSocketManagerFactory {
Properties syscopy = (Properties) System.getProperties().clone();
for (Map.Entry<Object, Object> e : syscopy.entrySet()) {
String name = (String) e.getKey();
if (opts.getProperty(name) != null)
if (opts.getProperty(name) == null)
opts.setProperty(name, (String) e.getValue());
}
// as of 0.8.1 (I2CP default is BestEffort)

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

@ -27,6 +27,7 @@ public class ConfigNavHelper extends HelperBase {
_x("Clients"), _x("Peers"), _x("Keyring"), _x("Logging"), _x("Stats"),
_x("Reseeding"), _x("Advanced") };
/** @since 0.9.19 */
private static class Tab {
public final String page, title;
public Tab(String p, String t) {
@ -34,6 +35,7 @@ public class ConfigNavHelper extends HelperBase {
}
}
/** @since 0.9.19 */
private class TabComparator implements Comparator<Tab> {
private static final long serialVersionUID = 1L;
private final Collator coll;

6
apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
View File

@ -69,7 +69,7 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String PACK200_URLS =
"http://echelon.i2p/i2p/i2pupdate.su2\r\n" +
"http://inr.i2p/i2p/i2pupdate.su2\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
//"http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
"http://stats.i2p/i2p/i2pupdate.su2\r\n" +
// "http://www.i2p2.i2p/_static/i2pupdate.su2\r\n" +
"http://update.dg.i2p/files/i2pupdate.su2\r\n" +
@ -79,7 +79,7 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String NO_PACK200_URLS =
"http://echelon.i2p/i2p/i2pupdate.sud\r\n" +
"http://inr.i2p/i2p/i2pupdate.sud\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
//"http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
"http://stats.i2p/i2p/i2pupdate.sud\r\n" +
// "http://www.i2p2.i2p/_static/i2pupdate.sud\r\n" +
"http://update.dg.i2p/files/i2pupdate.sud\r\n" +
@ -113,7 +113,7 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String DEFAULT_SU3_UPDATE_URLS =
"http://echelon.i2p/i2p/i2pupdate.su3\r\n" +
"http://inr.i2p/i2p/i2pupdate.su3\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
//"http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
"http://stats.i2p/i2p/i2pupdate.su3\r\n" +
// "http://www.i2p2.i2p/_static/i2pupdate.su3\r\n" +
"http://update.dg.i2p/files/i2pupdate.su3\r\n" +