Changeset 9b0e553


Ignore:
Timestamp:
Jun 7, 2009 2:45:33 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
45d9f9d
Parents:
ed8fd0b (diff), dcaa059 (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.test' (head f92f40cceea44a063e48db07d10fd8cf7df3e348)

to branch 'i2p.i2p' (head c497aec52c49d2e03430b88d8d73148ee73e59a5)

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    red8fd0b r9b0e553  
    1919        <echo message="  updaterWithJettyFixes: updater including local jetty patches" />
    2020        <echo message="  updaterWithGeoIP: updater including GeoIP Files" />
     21        <echo message="  updaterWithJettyFixesAndGeoIP" />
    2122        <echo message="  updaterSmall:   updater with the essentials only - no SAM, i2psnark, SusiMail, SusiDNS, news.xml, or history.txt" />
    2223        <echo message="  updaterRouter:  updater with the i2p.jar and router.jar only" />
     
    202203        </delete>
    203204    </target>
    204     <target name="pkg" depends="distclean, updaterWithJettyFixes, tarball, installer" />
     205    <!-- one release only, then back to updaterWithJettyFixes -->
     206    <target name="pkg" depends="distclean, updaterWithJettyFixesAndGeoIP, tarball, installer" />
    205207    <target name="pkgclean" depends="deletepkg-temp">
    206208        <delete>
     
    322324        <delete dir="pkg-temp" />
    323325    </target>
    324     <target name="prepconsoleDocs">
     326    <target name="prepconsoleDocs" depends="prepgeoupdate">
    325327        <copy todir="pkg-temp/docs/" >
    326328          <fileset dir="." includes="readme*.html" />
    327329          <fileset dir="installer/resources/" includes="*-header.ht" />
    328330        </copy>
    329         <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    330         <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    331         <copy todir="pkg-temp/docs/icons/flags" >
    332           <fileset dir="installer/resources/icons/flags" />
    333         </copy>
    334331    </target>
    335332    <target name="consoleDocs" depends="deletepkg-temp, prepconsoleDocs">
     
    337334    </target>
    338335    <target name="updater" depends="prepupdate, preplicenses, zipit" />
    339     <target name="updaterWithGeoIP" depends="prepgeoupdate, preplicenses, zipit" />
     336    <target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" />
    340337    <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
    341338    <target name="updaterWithJettyFixes" depends="prepjupdatefixes, preplicenses, zipit" />
     339    <target name="updaterWithJettyFixesAndGeoIP" depends="prepjupdatefixes, prepgeoupdate, preplicenses, zipit" />
    342340    <target name="updaterSmall" depends="prepupdateSmall, zipit" />
    343341    <target name="updaterRouter" depends="prepupdateRouter, zipit" />
     
    377375        <copy file="build/router.jar" todir="pkg-temp/lib/" />
    378376    </target>
    379     <target name="prepgeoupdate" depends="prepupdate">
     377    <target name="prepgeoupdate">
    380378        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    381379        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
  • core/java/src/net/i2p/time/Timestamper.java

    red8fd0b r9b0e553  
    33import java.util.ArrayList;
    44import java.util.List;
     5import java.util.Locale;
    56import java.util.StringTokenizer;
    67
     
    247248            serverList = DEFAULT_SERVER_LIST;
    248249            String country = _context.getProperty(PROP_IP_COUNTRY);
    249             if (country != null) {
     250            if (country == null) {
     251                country = Locale.getDefault().getCountry();
     252                if (country != null)
     253                    country = country.toLowerCase();
     254            }
     255            if (country != null &&  country.length() > 0) {
    250256                _priorityServers = new ArrayList(3);
    251257                for (int i = 0; i < 3; i++)
  • router/java/src/net/i2p/router/RouterWatchdog.java

    red8fd0b r9b0e553  
    5050   
    5151    private boolean shutdownOnHang() {
    52         // prop default true
    53         if (!Boolean.valueOf(_context.getProperty("watchdog.haltOnHang", "true")).booleanValue())
     52        // prop default false
     53        if (!Boolean.valueOf(_context.getProperty("watchdog.haltOnHang")).booleanValue())
    5454            return false;
    5555
     
    9595            _log.error("Memory: " + DataHelper.formatSize(used) + '/' + DataHelper.formatSize(max));
    9696            if (_consecutiveErrors == 1) {
    97                 _log.log(Log.CRIT, "Router appears hung!  Will restart in 20 minutes if it doesn't fix itself");
     97                _log.log(Log.CRIT, "Router appears hung, or there is severe network congestion.  Watchdog starts barking!");
    9898                // This might work on linux...
    9999                // It won't on windows, and we can't call i2prouter.bat either, it does something
  • router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java

    red8fd0b r9b0e553  
    10701070        String country = _context.commSystem().getCountry(info.getIdentity().getHash());
    10711071        if(country != null) {
    1072             buf.append(" <img alt=\"").append(country.toUpperCase()).append("\"");
    1073             buf.append(" src=\"/flags.jsp?c=").append(country).append("\">");
     1072            buf.append("<img alt=\"").append(country.toUpperCase()).append("\"");
     1073            buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ");
    10741074        }
    10751075        for (Iterator iter = info.getAddresses().iterator(); iter.hasNext(); ) {
  • router/java/src/net/i2p/router/transport/TransportImpl.java

    red8fd0b r9b0e553  
    107107                def = MAX_CONNECTION_FACTOR * (1 + bw - Router.CAPABILITY_BW12);
    108108        }
     109        // increase limit for SSU, for now
     110        if (style.equals("udp"))
     111            def = def * 4 / 3;
    109112        return _context.getProperty("i2np." + style + ".maxConnections", def);
    110113    }
  • router/java/src/net/i2p/router/transport/ntcp/EventPumper.java

    red8fd0b r9b0e553  
    5252     */
    5353    private static final long FAILSAFE_ITERATION_FREQ = 2*1000l;
    54     private static final long MIN_EXPIRE_IDLE_TIME = 5*60*1000l;
     54    /** tunnel test is every 30-60s, so this should be longer than, say, 3*45s to allow for drops */
     55    private static final long MIN_EXPIRE_IDLE_TIME = 3*60*1000l;
    5556    private static final long MAX_EXPIRE_IDLE_TIME = 15*60*1000l;
    5657   
  • router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java

    red8fd0b r9b0e553  
    459459                out.write("<td>n/a</td>");
    460460            if (cfg.getReceiveFrom() != null)
    461                 out.write("<td>" + netDbLink(cfg.getReceiveFrom()) +"</td>");
     461                out.write("<td align=\"right\">" + netDbLink(cfg.getReceiveFrom()) +"</td>");
    462462            else
    463463                out.write("<td>&nbsp;</td>");
     
    467467                out.write("<td>&nbsp;</td>");
    468468            if (cfg.getSendTo() != null)
    469                 out.write("<td>" + netDbLink(cfg.getSendTo()) +"</td>");
     469                out.write("<td align=\"right\">" + netDbLink(cfg.getSendTo()) +"</td>");
    470470            else
    471471                out.write("<td>&nbsp;</td>");
     
    604604        out.write("<table border=\"1\"><tr><td><b>Peer</b></td><td><b>Expl. + Client</b></td><td><b>% of total</b></td><td><b>Part. from + to</b></td><td><b>% of total</b></td></tr>\n");
    605605        for (Hash h : peerList) {
    606              out.write("<tr><td>");
     606             out.write("<tr><td align=\"right\">");
    607607             out.write(netDbLink(h));
    608608             out.write("<td align=\"right\">" + lc.count(h));
  • router/java/src/org/cybergarage/xml/Parser.java

    red8fd0b r9b0e553  
    105105        {
    106106                try {
    107                         StringBufferInputStream decrIn = new StringBufferInputStream(descr);
     107                        InputStream decrIn = new ByteArrayInputStream(descr.getBytes());
    108108                        Node root = parse(decrIn);
    109109                        return root;
Note: See TracChangeset for help on using the changeset viewer.