Changeset 6512a9e


Ignore:
Timestamp:
Aug 8, 2016 2:29:14 AM (5 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
f7db737
Parents:
3e96a24 (diff), 9c0ae146 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p' (head c62904685f0153a5b8cd032e8b3f1c4f64c5bec9)

to branch 'i2p.i2p.str4d.ui' (head 2a82ccb644906256af7bd0827725dc83e4c76be2)

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java

    r3e96a24 r6512a9e  
    894894        return false;
    895895    }
     896    String path = url.getPath();
     897    if (path == null || !path.startsWith("/"))
     898        return false;
    896899    return "http".equals(url.getScheme()) && url.getHost() != null &&
    897900           (url.getHost().endsWith(".i2p") || url.getHost().equals("i2p"));
     
    899902
    900903  /**
     904   *  This also validates the URL.
     905   *
    901906   *  @param ann an announce URL non-null
    902907   *  @return a Hash for i2p hosts only, null otherwise
     
    915920    if (host == null)
    916921        return null;
    917     if (host.endsWith(".i2p"))
     922    if (host.endsWith(".i2p")) {
     923        String path = url.getPath();
     924        if (path == null || !path.startsWith("/"))
     925            return null;
    918926        return ConvertToHash.getHash(host);
     927    }
    919928    if (host.equals("i2p")) {
    920929        String path = url.getPath();
     
    942951      int seenPeers;
    943952
     953      /**
     954       *  @param a must be a valid http URL with a path
     955       *  @param p true if primary
     956       */
    944957      public TCTracker(String a, boolean p)
    945958      {
  • apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

    r3e96a24 r6512a9e  
    10861086                                    if (df.delete())
    10871087                                        _manager.addMessage(_t("Data file deleted: {0}", df.getAbsolutePath()));
    1088                                     else
     1088                                    else if (df.exists())
    10891089                                        _manager.addMessage(_t("Data file could not be deleted: {0}", df.getAbsolutePath()));
     1090                                    // else already gone
    10901091                                }
    10911092                                break;
     
    10951096                                if (df.delete()) {
    10961097                                    //_manager.addMessage(_t("Data file deleted: {0}", df.getAbsolutePath()));
    1097                                 } else {
     1098                                } else if (df.exists()) {
    10981099                                    _manager.addMessage(_t("Data file could not be deleted: {0}", df.getAbsolutePath()));
     1100                                // else already gone
    10991101                                }
    11001102                            }
     
    11101112                                    ok = true;
    11111113                                    //_manager.addMessage(_t("Data dir deleted: {0}", df.getAbsolutePath()));
    1112                                 } else {
     1114                                } else if (df.exists()) {
    11131115                                    ok = false;
    11141116                                    _manager.addMessage(_t("Directory could not be deleted: {0}", df.getAbsolutePath()));
    11151117                                    if (_log.shouldLog(Log.WARN))
    11161118                                        _log.warn("Could not delete dir " + df);
     1119                                // else already gone
    11171120                                }
    11181121                            }
  • apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java

    r3e96a24 r6512a9e  
    781781        if (isFlagSet(FLAG_PROFILE_INTERACTIVE)) buf.append(" INTERACTIVE");
    782782        if (isFlagSet(FLAG_RESET)) buf.append(" RESET");
    783         if (isFlagSet(FLAG_SIGNATURE_INCLUDED)) buf.append(" SIG ").append(_optionSignature.length());
     783        if (isFlagSet(FLAG_SIGNATURE_INCLUDED)) {
     784            if (_optionSignature != null)
     785                buf.append(" SIG ").append(_optionSignature.length());
     786            else
     787                buf.append(" (to be signed)");
     788        }
    784789        if (isFlagSet(FLAG_SIGNATURE_REQUESTED)) buf.append(" SIGREQ");
    785790        if (isFlagSet(FLAG_SYNCHRONIZE)) buf.append(" SYN");
  • build.xml

    r3e96a24 r6512a9e  
    14011401    <target name="updater200" depends="prepupdate, preplicenses, pack200, zipit200" />
    14021402    <target name="updater200WithJetty" depends="prepjupdate, preplicenses, pack200, zipit200" />
     1403    <target name="updater200WithJettyAndJbigi" depends="prepjupdate, prepjbigiupdate, preplicenses, pack200, zipit200" />
    14031404    <target name="updater200WithJettyAndGeoIP" depends="prepjupdate, prepgeoupdate, preplicenses, pack200, zipit200" />
    14041405    <target name="updater200WithJettyFixes" depends="prepjupdatefixes, preplicenses, pack200, zipit200" />
     
    14141415    <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
    14151416    <target name="updaterWithJettyRepack" depends="prepjupdate, preplicenses, repack200, zipit" />
     1417    <target name="updaterWithJettyAndJbigiRepack" depends="prepjupdate, prepjbigiupdate, preplicenses, repack200, zipit" />
    14161418    <target name="updaterWithJettyAndGeoIPRepack" depends="prepjupdate, prepgeoupdate, preplicenses, repack200, zipit" />
    14171419    <target name="updaterWithJettyFixes" depends="prepjupdatefixes, preplicenses, zipit" />
     
    19161918    <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
    19171919    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
     1920    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    19181921-->
    1919     <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
     1922    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, updater200WithJettyAndJbigi, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    19201923        <echo message="New version number is ${release.number}" />
    19211924        <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
  • core/java/src/net/i2p/util/NativeBigInteger.java

    r3e96a24 r6512a9e  
    641641
    642642    /**
    643      *  @throws ArithmeticException if m &lt;= 0
     643     *  @param m must be postive
     644     *  @param exponent must be postive
     645     *  @throws ArithmeticException if m &lt;= 0 or exponent &lt;=0
    644646     */
    645647    @Override
     
    655657
    656658    /**
    657      *  @throws ArithmeticException if m &lt;= 0
     659     *  @param exponent must be postive
     660     *  @param m must be postive and odd
     661     *  @throws ArithmeticException if m &lt;= 0 or m is even or exponent &lt;=0
    658662     *  @since 0.9.26 and libjbigi version 3 and GMP version 5
    659663     */
  • history.txt

    r3e96a24 r6512a9e  
     12016-08-02 zzz
     2 * i2psnark: Fix SIOOBE on bad announce URL (ticket #1823)
     3 * SSU: Fix peer test stuck when IPv6-only (ticket #1819)
     4 * Streaming: Fix debug NPE (ticket #1821)
     5
    162016-07-20 zzz
    27 * SSU:
  • router/java/src/net/i2p/router/RouterVersion.java

    r3e96a24 r6512a9e  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 7;
     21    public final static long BUILD = 8;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/transport/udp/UDPTransport.java

    r3e96a24 r6512a9e  
    33043304                } else if (_haveIPv6Address &&_forceRun == FORCE_IPV6 && sinceRunV6 >= MIN_TEST_FREQUENCY) {
    33053305                    locked_runTest(true);
    3306                 } else if (sinceRunV4 >= TEST_FREQUENCY) {
     3306                } else if (sinceRunV4 >= TEST_FREQUENCY && getIPv6Config() != IPV6_ONLY) {
    33073307                    locked_runTest(false);
    33083308                } else if (_haveIPv6Address && sinceRunV6 >= TEST_FREQUENCY) {
     
    33173317                long delay = (TEST_FREQUENCY / 2) + _context.random().nextInt(TEST_FREQUENCY);
    33183318                // if we have 2 addresses, give IPv6 a chance also
    3319                 if (_haveIPv6Address)
     3319                if (_haveIPv6Address && getIPv6Config() != IPV6_ONLY)
    33203320                    delay /= 2;
    33213321                schedule(delay);
Note: See TracChangeset for help on using the changeset viewer.