diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java index 51b4f97eb..a6ca56583 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java @@ -190,6 +190,9 @@ public class Storage } */ + /** FIXME we can run out of fd's doing this, + * maybe some sort of global close-RAF-right-away flag + * would do the trick */ private void fast_digestCreate() throws IOException { // Calculate piece_hashes SHA1 digest = new SHA1(); 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 5016d87d0..426ff5c74 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -318,7 +318,7 @@ public class I2PSnarkServlet extends HttpServlet { _manager.updateConfig(dataDir, autoStart, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts, upLimit, upBW, useOpenTrackers, openTrackers); } else if ("Create torrent".equals(action)) { String baseData = req.getParameter("baseFile"); - if (baseData != null) { + if (baseData != null && baseData.trim().length() > 0) { File baseFile = new File(_manager.getDataDir(), baseData); String announceURL = req.getParameter("announceURL"); String announceURLOther = req.getParameter("announceURLOther"); @@ -351,6 +351,8 @@ public class I2PSnarkServlet extends HttpServlet { } else { _manager.addMessage("Cannot create a torrent for the nonexistent data: " + baseFile.getAbsolutePath()); } + } else { + _manager.addMessage("Error creating torrent - you must enter a file or directory"); } } else if ("StopAll".equals(action)) { _manager.addMessage("Stopping all torrents and closing the I2P tunnel."); diff --git a/history.txt b/history.txt index edc69debf..95c70541d 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,9 @@ +2009-07-27 zzz + * Add flag dimensions to speed up profiles.jsp rendering + * Catch i2psnark create torrent with no data entered error + http://forum.i2p/viewtopic.php?t=3763 + * Fix typos in proxy error files + 2009-07-26 zzz * Add wrapper.config and i2prouter comments for 'portable' * Recognize same base and config dir in WorkingDir diff --git a/installer/resources/dnf-header.ht b/installer/resources/dnf-header.ht index 0ac7f6d2c..d3adc8261 100644 --- a/installer/resources/dnf-header.ht +++ b/installer/resources/dnf-header.ht @@ -12,10 +12,10 @@ Proxy-Connection: close
-

Warning: Eeepsite Unreachable

+

Warning: Eepsite Unreachable

The eepsite was not reachable. The eepsite is offline, there is network congestion, or your router is not yet well-integrated with peers. diff --git a/installer/resources/dnfh-header.ht b/installer/resources/dnfh-header.ht index a9dbc6540..b387727af 100644 --- a/installer/resources/dnfh-header.ht +++ b/installer/resources/dnfh-header.ht @@ -12,10 +12,10 @@ Proxy-Connection: close
-

Warning: Eeepsite Not Found in Addressbook

+

Warning: Eepsite Not Found in Addressbook

The eepsite was not found in your router's addressbook. Check the link or find a BASE64 address. If you have the BASE64 address, paste it into your userhosts.txt using diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 1e23e3feb..9314b6e7f 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 27; + public final static long BUILD = 28; /** for example "-test" */ public final static String EXTRA = "-rc"; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index f891ab897..28dcd74e3 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -1061,7 +1061,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { buf.append("CountryCount\n"); for (String country : countryList) { int num = countries.count(country); - buf.append("\"").append(country.toUpperCase()).append("\"");\"").append(country.toUpperCase()).append("\""); "); buf.append(_context.commSystem().getCountryName(country)); buf.append("").append(num).append("\n"); @@ -1092,7 +1092,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { buf.append("Address(es): "); String country = _context.commSystem().getCountry(info.getIdentity().getHash()); if(country != null) { - buf.append("\"").append(country.toUpperCase()).append("\""); "); } for (Iterator iter = info.getAddresses().iterator(); iter.hasNext(); ) { diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index 60e2af05c..188eb75c3 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -467,7 +467,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { StringBuilder buf = new StringBuilder(128); String c = getCountry(peer); if (c != null) { - buf.append("\"").append(c.toUpperCase()).append("\" "); }