From 589cbd675a894c138c4d22fc64570f9f3d47d58d Mon Sep 17 00:00:00 2001 From: jrandom Date: Mon, 27 Feb 2006 19:05:40 +0000 Subject: [PATCH] * 2006-02-27 0.6.1.12 released 2006-02-27 jrandom * Adjust the jbigi.jar to use the athlon-optimized jbigi on windows/amd64 machines, rather than the generic jbigi (until we have an athlon64 optimized version) --- .../org/klomp/snark/web/I2PSnarkServlet.java | 107 +++++++++--------- core/java/src/net/i2p/CoreVersion.java | 4 +- history.txt | 9 +- initialNews.xml | 4 +- installer/lib/jbigi/README.txt | 4 + installer/lib/jbigi/jbigi.jar | Bin 996921 -> 1027876 bytes installer/lib/jbigi/jbigi.jar.sig | Bin 65 -> 65 bytes news.xml | 17 +-- .../src/net/i2p/router/RouterVersion.java | 6 +- 9 files changed, 79 insertions(+), 72 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index e7e25260b..c99494b24 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -127,7 +127,7 @@ public class I2PSnarkServlet extends HttpServlet { } } else if ( (newURL != null) && (newURL.trim().length() > "http://.i2p/".length()) ) { _manager.addMessage("Fetching " + newURL); - I2PThread fetch = new I2PThread(new FetchAndAdd(newURL), "Fetch and add"); + I2PThread fetch = new I2PThread(new FetchAndAdd(_manager, newURL), "Fetch and add"); fetch.start(); } else { // no file or URL specified @@ -267,56 +267,6 @@ public class I2PSnarkServlet extends HttpServlet { } } - private class FetchAndAdd implements Runnable { - private String _url; - public FetchAndAdd(String url) { - _url = url; - } - public void run() { - _url = _url.trim(); - File file = I2PSnarkUtil.instance().get(_url, false); - try { - if ( (file != null) && (file.exists()) && (file.length() > 0) ) { - _manager.addMessage("Torrent fetched from " + _url); - FileInputStream in = null; - try { - in = new FileInputStream(file); - MetaInfo info = new MetaInfo(in); - String name = info.getName(); - name = name.replace('/', '_'); - name = name.replace('\\', '_'); - name = name.replace('&', '+'); - name = name.replace('\'', '_'); - name = name.replace('"', '_'); - name = name.replace('`', '_'); - name = name + ".torrent"; - File torrentFile = new File(_manager.getDataDir(), name); - - String canonical = torrentFile.getCanonicalPath(); - - if (torrentFile.exists()) { - if (_manager.getTorrent(canonical) != null) - _manager.addMessage("Torrent already running: " + name); - else - _manager.addMessage("Torrent already in the queue: " + name); - } else { - FileUtil.copy(file.getAbsolutePath(), canonical, true); - _manager.addTorrent(canonical); - } - } catch (IOException ioe) { - _manager.addMessage("Torrent at " + _url + " was not valid: " + ioe.getMessage()); - } finally { - try { in.close(); } catch (IOException ioe) {} - } - } else { - _manager.addMessage("Torrent was not retrieved from " + _url); - } - } finally { - if (file != null) file.delete(); - } - } - } - private List getSortedSnarks(HttpServletRequest req) { Set files = _manager.listTorrentFiles(); TreeSet fileNames = new TreeSet(files); // sorts it alphabetically @@ -635,4 +585,57 @@ public class I2PSnarkServlet extends HttpServlet { private static final String TABLE_FOOTER = "\n"; private static final String FOOTER = ""; -} \ No newline at end of file +} + + +class FetchAndAdd implements Runnable { + private SnarkManager _manager; + private String _url; + public FetchAndAdd(SnarkManager mgr, String url) { + _manager = mgr; + _url = url; + } + public void run() { + _url = _url.trim(); + File file = I2PSnarkUtil.instance().get(_url, false); + try { + if ( (file != null) && (file.exists()) && (file.length() > 0) ) { + _manager.addMessage("Torrent fetched from " + _url); + FileInputStream in = null; + try { + in = new FileInputStream(file); + MetaInfo info = new MetaInfo(in); + String name = info.getName(); + name = name.replace('/', '_'); + name = name.replace('\\', '_'); + name = name.replace('&', '+'); + name = name.replace('\'', '_'); + name = name.replace('"', '_'); + name = name.replace('`', '_'); + name = name + ".torrent"; + File torrentFile = new File(_manager.getDataDir(), name); + + String canonical = torrentFile.getCanonicalPath(); + + if (torrentFile.exists()) { + if (_manager.getTorrent(canonical) != null) + _manager.addMessage("Torrent already running: " + name); + else + _manager.addMessage("Torrent already in the queue: " + name); + } else { + FileUtil.copy(file.getAbsolutePath(), canonical, true); + _manager.addTorrent(canonical); + } + } catch (IOException ioe) { + _manager.addMessage("Torrent at " + _url + " was not valid: " + ioe.getMessage()); + } finally { + try { in.close(); } catch (IOException ioe) {} + } + } else { + _manager.addMessage("Torrent was not retrieved from " + _url); + } + } finally { + if (file != null) file.delete(); + } + } +} diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 7b68e5b30..6d439f396 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,8 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.53 $ $Date: 2006/02/16 15:44:09 $"; - public final static String VERSION = "0.6.1.11"; + public final static String ID = "$Revision: 1.54 $ $Date: 2006/02/21 10:20:17 $"; + public final static String VERSION = "0.6.1.12"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index da3d25d89..ca31d712b 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,11 @@ -$Id: history.txt,v 1.420 2006/02/25 15:41:52 jrandom Exp $ +$Id: history.txt,v 1.421 2006/02/26 16:30:58 jrandom Exp $ + +* 2006-02-27 0.6.1.12 released + +2006-02-27 jrandom + * Adjust the jbigi.jar to use the athlon-optimized jbigi on windows/amd64 + machines, rather than the generic jbigi (until we have an athlon64 + optimized version) 2006-02-26 jrandom * Switch from the bouncycastle to the gnu-crypto implementation for diff --git a/initialNews.xml b/initialNews.xml index b29b64fb2..a1b90b812 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ - - + M2*L@gkeQ?&IP z{|>T))K#O{#jLr5rur}oA#~ft$_3L$hu7WoMziFKEv6?x^PVMy)=cAur~YC z6WR}%Jdt=a%sMVa?BdqnwUIs+KN8U0W#m9OvcykfI-gXUx+|gS!gI`>O|5yA7S*<+qoevvzi6&x<)EF$-8^#7C<}?KcgpxpKbtP7cQa! zuv~y0iXWiH$2s0;s8uM_k+eT#5B#Z%cdG)uWKrf3vXjsHv%e3a1FdcQ+k~FB;J#2# zm$0@j?tSg;8+k|#{|gx_1D6hw?5`1F-}rEUZs37{4_loyq1v1I+eQbWm=bOjo#1$~_!`ZCQe|*@XDlJulbJb{td_OiZxXe%B)o~@nXU!Jx zX5z<{buImeiHIx7L#WxNVrekt$El1hM%f(05?tWhjBe${WAzguLN}dEx0Ir$bPlL5 zl*Kg{61v+*7;J%CMZ6A%$Qf(?zpXi`!4(>>yjbY_GsZ=vm!%CzU((o zjW$?GgEKLNG7^N9&T8R^fOD9F#qgeacNaqEen!ZV5O(re9UK)@Hn=HZ%nGhh32EnL zc!wLOtix@&dK#Sx5wAR%vdc}s?(8J@brqp43Cx#1V6is%a*ZPHCd}pO2C1N-0H-l# zhljxSegk9~H5RD%$U0gmtk-Z9cEGSlo=}v+qwjF=qX#=#zB`{F!3P`|^5ykoNZ~;v z)U6?58uReF5eD+{Ha3!}_)^}-M7VkmAzOm*_ntSw`!Ssr?&Ql-9@6Z$FEiKyF1IX& z!3z~;DZ0-qPwHJSiS~UZ!Ct?+E0la|U)=v=Y)dyn<>b~9hgRv~CAR;jvz7d1sG_HN z_%>?z|NW=6;)_jMgo^p(`=83faI^sDun|QmNmDL{pukz-MuFVG5?y(}fZ@Ugdh|UoJ delta 1689 zcmah|e@t6d6uzZ>rL?@>4k)axP6`Z2MvF4$Rx}7|Vil$=n~8?SkU(Y@vXue>5ts&1 z!I(Jy(3Aa$W~{V@{+NL7xlGWgGf1W@GeOOmZi!K+bLz(ChJWaJ=RIZAL|@aqd%pLb z?|k>%a|2&j9=mwASXZOfWibQ(hSzw9#0stadgwv@54IByd-2ddr|p}$gHJxd7?c0Y z?Cv#QsG1V(P}?aOq@^X@h8`_qQdy_qZJ|}~_d=6jUIDHOB*WwSDkZFTaW!q%tbUV^ z$YD=vdmEAKO3ilITV&vpH3=W@v5MtTp|V zCUc=H!c9_@U~GAw$dfM_PbhV}my92gUBFeI)YNPmR@|p8n4pWuhaXM9L^b677D>lv z(n}N@6t22YR6+?uQSpLXXl&O$r|jG=B@UYxsX2hwtkOa*@7I%ZV-Y_i$gAhg>Z9S#Ax|=@KRHjJOC`p(|c|>XG4U4W&>dn`NJ7fw_`0#!; zlrX%mY_|c*Sj~R-V{*v>>C0v63Gd zv*QRXKOaL?r;r6Z!rV%A_k_74CASxNUe5C~b}_+N&awus zntzrvtgsm77UzFcPd}l7b77tZo>6Y0nzf_cq4gv*P(Q1;xsr>1=YMS8-Nsn-Bx8;h zMPIuo1>PLx#Uye@77-^2v1OLI+k8nvK#V4rR?e}(_A#}(ZwwQUhg3NDH+)Qn@3QL@ z_OD|+gZ34F@xZlkH)Ho-U~KgYH`Z5lkRRb|$xTfJv$ZAxc1Cy+CH52;GG6d8*8eHP zj^6wn+AF|#ggc2=x8pZoe+%lLV$6Coi|u53xDw%c|3kaouZKIMJdbSDN72Ub=k?GP z<@toXAtOWesZcj1=D;VToD=MhA>8+w3OizIZwUU;K)<@^3eqqcb=X19Qof z<^GV;9B?GY)2Ya`T%>YC8Z?xeZ-pBOJMn&%LrdS)lQ^8)&LvM(U^ER14>F9Z@@+IbZzF{BBg8PCkgA2279}RB7b{Q|=C&PBxS5L3iB*jX~AJU=a1E zo73S^kY~eGQ0;F*hAn3aR>oxeSK{vWkQ(5gb2vRC0 XPR6=uF$bi2b%}ZJ1ZajeEfeqOn~og6 diff --git a/news.xml b/news.xml index b002fb04a..8722eab1b 100644 --- a/news.xml +++ b/news.xml @@ -1,5 +1,5 @@ - - + • -2006-02-21: -0.6.1.11 released -with some critical SSU fixes - please upgrade as soon as possible. -
-• -2006-02-21: -0.6.1.9 and earlier users: Many network servers -(squid.i2p, dev.i2p, cvs.i2p, www.i2p, syndiemedia.i2p and others) -will be disconnected from the "old" network shortly. -Please upgrade to 0.6.1.11 as soon as possible. +2006-02-27: +0.6.1.12 released +with some useful SSU and peer selection fixes - please upgrade as soon as possible.
• 2006-02-21: diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index fb3d758a0..05b30a50f 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -15,9 +15,9 @@ import net.i2p.CoreVersion; * */ public class RouterVersion { - public final static String ID = "$Revision: 1.361 $ $Date: 2006/02/25 15:41:52 $"; - public final static String VERSION = "0.6.1.11"; - public final static long BUILD = 6; + public final static String ID = "$Revision: 1.362 $ $Date: 2006/02/26 16:30:57 $"; + public final static String VERSION = "0.6.1.12"; + public final static long BUILD = 0; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID);