Changeset dd265bb


Ignore:
Timestamp:
Apr 11, 2015 7:34:34 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
dd99978
Parents:
69a0324
Message:

Updates after review:
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

Files:
23 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

    r69a0324 rdd265bb  
    4545    private volatile TunnelState _state;
    4646
     47    /** @since 0.9.19 */
    4748    private enum TunnelState {
    4849        START_ON_LOAD,
     
    850851    }
    851852
     853    /** @since 0.9.19 */
    852854    private synchronized void changeState(TunnelState state) {
    853855        _state = state;
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java

    r69a0324 rdd265bb  
    4545    private static final String OPT = TunnelController.PFX_OPTION;
    4646
    47     private I2PAppContext _context;
    48     protected TunnelControllerGroup _group;
     47    private final I2PAppContext _context;
     48    protected final TunnelControllerGroup _group;
    4949
    5050    public GeneralHelper(TunnelControllerGroup tcg) {
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

    r69a0324 rdd265bb  
    5454    //private long _nextNonce;
    5555
    56     private TunnelConfig _config;
     56    private final TunnelConfig _config;
    5757    private boolean _removeConfirmed;
    5858    private int _hashCashValue;
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java

    r69a0324 rdd265bb  
    228228        for (Map.Entry<Object, Object> e : syscopy.entrySet()) {
    229229            String name = (String) e.getKey();
    230             if (opts.getProperty(name) != null)
     230            if (opts.getProperty(name) == null)
    231231                opts.setProperty(name, (String) e.getValue());
    232232        }
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java

    r69a0324 rdd265bb  
    2828                                           _x("Reseeding"), _x("Advanced") };
    2929
     30    /** @since 0.9.19 */
    3031    private static class Tab {
    3132        public final String page, title;
     
    3536    }
    3637
     38    /** @since 0.9.19 */
    3739    private class TabComparator implements Comparator<Tab> {
    3840         private static final long serialVersionUID = 1L;
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java

    r69a0324 rdd265bb  
    7070    "http://echelon.i2p/i2p/i2pupdate.su2\r\n" +
    7171    "http://inr.i2p/i2p/i2pupdate.su2\r\n" +
    72     "http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
     72    //"http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
    7373    "http://stats.i2p/i2p/i2pupdate.su2\r\n" +
    7474    // "http://www.i2p2.i2p/_static/i2pupdate.su2\r\n" +
     
    8080    "http://echelon.i2p/i2p/i2pupdate.sud\r\n" +
    8181    "http://inr.i2p/i2p/i2pupdate.sud\r\n" +
    82     "http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
     82    //"http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
    8383    "http://stats.i2p/i2p/i2pupdate.sud\r\n" +
    8484    // "http://www.i2p2.i2p/_static/i2pupdate.sud\r\n" +
     
    114114    "http://echelon.i2p/i2p/i2pupdate.su3\r\n" +
    115115    "http://inr.i2p/i2p/i2pupdate.su3\r\n" +
    116     "http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
     116    //"http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
    117117    "http://stats.i2p/i2p/i2pupdate.su3\r\n" +
    118118    // "http://www.i2p2.i2p/_static/i2pupdate.su3\r\n" +
  • core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java

    r69a0324 rdd265bb  
    157157                    isCore2Compatible = true;
    158158                    isX64 = true;
    159                 }
    160                 if (extmodel >= 2) {
    161                     isCoreiCompatible = true;
     159                    if (extmodel >= 2)
     160                        isCoreiCompatible = true;
    162161                }
    163162                switch (model) {
  • core/java/src/net/i2p/crypto/SHA256Generator.java

    r69a0324 rdd265bb  
    7878        } catch (DigestException e) {
    7979            throw new RuntimeException(e);
     80        } finally {
     81            release(digest);
    8082        }
    81         release(digest);
    8283    }
    8384   
  • core/java/src/net/i2p/util/LogWriter.java

    r69a0324 rdd265bb  
    7575    }
    7676
     77    /**
     78     *  @since 0.9.19
     79     */
    7780    protected void flushWriter() {
    7881        try {
     
    8588    }
    8689
     90    /**
     91     *  @since 0.9.19 renamed from closeFile()
     92     */
    8793    protected void closeWriter() {
    8894        Writer out = _currentOut;
  • core/java/src/net/i2p/util/LogWriterBase.java

    r69a0324 rdd265bb  
    1717 * file.
    1818 *
     19 * @since 0.9.19 pulled from LogWriter so Android may extend
    1920 */
    2021abstract class LogWriterBase implements Runnable {
  • core/java/src/net/i2p/util/NativeBigInteger.java

    r69a0324 rdd265bb  
    197197   
    198198    static {
    199         if (_isX86) {// Don't try to resolve CPU type on non x86 hardware
     199        if (_isX86) {  // Don't try to resolve CPU type on non x86 hardware
    200200            sCPUType = resolveCPUType();
    201         }
    202         else if (_isArm) {
     201        } else if (_isArm) {
    203202            sCPUType = JBIGI_OPTIMIZATION_ARM;
    204203        } else if (_isPPC && !_isMac) {
    205                 sCPUType = JBIGI_OPTIMIZATION_PPC;
     204            sCPUType = JBIGI_OPTIMIZATION_PPC;
    206205        } else {
    207                 sCPUType = null;
     206            sCPUType = null;
    208207        }
    209208        loadNative();
  • history.txt

    r69a0324 rdd265bb  
     12015-04-11 zzz
     2 * Updates after review
     3
    142015-04-09 kytv
    25 * Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country
  • installer/resources/themes/console/classic/console.css

    r69a0324 rdd265bb  
    996996     color: #001;
    997997     font-size: 7pt;
    998      width: 320px;
     998     width: 330px;
    999999     text-align: right;
    10001000     float: right;
  • installer/resources/themes/console/dark/console.css

    r69a0324 rdd265bb  
    883883     color: #EE9;
    884884     font-size: 7pt;
    885      width: 290px;
     885     width: 300px;
    886886     text-align: right;
    887887     float: right;
  • installer/resources/themes/console/light/console.css

    r69a0324 rdd265bb  
    10891089     color: #001;
    10901090     font-size: 7pt;
    1091      width: 320px;
     1091     width: 330px;
    10921092     text-align: right;
    10931093     float: right;
  • router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java

    r69a0324 rdd265bb  
    257257        buf.append("[DatabaseStoreMessage: ");
    258258        buf.append("\n\tExpiration: ").append(new Date(_expiration));
    259         buf.append("\n\tUnique ID: ").append(_uniqueId);
     259        buf.append("\n\tUnique ID: ").append(getUniqueId());
    260260        if (_replyToken != 0) {
    261261            buf.append("\n\tReply token: ").append(_replyToken);
  • router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java

    r69a0324 rdd265bb  
    3232    protected final I2PAppContext _context;
    3333    protected long _expiration;
     34
     35    /**
     36     *  Warning, lazily initialized by readBytes(), writeBytes(), toByteArray(),
     37     *  getUniqueId(), and setUniqueId(); otherwise will be -1.
     38     *  Extending classes should take care when accessing this field;
     39     *  to ensure initialization, use getUniqueId() instead.
     40     */
    3441    protected long _uniqueId = -1;
    3542
     
    258265
    259266    /**
    260      *  The ID is set to a random value in the constructor but it can be overridden here.
     267     *  The ID is set to a random value when written but it can be overridden here.
    261268     */
    262269    public void setUniqueId(long id) { _uniqueId = id; }
  • router/java/src/net/i2p/data/i2np/TunnelDataMessage.java

    r69a0324 rdd265bb  
    235235        StringBuilder buf = new StringBuilder();
    236236        buf.append("[TunnelDataMessage:");
    237         buf.append(" MessageId: ").append(_uniqueId);
     237        buf.append(" MessageId: ").append(getUniqueId());
    238238        buf.append(" Tunnel ID: ").append(_tunnelId);
    239239        buf.append("]");
  • router/java/src/net/i2p/router/Router.java

    r69a0324 rdd265bb  
    15091509     * Unzip update file found in the router dir OR base dir, to the base dir
    15101510     *
    1511      * If successfull, will call exit() and never return.
     1511     * If successful, will call exit() and never return.
    15121512     *
    15131513     * If we can't write to the base dir, complain.
  • router/java/src/net/i2p/router/RouterVersion.java

    r69a0324 rdd265bb  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 19;
     21    public final static long BUILD = 20;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java

    r69a0324 rdd265bb  
    159159                if (ioe.getMessage() != null)
    160160                    setError(DataHelper.escapeHTML(ioe.getMessage()));
    161                 done();
    162161                throw ioe;
    163162            } finally {
  • router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

    r69a0324 rdd265bb  
    8989              "https://i2pseed.zarrenspry.info/" + "," + // Only HTTPS and SU3 (v3) support
    9090              "https://i2p.mooo.com/netDb/" + "," +
     91              "https://193.150.121.66/netDb/" + "," +
    9192              "https://netdb.i2p2.no/" + "," + // Only SU3 (v3) support
    9293              "https://us.reseed.i2p2.no:444/" + "," +
  • router/java/src/org/cybergarage/util/FileUtil.java

    r69a0324 rdd265bb  
    1919import java.io.File;
    2020import java.io.FileInputStream;
     21import java.util.Locale;
    2122
    2223public final class FileUtil
     
    7374                if (StringUtil.hasData(name) == false)
    7475                        return false;
    75                 String lowerName = name.toLowerCase();
     76                String lowerName = name.toLowerCase(Locale.US);
    7677                return lowerName.endsWith("xml");
    7778        }
Note: See TracChangeset for help on using the changeset viewer.