diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index c650c6f2bd..14cc0341a8 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -595,9 +595,9 @@ public class SnarkManager implements Snark.CompleteListener { private static final String DEFAULT_TRACKERS[] = { "Postman", "http://YRgrgTLGnbTq2aZOZDJQ~o6Uk5k6TK-OZtx0St9pb0G-5EGYURZioxqYG8AQt~LgyyI~NCj6aYWpPO-150RcEvsfgXLR~CxkkZcVpgt6pns8SRc3Bi-QSAkXpJtloapRGcQfzTtwllokbdC-aMGpeDOjYLd8b5V9Im8wdCHYy7LRFxhEtGb~RL55DA8aYOgEXcTpr6RPPywbV~Qf3q5UK55el6Kex-6VCxreUnPEe4hmTAbqZNR7Fm0hpCiHKGoToRcygafpFqDw5frLXToYiqs9d4liyVB-BcOb0ihORbo0nS3CLmAwZGvdAP8BZ7cIYE3Z9IU9D1G8JCMxWarfKX1pix~6pIA-sp1gKlL1HhYhPMxwyxvuSqx34o3BqU7vdTYwWiLpGM~zU1~j9rHL7x60pVuYaXcFQDR4-QVy26b6Pt6BlAZoFmHhPcAuWfu-SFhjyZYsqzmEmHeYdAwa~HojSbofg0TMUgESRXMw6YThK1KXWeeJVeztGTz25sL8AAAA.i2p/announce.php=http://tracker.postman.i2p/" , "eBook", "http://E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Qmj81TYFZdewFZa9mSJ533UZgGyQkXo2ahctg82JKYZfDe5uDxAn1E9YPjxZCWJaFJh0S~UwSs~9AZ7UcauSJIoNtpxrtbmRNVFLqnkEDdLZi26TeucfOmiFmIWnVblLniWv3tG1boE9Abd-6j3FmYVrRucYuepAILYt6katmVNOk6sXmno1Eynrp~~MBuFq0Ko6~jsc2E2CRVYXDhGHEMdt-j6JUz5D7S2RIVzDRqQyAZLKJ7OdQDmI31przzmne1vOqqqLC~1xUumZVIvF~yOeJUGNjJ1Vx0J8i2BQIusn1pQJ6UCB~ZtZZLQtEb8EPVCfpeRi2ri1M5CyOuxN0V5ekmPHrYIBNevuTCRC26NP7ZS5VDgx1~NaC3A-CzJAE6f1QXi0wMI9aywNG5KGzOPifcsih8eyGyytvgLtrZtV7ykzYpPCS-rDfITncpn5hliPUAAAA.i2p/pub/bt/announce.php=http://de-ebook-archiv.i2p/pub/bt/" - , "Gaytorrents", "http://uxPWHbK1OIj9HxquaXuhMiIvi21iK0~ZiG9d8G0840ZXIg0r6CbiV71xlsqmdnU6wm0T2LySriM0doW2gUigo-5BNkUquHwOjLROiETnB3ZR0Ml4IGa6QBPn1aAq2d9~g1r1nVjLE~pcFnXB~cNNS7kIhX1d6nLgYVZf0C2cZopEow2iWVUggGGnAA9mHjE86zLEnTvAyhbAMTqDQJhEuLa0ZYSORqzJDMkQt90MV4YMjX1ICY6RfUSFmxEqu0yWTrkHsTtRw48l~dz9wpIgc0a0T9C~eeWvmBFTqlJPtQZwntpNeH~jF7nlYzB58olgV2HHFYpVYD87DYNzTnmNWxCJ5AfDorm6AIUCV2qaE7tZtI1h6fbmGpGlPyW~Kw5GXrRfJwNvr6ajwAVi~bPVnrBwDZezHkfW4slOO8FACPR28EQvaTu9nwhAbqESxV2hCTq6vQSGjuxHeOuzBOEvRWkLKOHWTC09t2DbJ94FSqETmZopTB1ukEmaxRWbKSIaAAAA.i2p/announce.php=http://gaytorrents.i2p/" +// , "Gaytorrents", "http://uxPWHbK1OIj9HxquaXuhMiIvi21iK0~ZiG9d8G0840ZXIg0r6CbiV71xlsqmdnU6wm0T2LySriM0doW2gUigo-5BNkUquHwOjLROiETnB3ZR0Ml4IGa6QBPn1aAq2d9~g1r1nVjLE~pcFnXB~cNNS7kIhX1d6nLgYVZf0C2cZopEow2iWVUggGGnAA9mHjE86zLEnTvAyhbAMTqDQJhEuLa0ZYSORqzJDMkQt90MV4YMjX1ICY6RfUSFmxEqu0yWTrkHsTtRw48l~dz9wpIgc0a0T9C~eeWvmBFTqlJPtQZwntpNeH~jF7nlYzB58olgV2HHFYpVYD87DYNzTnmNWxCJ5AfDorm6AIUCV2qaE7tZtI1h6fbmGpGlPyW~Kw5GXrRfJwNvr6ajwAVi~bPVnrBwDZezHkfW4slOO8FACPR28EQvaTu9nwhAbqESxV2hCTq6vQSGjuxHeOuzBOEvRWkLKOHWTC09t2DbJ94FSqETmZopTB1ukEmaxRWbKSIaAAAA.i2p/announce.php=http://gaytorrents.i2p/" , "NickyB", "http://9On6d3cZ27JjwYCtyJJbowe054d5tFnfMjv4PHsYs-EQn4Y4mk2zRixatvuAyXz2MmRfXG-NAUfhKr0KCxRNZbvHmlckYfT-WBzwwpiMAl0wDFY~Pl8cqXuhfikSG5WrqdPfDNNIBuuznS0dqaczf~OyVaoEOpvuP3qV6wKqbSSLpjOwwAaQPHjlRtNIW8-EtUZp-I0LT45HSoowp~6b7zYmpIyoATvIP~sT0g0MTrczWhbVTUZnEkZeLhOR0Duw1-IRXI2KHPbA24wLO9LdpKKUXed05RTz0QklW5ROgR6TYv7aXFufX8kC0-DaKvQ5JKG~h8lcoHvm1RCzNqVE-2aiZnO2xH08H-iCWoLNJE-Td2kT-Tsc~3QdQcnEUcL5BF-VT~QYRld2--9r0gfGl-yDrJZrlrihHGr5J7ImahelNn9PpkVp6eIyABRmJHf2iicrk3CtjeG1j9OgTSwaNmEpUpn4aN7Kx0zNLdH7z6uTgCGD9Kmh1MFYrsoNlTp4AAAA.i2p/bittorrent/announce.php=http://nickyb.i2p/bittorrent/" - , "Orion", "http://gKik1lMlRmuroXVGTZ~7v4Vez3L3ZSpddrGZBrxVriosCQf7iHu6CIk8t15BKsj~P0JJpxrofeuxtm7SCUAJEr0AIYSYw8XOmp35UfcRPQWyb1LsxUkMT4WqxAT3s1ClIICWlBu5An~q-Mm0VFlrYLIPBWlUFnfPR7jZ9uP5ZMSzTKSMYUWao3ejiykr~mtEmyls6g-ZbgKZawa9II4zjOy-hdxHgP-eXMDseFsrym4Gpxvy~3Fv9TuiSqhpgm~UeTo5YBfxn6~TahKtE~~sdCiSydqmKBhxAQ7uT9lda7xt96SS09OYMsIWxLeQUWhns-C~FjJPp1D~IuTrUpAFcVEGVL-BRMmdWbfOJEcWPZ~CBCQSO~VkuN1ebvIOr9JBerFMZSxZtFl8JwcrjCIBxeKPBmfh~xYh16BJm1BBBmN1fp2DKmZ2jBNkAmnUbjQOqWvUcehrykWk5lZbE7bjJMDFH48v3SXwRuDBiHZmSbsTY6zhGY~GkMQHNGxPMMSIAAAA.i2p/bt/announce.php=http://orion.i2p/bt/" +// , "Orion", "http://gKik1lMlRmuroXVGTZ~7v4Vez3L3ZSpddrGZBrxVriosCQf7iHu6CIk8t15BKsj~P0JJpxrofeuxtm7SCUAJEr0AIYSYw8XOmp35UfcRPQWyb1LsxUkMT4WqxAT3s1ClIICWlBu5An~q-Mm0VFlrYLIPBWlUFnfPR7jZ9uP5ZMSzTKSMYUWao3ejiykr~mtEmyls6g-ZbgKZawa9II4zjOy-hdxHgP-eXMDseFsrym4Gpxvy~3Fv9TuiSqhpgm~UeTo5YBfxn6~TahKtE~~sdCiSydqmKBhxAQ7uT9lda7xt96SS09OYMsIWxLeQUWhns-C~FjJPp1D~IuTrUpAFcVEGVL-BRMmdWbfOJEcWPZ~CBCQSO~VkuN1ebvIOr9JBerFMZSxZtFl8JwcrjCIBxeKPBmfh~xYh16BJm1BBBmN1fp2DKmZ2jBNkAmnUbjQOqWvUcehrykWk5lZbE7bjJMDFH48v3SXwRuDBiHZmSbsTY6zhGY~GkMQHNGxPMMSIAAAA.i2p/bt/announce.php=http://orion.i2p/bt/" // , "anonymity", "http://8EoJZIKrWgGuDrxA3nRJs1jsPfiGwmFWL91hBrf0HA7oKhEvAna4Ocx47VLUR9retVEYBAyWFK-eZTPcvhnz9XffBEiJQQ~kFSCqb1fV6IfPiV3HySqi9U5Caf6~hC46fRd~vYnxmaBLICT3N160cxBETqH3v2rdxdJpvYt8q4nMk9LUeVXq7zqCTFLLG5ig1uKgNzBGe58iNcsvTEYlnbYcE930ABmrzj8G1qQSgSwJ6wx3tUQNl1z~4wSOUMan~raZQD60lRK70GISjoX0-D0Po9WmPveN3ES3g72TIET3zc3WPdK2~lgmKGIs8GgNLES1cXTolvbPhdZK1gxddRMbJl6Y6IPFyQ9o4-6Rt3Lp-RMRWZ2TG7j2OMcNSiOmATUhKEFBDfv-~SODDyopGBmfeLw16F4NnYednvn4qP10dyMHcUASU6Zag4mfc2-WivrOqeWhD16fVAh8MoDpIIT~0r9XmwdaVFyLcjbXObabJczxCAW3fodQUnvuSkwzAAAA.i2p/anonymityTracker/announce.php=http://anonymityweb.i2p/anonymityTracker/" // , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php" }; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index e45538b760..b3be736251 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -647,7 +647,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable private static String jumpServers[] = { "http://i2host.i2p/cgi-bin/i2hostjump?", - "http://orion.i2p/jump/", + // "http://orion.i2p/jump/", "http://stats.i2p/cgi-bin/jump.cgi?a=", "http://trevorreznik.i2p/cgi-bin/jump.php?hostname=" }; diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index d0662deb2d..47fca53853 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -186,8 +186,9 @@ %> - <% if (tunnelDepth > 2) { - %> + + <% if (tunnelDepth > 3) { + %> <% } %> diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index fe42ae4319..67462ea4b3 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -158,8 +158,9 @@ %> - <% if (tunnelDepth > 2) { - %> + + <% if (tunnelDepth > 3) { + %> <% } %> diff --git a/core/c/README b/core/c/README index dbac4e1586..9d306af0ef 100644 --- a/core/c/README +++ b/core/c/README @@ -1,9 +1,27 @@ Prior to building the jbigi library, you will need to fetch the GMP source -from http://www.swox.com/gmp/, saving it to jbigi/gmp-4.1.4.tar.bz2 (it will +from http://www.swox.com/gmp/, saving it to jbigi/gmp-4.2.2.tar.bz2 (it will be unpacked and built as necessary). +Version 4.2.2 has not been extensively tested with I2P. If you would like +to use a well-tested version, get gmp-4.1.4.tar.bz2, and edit jbigi/build.sh +to change the version number. + To build the native jbigi and jcpuid libraries for the current host CPU, simply run sh build.sh and the results will be packaged up into jbigi.jar +and the libjbigi.so library. To test, copy jbigi/lib/libjbigi.so +and jcpuid/lib/freenet/support/CPUInformation/libjcpuid-*.so +to your i2p/ directory. You can also copy jbigi.jar to the i2p/lib/ directory; +it will be used only if the router fails to load the native library. To build the native jbigi libraries for all supported CPUs (on the current OS), go into jbigi/ and run build-all.sh (the results will be under jbigi/lib/) + +After copying the files to the i2p/ directory, +to run a speed test comparing the native library to the java library, +run the shell script below. + +----------------- + +#!/bin/sh +export I2P=~/i2p +java -cp $I2P/lib/i2p.jar:$I2P/lib/jbigi.jar net.i2p.util.NativeBigInteger diff --git a/core/c/jbigi/build-all.sh b/core/c/jbigi/build-all.sh index 7cfee31c65..65456ee50b 100755 --- a/core/c/jbigi/build-all.sh +++ b/core/c/jbigi/build-all.sh @@ -12,8 +12,9 @@ FreeBSD*) exit;; esac -echo "Extracting GMP..." -tar -xjf gmp-4.1.4.tar.bz2 +VER=4.2.2 +echo "Extracting GMP Version $VER ..." +tar -xjf gmp-$VER.tar.bz2 echo "Building..." mkdir bin mkdir lib @@ -24,7 +25,7 @@ for x in none pentium pentiummmx pentium2 pentium3 pentium4 k6 k62 k63 athlon do mkdir bin/$x cd bin/$x - ../../gmp-4.1.4/configure --build=$x + ../../gmp-$VER/configure --build=$x make sh ../../build_jbigi.sh static case `uname -sr` in diff --git a/core/c/jbigi/build.sh b/core/c/jbigi/build.sh index 0ec3e26b70..ac563a2ba0 100755 --- a/core/c/jbigi/build.sh +++ b/core/c/jbigi/build.sh @@ -1,9 +1,10 @@ #/bin/sh -echo "Building the jbigi library with GMP" +VER=4.2.2 +echo "Building the jbigi library with GMP Version $VER" echo "Extracting GMP..." -tar -xjf gmp-4.1.4.tar.bz2 +tar -xjf gmp-$VER.tar.bz2 echo "Building..." mkdir -p lib/ mkdir -p bin/local @@ -11,9 +12,9 @@ cd bin/local case `uname -sr` in Darwin*) # --with-pic is required for static linking -../../gmp-4.1.4/configure --with-pic;; +../../gmp-$VER/configure --with-pic;; *) -../../gmp-4.1.4/configure;; +../../gmp-$VER/configure;; esac make sh ../../build_jbigi.sh static diff --git a/history.txt b/history.txt index 34ca15a929..0c11cd87e0 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,11 @@ +2008-02-27 zzz + * i2ptunnel: Add 3-hop option to edit.jsp to match configtunnels.jsp + * i2psnark: Remove orion and gaytorrents from default tracker list + * Remove orion from jump list and from eepsite_index.html + * Jbigi: Change jbigi version to 4.2.2 in build scripts - tested by amiga + * Capitalize OutboundMessageDistributor job name + * TunnelPool: Add a warning if all tunnels are backlogged + 2008-02-26 zzz * Reintroduce NTCP backlog pushback, with switch back to previous tunnel when no longer backlogged diff --git a/installer/resources/eepsite_index.html b/installer/resources/eepsite_index.html index b7d19e41dd..d6f9e5edba 100644 --- a/installer/resources/eepsite_index.html +++ b/installer/resources/eepsite_index.html @@ -56,7 +56,7 @@ That is, you must enter your eepsite name and key into a web interface on one or more of these sites. Here is the key entry form at stats.i2p, - here is the key entry form at orion.i2p and + and here is the key entry form at trevorreznik.i2p. Again, your key is the entire "Local destination" key on the eepsite i2ptunnel configuration page. @@ -68,15 +68,14 @@
  • Speaking of address book updates, this would be a good time to add some more addressbooks to your own subscription list. Go to your subscriptions configuration page and add a couple of these - - http://orion.i2p/hosts.txt, http://tino.i2p/hosts.txt, http://stats.i2p/cgi-bin/newhosts.txt, http://trevorreznik.i2p/hosts.txt and hit "Save". Now you will get updates too!
  • If you are in a hurry and can't wait a few hours, you can tell people to use a "jump" address helper redirection service. This will work within a few minutes of your entering the key to an address book. - Test it yourself first by entering http://orion.i2p/jump/something.i2p - or http://stats.i2p/cgi-bin/jump.cgi?a=something.i2p or + Test it yourself first by entering + http://stats.i2p/cgi-bin/jump.cgi?a=something.i2p or or http://trevorreznik.i2p/cgi-bin/jump.php?hostname=something.i2p into your browser. Once it's working, then you can tell others to use it.
  • Some people check eepsite lists such as @@ -86,7 +85,7 @@
  • Post a message on the Eepsite announce forum on forum.i2p.
  • Tell people about it on the #i2p or #i2p-chat channels on IRC. -
  • Put it in a new post on the new Syndie. +
  • Put it in a new post on the new Syndie.
  • Put it in Ugha's Eepsite Index Wiki Note that some sites recommend pasting in that really long destination key. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 13f8e487ce..12fb3e7939 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -17,7 +17,7 @@ import net.i2p.CoreVersion; public class RouterVersion { public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $"; public final static String VERSION = "0.6.1.31"; - public final static long BUILD = 7; + public final static long BUILD = 8; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID); diff --git a/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java index 10b3aebcad..8e07dd697c 100644 --- a/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java @@ -80,7 +80,7 @@ public class OutboundMessageDistributor { _target = target; _tunnel = id; } - public String getName() { return "distribute outbound message"; } + public String getName() { return "Distribute outbound message"; } public void runJob() { RouterInfo info = getContext().netDb().lookupRouterInfoLocally(_target); if (info != null) { diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index ed3d1199a4..2e3f588279 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -167,8 +167,11 @@ public class TunnelPool { } } // return a random backlogged tunnel - if (backloggedTunnel != null) + if (backloggedTunnel != null) { + if (_log.shouldLog(Log.WARN)) + _log.warn(toString() + ": All tunnels are backlogged"); return backloggedTunnel; + } } // ok, either we are ok using zero hop tunnels, or only fallback tunnels remain. pick 'em // randomly