Changeset 36b2547


Ignore:
Timestamp:
Feb 10, 2014 6:46:38 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
6af82f2
Parents:
72e96cd (diff), a2ba9bb (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.zzz.test2' (head 7db2f2b73bc7c44b4be1077185314201c5b0bfe6)

to branch 'i2p.i2p' (head ea9844ecc27e816a09cf5d9b36c10ee2c3d1bcc9)

Files:
22 edited

Legend:

Unmodified
Added
Removed
  • INSTALL-headless.txt

    r72e96cd r36b2547  
    1313
    1414If you're having trouble, swing by http://forum.i2p/, check the
    15 website at http://www.i2p2.de/, or get on irc://irc.freenode.net/#i2p
     15website at https://geti2p.net/, or get on irc://irc.freenode.net/#i2p
    1616
    1717I2P will create and store files and configuration data in the user directory
  • README.txt

    r72e96cd r36b2547  
    1616
    1717        Run 'ant' with no arguments to see other build options.
    18         See INSTALL.txt or http://www.i2p2.de/download.html for installation instructions.
     18        See INSTALL.txt or https://geti2p.net/download for installation instructions.
    1919
    2020Documentation:
    21         http://www.i2p2.de/how
     21        https://geti2p.net/how
    2222        API: run 'ant javadoc' then start at build/javadoc/index.html
    2323
    2424Latest release:
    25         http://www.i2p2.de/download
     25        https://geti2p.net/download
    2626
    2727To get development branch from source control:
    28         http://www.i2p2.de/newdevelopers
     28        https://geti2p.net/newdevelopers
    2929
    3030FAQ:
    31         http://www.i2p2.de/faq
     31        https://geti2p.net/faq
    3232
    3333Need help?
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java

    r72e96cd r36b2547  
    13201320     * @param args {username, password}
    13211321     * @param l logger to receive events and output
    1322      * @since 0.9.10
     1322     * @since 0.9.11
    13231323     */
    13241324    private void runAuth(String args[], Logging l) {
     
    17751775     *  @param user may be null
    17761776     *  @param pw may be null
    1777      *  @since 0.9.10
     1777     *  @since 0.9.11
    17781778     */
    17791779    private static Destination destFromName(String name, String i2cpHost,
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

    r72e96cd r36b2547  
    5656
    5757    /**
    58      *  Protected for I2Ping since 0.9.10. Not for use outside package.
     58     *  Protected for I2Ping since 0.9.11. Not for use outside package.
    5959     */
    6060    protected boolean listenerReady;
     
    587587
    588588    /**
    589      *  Non-final since 0.9.10.
     589     *  Non-final since 0.9.11.
    590590     *  Any overrides must set listenerReady = true.
    591591     */
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java

    r72e96cd r36b2547  
    247247    /**
    248248     *  Does nothing.
    249      *  @since 0.9.10
     249     *  @since 0.9.11
    250250     */
    251251    protected void clientConnectionRun(Socket s) {}
     
    261261
    262262        /**
    263          *  As of 0.9.10, does NOT start itself.
     263         *  As of 0.9.11, does NOT start itself.
    264264         *  Caller must call start()
    265265         *  @param dest b64 or b32 or host name
     
    330330        /**
    331331         *  @param name b64 or b32 or host name
    332          *  @since 0.9.10
     332         *  @since 0.9.11
    333333         */
    334334        private Destination lookup(String name) {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

    r72e96cd r36b2547  
    104104    /** todo sort by translated string */
    105105    public String getLangSettings() {
    106         StringBuilder buf = new StringBuilder(512);
    107         String current = Messages.getLanguage(_context);
     106        String clang = Messages.getLanguage(_context);
     107        String current = clang;
    108108        String country = Messages.getCountry(_context);
    109109        if (country != null && country.length() > 0)
    110110            current += '_' + country;
     111        // find best match
     112        boolean found = false;
     113        for (int i = 0; i < langs.length; i++) {
     114            if (langs[i][0].equals(current)) {
     115                found = true;
     116                break;
     117            }
     118        }
     119        if (!found) {
     120            if (country != null && country.length() > 0) {
     121                current = clang;
     122                for (int i = 0; i < langs.length; i++) {
     123                    if (langs[i][0].equals(current)) {
     124                        found = true;
     125                        break;
     126                    }
     127                }
     128            }
     129            if (!found)
     130                current = "en";
     131        }
     132        StringBuilder buf = new StringBuilder(512);
    111133        for (int i = 0; i < langs.length; i++) {
    112134            // we use "lang" so it is set automagically in CSSHelper
  • apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java

    r72e96cd r36b2547  
    352352            _out.write("<br><h3>" + _("Configure Graph Display") + " [<a href=\"configstats\">" + _("Select Stats") + "</a>]</h3>");
    353353            _out.write("<form action=\"graphs\" method=\"POST\">\n" +
    354                        "<input type=\"hidden\" name=\"action\" value=\"foo\">\n" +
     354                       "<input type=\"hidden\" name=\"action\" value=\"save\">\n" +
    355355                       "<input type=\"hidden\" name=\"nonce\" value=\"" + nonce + "\" >\n");
    356356            _out.write(_("Periods") + ": <input size=\"5\" style=\"text-align: right;\" type=\"text\" name=\"periodCount\" value=\"" + _periodCount + "\"><br>\n");
     
    381381                _out.write(" checked=\"checked\"");
    382382            _out.write(">" +
    383                        "<hr><div class=\"formaction\"><input type=\"submit\" class=\"acceot\" value=\"" + _("Save settings and redraw graphs") + "\"></div></form>");
     383                       "<hr><div class=\"formaction\"><input type=\"submit\" class=\"accept\" value=\"" + _("Save settings and redraw graphs") + "\"></div></form>");
    384384        } catch (IOException ioe) {
    385385            ioe.printStackTrace();
     
    414414    @Override
    415415    protected void processForm() {
    416         saveSettings();
     416        if ("save".equals(_action))
     417            saveSettings();
    417418    }
    418419
  • apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java

    r72e96cd r36b2547  
    7979                //System.out.println("Add " + val + " over " + eventCount + " for " + _name
    8080                //                   + " [" + names[0] + ", " + names[1] + "]");
     81            } catch (IllegalArgumentException iae) {
     82                // ticket #1186
     83                // apparently a corrupt file, thrown from update()
     84                _log.error("Error adding", iae);
     85                String path = _isPersistent ? _db.getPath() : null;
     86                stopListening();
     87                if (path != null)
     88                    (new File(path)).delete();
    8189            } catch (IOException ioe) {
    8290                _log.error("Error adding", ioe);
     91                stopListening();
    8392            } catch (RrdException re) {
    8493                // this can happen after the time slews backwards, so don't make it an error
  • apps/routerconsole/jsp/error500.jsp

    r72e96cd r36b2547  
    3232          "<a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>",
    3333          "<a href=\"https://trac.i2p2.de/newticket\">trac.i2p2.de</a>")%>
     34<!--
    3435<%=intl._("You may use the username \"guest\" and password \"guest\" if you do not wish to register.")%>
     36-->
    3537<p><%=intl._("Please include this information in bug reports")%>:
    3638</p></div><div class="sorry" id="warning2">
  • apps/routerconsole/jsp/logs.jsp

    r72e96cd r36b2547  
    1818          "<a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>",
    1919          "<a href=\"https://trac.i2p2.de/newticket\">trac.i2p2.de</a>")%>
     20<!--
    2021<%=intl._("You may use the username \"guest\" and password \"guest\" if you do not wish to register.")%>
     22-->
    2123<p><i><%=intl._("Please include this information in bug reports")%>:</i>
    2224 <p>
  • core/java/src/net/i2p/CoreVersion.java

    r72e96cd r36b2547  
    1717    /** deprecated */
    1818    public final static String ID = "Monotone";
    19     public final static String VERSION = "0.9.10";
     19    public final static String VERSION = "0.9.11";
    2020
    2121    public static void main(String args[]) {
  • core/java/src/net/i2p/I2PAppContext.java

    r72e96cd r36b2547  
    129129                         _lock9 = new Object(), _lock10 = new Object(), _lock11 = new Object(), _lock12 = new Object(),
    130130                         _lock13 = new Object(), _lock14 = new Object(), _lock15 = new Object(), _lock16 = new Object(),
    131                          _lock17 = new Object(), _lock18 = new Object(), _lock19 = new Object(), _lock20 = new Object(),
    132                          _lock21 = new Object();
     131                         _lock17 = new Object(), _lock18 = new Object(), _lock19 = new Object(), _lock20 = new Object();
    133132
    134133    /**
  • core/java/src/net/i2p/data/i2cp/GetDateMessage.java

    r72e96cd r36b2547  
    2525 *
    2626 * Since 0.8.7, optionally include a version string.
    27  * Since 0.9.10, optionally include options.
     27 * Since 0.9.11, optionally include options.
    2828 */
    2929public class GetDateMessage extends I2CPMessageImpl {
     
    5050     *  @param options Client options to be sent to the router; primarily for authentication; may be null;
    5151     *                 keys and values 255 bytes (not chars) max each
    52      *  @since 0.9.10
     52     *  @since 0.9.11
    5353     */
    5454    public GetDateMessage(String version, Properties options) {
     
    7373     *
    7474     *  @return may be null
    75      *  @since 0.9.10
     75     *  @since 0.9.11
    7676     */
    7777    public Properties getOptions() {
  • core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java

    r72e96cd r36b2547  
    2424    /**
    2525     *  This is huge. Mainly to catch a completly bogus response, possibly not an I2CP socket.
    26      *  @since 0.9.10
     26     *  @since 0.9.11
    2727     */
    2828    public static final int MAX_LENGTH = 128*1024;
  • history.txt

    r72e96cd r36b2547  
     12014-02-10 zzz
     2 * Console:
     3   - Don't reset graph settings when clicking restart or shutdown on graphs page
     4   - Don't recommend guest login on trac, it's disabled
     5   - Catch and remove corrupt jrb file (ticket #1186)
     6   - Always set default language on /configui
     7 * Transports: Reduce target connection count again to reduce
     8               tunnel reject rate further
     9
     10* 2014-02-08 0.9.11 released
     11
    1122014-02-07 zzz
    213 * Services:
  • installer/install.xml

    r72e96cd r36b2547  
    55    <info>
    66        <appname>i2p</appname>
    7         <appversion>0.9.10</appversion>
     7        <appversion>0.9.11</appversion>
    88        <authors>
    99            <author name="I2P" email="https://geti2p.net/"/>
  • installer/resources/checklist.txt

    r72e96cd r36b2547  
    7474        All in-network update hosts
    7575        PPA maintainer
    76         Google code maintainer
    7776        news.xml maintainer
     77        backup news.xml maintainer
    7878
    7979Website files to change:
    80         Sync with mtn.i2p2.i2p
     80        Sync with mtn.i2p-projekt.i2p
    8181        hosts.txt if it changed (copy from i2p.i2p mtn branch)
    8282        i2p2www/__init__.py (release number)
     
    8484        i2p2www/static/news/news.xml
    8585        New release announcement - see i2p2www/blog/README for instructions
    86         Sync with mtn.i2p2.i2p
     86        Sync with mtn.i2p-projekt.i2p
    8787
    8888Announce on:
  • installer/resources/hosts.txt

    r72e96cd r36b2547  
    353353i2pjump.i2p=ouBpQCfwiBcdoZD3vMNT8HXB091kwgI766U6sdWhstY6~7Aixpo8JsNaSO1LV01I20kEzAgmWP8cf5469gSa-YeXAjhKSQPtUgQiKCoRhv2virj--~ecvv4OhyIzCiYoWMMFHV50c02Lg~EE8LGbEkIbRXUZaIWlYwnLC-MzPtuSXhFjHW03h0v~QGeIlYFr8nkpBayqdB8SLkieKygnlOgLRSehmHWZeA0yIz1aCpDuTrZAmAdb3ZwcNm0fxWl~AEpELZ-ax8x6Ibb0kHgPxP1lRr1J7MH~yYXrkymqIPEj-sNLavlAN5oEK6~A45hLd-IENfQ9v-AlntZMon~zeDvxDwHqyKy4OOCbHV7LmitYryEZTVoQNDPPHa6o0pnkBjaPWEnJoDqzU~s-alViTYwR7qkGZMxSp~tej~TngU8GUYEHn4kdTnni0~RTY~50ZyI~2~2ESUCIfFWHzYKQXclzt-uxmNsCL7npmD1-MKZUQ1ECwPR2xKv5vqJwO5ZKAAAA
    354354psi.i2p=a11l91etedRW5Kl2GhdDI9qiRBbDRAQY6TWJb8KlSc0P9WUrEviABAAltqDU1DFJrRhMAZg5i6rWGszkJrF-pWLQK9JOH33l4~mQjB8Hkt83l9qnNJPUlGlh9yIfBY40CQ0Ermy8gzjHLayUpypDJFv2V6rHLwxAQeaXJu8YXbyvCucEu9i6HVO49akXW9YSxcZEqxK04wZnjBqhHGlVbehleMqTx9nkd0pUpBZz~vIaG9matUSHinopEo6Wegml9FEz~FEaQpPknKuMAGGSNFVJb0NtaOQSAocAOg1nLKh80v232Y8sJOHG63asSJoBa6bGwjIHftsqD~lEmVV4NkgNPybmvsD1SCbMQ2ExaCXFPVQV-yJhIAPN9MRVT9cSBT2GCq-vpMwdJ5Nf0iPR3M-Ak961JUwWXPYTL79toXCgxDX2~nZ5QFRV490YNnfB7LQu10G89wG8lzS9GWf2i-nk~~ez0Lq0dH7qQokFXdUkPc7bvSrxqkytrbd-h8O8AAAA
     355irc.dg.i2p=bunRitjuWmSGkf5UV7pnjMRIxmP7fuHy9SgDfAA0M~4TWoBr4Ji4m5AyMGzhAdNaQW6c2-0CIe~RCDZ~vcN-BSNpaqzd80gKhXYxqUQQB83XRWDdLz-z0H~Y15k90p~n0GUSzsjlZctkYglNMyQ8MAUIpUEiLz6MVwArZqUI-CDOE664ZazcGtSKfBLZKycHsSj6WfLbwl2-R5Zv4f5Xisv9Hd0b8BsqJEWn1AmBMhM7p8l7okM2ZcRnC5ypzBdLfLSdkGJ5dEZAJIxz-GhtB8rJ3e0jJkbFjknGrJfxbwt~5n00nVuiUNMro2JRxQ7w~VzMw~lYRq~1B5TMtaKRDhxk7pnv5MxmVBFNhcT~hImcyxfT7GfIPzYU9s~uiFReoSjAOJZv-rKq4Oyeyz-Pa6lcg-c3MtuTXjJ2BMX2dA5Jw0FFVDDMOdDL2b1lwtyseQQkGtc15i4EtNy6iJrkbqAnIhO86E2C3jDf~yt2FlDlcbx6dkflJ3y3j2Wu9DAgAAAA
  • installer/resources/readme/readme_fr.html

    r72e96cd r36b2547  
    11<div lang="fr">
    2 (traduction de mars 2011 - cliquez sur le drapeau ci-dessus pour l'original en anglais)
    32<ul class="links"><li class="tidylist"><b>Démarrage&hellip;</b><br>Si vous venez juste de lancer I2P, le nombre de
    43<i>pairs actifs</i> indiqués dans la section <i>Pairs</i> du "Panneau de surveillance" sur la  gauche devrait
  • router/java/src/net/i2p/router/RouterVersion.java

    r72e96cd r36b2547  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 11;
     21    public final static long BUILD = 1;
    2222
    2323    /** for example "-test" */
    24     public final static String EXTRA = "-rc";
     24    public final static String EXTRA = "";
    2525    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
    2626    public static void main(String args[]) {
  • router/java/src/net/i2p/router/transport/ntcp/EventPumper.java

    r72e96cd r36b2547  
    212212
    213213                        // Increase allowed idle time if we are well under allowed connections, otherwise decrease
    214                         if (_transport.haveCapacity(45))
     214                        if (_transport.haveCapacity(33))
    215215                            _expireIdleWriteTime = Math.min(_expireIdleWriteTime + 1000, MAX_EXPIRE_IDLE_TIME);
    216216                        else
  • router/java/src/net/i2p/router/transport/udp/UDPTransport.java

    r72e96cd r36b2547  
    28472847        public void timeReached() {
    28482848            // Increase allowed idle time if we are well under allowed connections, otherwise decrease
    2849             if (haveCapacity(45)) {
     2849            if (haveCapacity(33)) {
    28502850                long inc;
    28512851                // don't adjust too quickly if we are looping fast
Note: See TracChangeset for help on using the changeset viewer.