Changeset 8660cf0

Timestamp:

Aug 27, 2005 10:15:35 PM (15 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

e313da25

Parents:

e0bfdff

git-author:

jrandom <jrandom> (08/27/05 22:15:35)

git-committer:

zzz <zzz@…> (08/27/05 22:15:35)

Message:

2005-08-27 jrandom

• Minor logging and optimization tweaks in the router and SDK
• Use ISO-8859-1 in the XML files (thanks redzara!)
• The consolePassword config property can now be used to bypass the router console's nonce checking, allowing CLI restarts

Files:

• apps/i2ptunnel/jsp/web.xml (modified) (1 diff)
• apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java (modified) (4 diffs)
• apps/routerconsole/jsp/web.xml (modified) (1 diff)
• apps/syndie/java/src/net/i2p/syndie/BlogManager.java (modified) (4 diffs)
• apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java (modified) (6 diffs)
• apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java (modified) (1 diff)
• apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java (added)
• apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java (modified) (7 diffs)
• apps/syndie/jsp/remote.jsp (modified) (2 diffs)
• apps/syndie/jsp/web.xml (modified) (1 diff)
• core/java/src/net/i2p/util/LogManager.java (modified) (2 diffs)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)
• router/java/src/net/i2p/router/client/ClientConnectionRunner.java (modified) (1 diff)
• router/java/src/net/i2p/router/message/GarlicMessageReceiver.java (modified) (1 diff)
• router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java (modified) (6 diffs)
• router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java (modified) (1 diff)
• router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java (modified) (1 diff)
• router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java (modified) (6 diffs)
• router/java/src/net/i2p/router/transport/udp/MessageReceiver.java (modified) (1 diff)
• router/java/src/net/i2p/router/tunnel/FragmentHandler.java (modified) (1 diff)

apps/i2ptunnel/jsp/web.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE web-app
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"

apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java

@@ -21 +21 @@
     private String _nonce;
     protected String _action;
+    protected String _passphrase;
     private List _errors;
     private List _notices;
@@ -33 +34 @@
         _valid = true;
         _nonce = null;
+        _passphrase = null;
     }
     
@@ -52 +54 @@
     public void setNonce(String val) { _nonce = val; }
     public void setAction(String val) { _action = val; }
+    public void setPassphrase(String val) { _passphrase = val; }
     
     /**
@@ -120 +123 @@
         if ( ( (nonce == null) || (!_nonce.equals(nonce)) ) &&
              ( (noncePrev == null) || (!_nonce.equals(noncePrev)) ) ) {
-            addFormError("Invalid nonce, are you being spoofed?");
-            _valid = false;
+                 
+            String expected = _context.getProperty("consolePassword");
+            if ( (expected != null) && (expected.trim().length() > 0) && (expected.equals(_passphrase)) ) {
+                // ok
+            } else {
+                addFormError("Invalid nonce, are you being spoofed?");
+                _valid = false;
+            }
         }
     }

apps/routerconsole/jsp/web.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE web-app
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"

apps/syndie/java/src/net/i2p/syndie/BlogManager.java

@@ -21 +21 @@
     private File _cacheDir;
     private File _tempDir;
+    private File _rootDir;
     private Archive _archive;
     
@@ -26 +27 @@
         TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
         String rootDir = I2PAppContext.getGlobalContext().getProperty("syndie.rootDir");
-        if (rootDir == null)
-            rootDir = System.getProperty("user.home");
-        rootDir = rootDir + File.separatorChar + ".syndie";
+        if (false) {
+            if (rootDir == null)
+                rootDir = System.getProperty("user.home");
+            rootDir = rootDir + File.separatorChar + ".syndie";
+        } else {
+            if (rootDir == null)
+                rootDir = "./syndie";
+        }
         _instance = new BlogManager(I2PAppContext.getGlobalContext(), rootDir);
     }
@@ -35 +41 @@
     public BlogManager(I2PAppContext ctx, String rootDir) {
         _context = ctx;
-        File root = new File(rootDir);
-        root.mkdirs();
-        _blogKeyDir = new File(root, "blogkeys");
-        _privKeyDir = new File(root, "privkeys");
+        _rootDir = new File(rootDir);
+        _rootDir.mkdirs();
+        readConfig();
+        _blogKeyDir = new File(_rootDir, "blogkeys");
+        _privKeyDir = new File(_rootDir, "privkeys");
         String archiveDir = _context.getProperty("syndie.archiveDir");
         if (archiveDir != null)
             _archiveDir = new File(archiveDir);
         else
-            _archiveDir = new File(root, "archive");
-        _userDir = new File(root, "users");
-        _cacheDir = new File(root, "cache");
-        _tempDir = new File(root, "temp");
+            _archiveDir = new File(_rootDir, "archive");
+        _userDir = new File(_rootDir, "users");
+        _cacheDir = new File(_rootDir, "cache");
+        _tempDir = new File(_rootDir, "temp");
         _blogKeyDir.mkdirs();
         _privKeyDir.mkdirs();
@@ -55 +62 @@
         _archive = new Archive(ctx, _archiveDir.getAbsolutePath(), _cacheDir.getAbsolutePath());
         _archive.regenerateIndex();
+    }
+    
+    private void readConfig() {
+        File config = new File(_rootDir, "syndie.config");
+        if (config.exists()) {
+            try {
+                Properties p = new Properties();
+                DataHelper.loadProps(p, config);
+                for (Iterator iter = p.keySet().iterator(); iter.hasNext(); ) {
+                    String key = (String)iter.next();
+                    System.setProperty(key, p.getProperty(key));
+                }
+            } catch (IOException ioe) {
+                ioe.printStackTrace();
+            }
+        }
+    }
+    
+    public void writeConfig() {
+        File config = new File(_rootDir, "syndie.config");
+        FileOutputStream out = null;
+        try {
+            out = new FileOutputStream(config);
+            for (Iterator iter = _context.getPropertyNames().iterator(); iter.hasNext(); ) {
+                String name = (String)iter.next();
+                if (name.startsWith("syndie."))
+                    out.write((name + '=' + _context.getProperty(name) + '\n').getBytes());
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        } finally {
+            if (out != null) try { out.close(); } catch (IOException ioe) {}
+        }
     }
     

apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java

@@ -262 +262 @@
      */
     public void receiveBlog(String name, String hash, String tag, long entryId, List locations, String description) {
+        if (!continueBody()) { return; }
+        if (hash == null) return;
+        
+        System.out.println("Receiving the blog: " + name + "/" + hash + "/" + tag + "/" + entryId +"/" + locations + ": "+ description);
+        byte blogData[] = Base64.decode(hash);
+        if ( (blogData == null) || (blogData.length != Hash.HASH_LENGTH) )
+            return;
+    
         Blog b = new Blog();
         b.name = name;
@@ -271 +279 @@
             _blogs.add(b);
     
-        if (!continueBody()) { return; }
-        if (hash == null) return;
-        
-        System.out.println("Receiving the blog: " + name + "/" + hash + "/" + tag + "/" + entryId +"/" + locations + ": "+ description);
-        byte blogData[] = Base64.decode(hash);
-        if ( (blogData == null) || (blogData.length != Hash.HASH_LENGTH) )
-            return;
         Hash blog = new Hash(blogData);
         if (entryId > 0) {
@@ -307 +308 @@
         }
         if ( (locations != null) && (locations.size() > 0) ) {
-            _bodyBuffer.append(" <select name=\"archiveLocation\">");
+            _bodyBuffer.append(" Archives: ");
             for (int i = 0; i < locations.size(); i++) {
                 SafeURL surl = (SafeURL)locations.get(i);
-                _bodyBuffer.append("<option value=\"").append(Base64.encode(surl.toString())).append("\">");
-                _bodyBuffer.append(sanitizeString(surl.toString())).append("</option>\n");
-            }
-            _bodyBuffer.append("</select>");
+                if (_user.getAuthenticated() && _user.getAllowAccessRemote())
+                    _bodyBuffer.append("<a href=\"").append(getArchiveURL(blog, surl)).append("\">").append(sanitizeString(surl.toString())).append("</a> ");
+                else
+                    _bodyBuffer.append(sanitizeString(surl.toString())).append(' ');
+            }
         }
         _bodyBuffer.append("] ");
@@ -657 +659 @@
         if (!unsafe) return str;
         
-        str = str.replace('<', '_');
-        str = str.replace('>', '-');
+        str = str.replace('<', '_'); // this should be &lt;
+        str = str.replace('>', '-'); // this should be &gt;
         if (!allowNL) {
             str = str.replace('\n', ' ');
@@ -669 +671 @@
     public static final String sanitizeURL(String str) { return Base64.encode(str); }
     public static final String sanitizeTagParam(String str) {
+        str = str.replace('&', '_'); // this should be &amp;
         if (str.indexOf('\"') < 0)
             return sanitizeString(str);
@@ -754 +757 @@
         return buf.toString();
     }
+    public static String getArchiveURL(Hash blog, SafeURL archiveLocation) {
+        return "remote.jsp?" 
+               //+ "action=Continue..." // should this be the case?
+               + "&schema=" + sanitizeTagParam(archiveLocation.getSchema()) 
+               + "&location=" + sanitizeTagParam(archiveLocation.getLocation());
+    }
 }

apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java

@@ -25 +25 @@
         } else if (path.endsWith(Archive.INDEX_FILE)) {
             renderSummary(resp);
+        } else if (path.endsWith("export.zip")) {
+            ExportServlet.export(req, resp);
         } else {
             String blog = getBlog(path);

apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java

@@ -4 +4 @@
 import java.text.*;
 import java.util.*;
+import java.util.zip.*;
 import net.i2p.I2PAppContext;
 import net.i2p.data.*;
@@ -109 +110 @@
     }
     
+    public void fetchSelectedBulk(User user, Map parameters) {
+        String entries[] = ArchiveViewerBean.getStrings(parameters, "entry");
+        String action = ArchiveViewerBean.getString(parameters, "action");
+        if ("Fetch all new entries".equals(action)) {
+            ArchiveIndex localIndex = BlogManager.instance().getArchive().getIndex();
+            List uris = new ArrayList();
+            List matches = new ArrayList();
+            for (Iterator iter = _remoteIndex.getUniqueBlogs().iterator(); iter.hasNext(); ) {
+                Hash blog = (Hash)iter.next();
+                _remoteIndex.selectMatchesOrderByEntryId(matches, blog, null);
+                for (int i = 0; i < matches.size(); i++) {
+                    BlogURI uri = (BlogURI)matches.get(i);
+                    if (!localIndex.getEntryIsKnown(uri))
+                        uris.add(uri);
+                }
+                matches.clear();
+            }
+            entries = new String[uris.size()];
+            for (int i = 0; i < uris.size(); i++)
+                entries[i] = ((BlogURI)uris.get(i)).toString();
+        }
+        if ( (entries == null) || (entries.length <= 0) ) return;
+        StringBuffer url = new StringBuffer(512);
+        url.append(buildExportURL());
+        Set meta = new HashSet();
+        for (int i = 0; i < entries.length; i++) {
+            BlogURI uri = new BlogURI(entries[i]);
+            if (uri.getEntryId() >= 0) {
+                url.append("entry=").append(uri.toString()).append('&');
+                meta.add(uri.getKeyHash());
+                _statusMessages.add("Scheduling blog post fetching for " + HTMLRenderer.sanitizeString(entries[i]));
+            }
+        }
+        for (Iterator iter = meta.iterator(); iter.hasNext(); ) {
+            Hash blog = (Hash)iter.next();
+            url.append("meta=").append(blog.toBase64()).append('&');
+            _statusMessages.add("Scheduling blog metadata fetching for " + blog.toBase64());
+        }
+        List urls = new ArrayList(1);
+        urls.add(url.toString());
+        List tmpFiles = new ArrayList(1);
+        try {
+            File tmp = File.createTempFile("fetchBulk", ".zip", BlogManager.instance().getTempDir());
+            tmpFiles.add(tmp);
+            fetch(urls, tmpFiles, user, new BulkFetchListener(tmp));
+        } catch (IOException ioe) {
+            _statusMessages.add("Internal error creating temporary file to fetch " + HTMLRenderer.sanitizeString(url.toString()) + ": " + ioe.getMessage());
+        }
+    }
+    
+    private String buildExportURL() {
+        String loc = _remoteLocation.trim();
+        int root = loc.lastIndexOf('/');
+        return loc.substring(0, root + 1) + "export.zip?";
+    }
+    
     private String buildEntryURL(BlogURI uri) {
         String loc = _remoteLocation.trim();
@@ -301 +358 @@
     }
     
+    /**
+     * Receive the status of a fetch for the zip containing blogs and metadata (as generated by
+     * the ExportServlet)
+     */
+    private class BulkFetchListener implements EepGet.StatusListener {
+        private File _tmp;
+        public BulkFetchListener(File tmp) {
+            _tmp = tmp;
+        }
+        public void attemptFailed(String url, long bytesTransferred, long bytesRemaining, int currentAttempt, int numRetries, Exception cause) {
+            _statusMessages.add("Attempt " + currentAttempt + " failed after " + bytesTransferred + (cause != null ? cause.getMessage() : ""));
+        }
+        
+        public void bytesTransferred(long alreadyTransferred, int currentWrite, long bytesTransferred, long bytesRemaining, String url) {}
+        public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile) {
+            _statusMessages.add("Fetch of " + HTMLRenderer.sanitizeString(url.substring(0, url.indexOf('?'))) + " successful, importing the data");
+            File file = new File(outputFile);
+            ZipInputStream zi = null;
+            try {
+                zi = new ZipInputStream(new FileInputStream(file));
+                
+                while (true) {
+                    ZipEntry entry = zi.getNextEntry();
+                    if (entry == null)
+                        break;
+
+                    ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+                    byte buf[] = new byte[1024];
+                    int read = -1;
+                    while ( (read = zi.read(buf)) != -1) 
+                        out.write(buf, 0, read);
+
+                    if (entry.getName().startsWith("meta")) {
+                        BlogInfo i = new BlogInfo();
+                        i.load(new ByteArrayInputStream(out.toByteArray()));
+                        boolean ok = BlogManager.instance().getArchive().storeBlogInfo(i);
+                        if (ok) {
+                            _statusMessages.add("Blog info for " + HTMLRenderer.sanitizeString(i.getProperty(BlogInfo.NAME)) + " imported");
+                        } else {
+                            _statusMessages.add("Blog info at " + HTMLRenderer.sanitizeString(url) + " was corrupt / invalid / forged");
+                        }
+                    } else if (entry.getName().startsWith("entry")) {
+                        EntryContainer c = new EntryContainer();
+                        c.load(new ByteArrayInputStream(out.toByteArray()));
+                        BlogURI uri = c.getURI();
+                        if ( (uri == null) || (uri.getKeyHash() == null) ) {
+                            _statusMessages.add("Blog post " + HTMLRenderer.sanitizeString(entry.getName()) + " was corrupt - no URI");
+                            continue;
+                        }
+                        Archive a = BlogManager.instance().getArchive();
+                        BlogInfo info = a.getBlogInfo(uri);
+                        if (info == null) {
+                            _statusMessages.add("Blog post " + HTMLRenderer.sanitizeString(entry.getName()) + " cannot be imported, as we don't have their blog metadata");
+                            continue;
+                        }
+                        boolean ok = a.storeEntry(c);
+                        if (!ok) {
+                            _statusMessages.add("Blog post " + uri.toString() + " has an invalid signature");
+                            continue;
+                        } else {
+                            _statusMessages.add("Blog post " + uri.toString() + " imported");
+                        }
+                    }
+                }       
+                
+                BlogManager.instance().getArchive().regenerateIndex();
+            } catch (IOException ioe) {
+                ioe.printStackTrace();
+                _statusMessages.add("Error importing from " + HTMLRenderer.sanitizeString(url) + ": " + ioe.getMessage());
+            } finally {
+                if (zi != null) try { zi.close(); } catch (IOException ioe) {}
+                file.delete();
+            }
+        }
+        public void transferFailed(String url, long bytesTransferred, long bytesRemaining, int currentAttempt) {
+            _statusMessages.add("Fetch of " + HTMLRenderer.sanitizeString(url) + " failed after " + bytesTransferred);
+            _tmp.delete();
+        }
+    }
     
     public void postSelectedEntries(User user, Map parameters) {
@@ -367 +503 @@
         for (Iterator iter = remoteBlogs.iterator(); iter.hasNext(); ) {
             Hash blog = (Hash)iter.next();
-            buf = new StringBuffer(1024);
+            buf.setLength(0);
             int shownEntries = 0;
             buf.append("<tr><td colspan=\"5\" align=\"left\" valign=\"top\">\n");
@@ -404 +540 @@
                 buf.append("</tr>\n");
             }
+            if (shownEntries > 0) {
+                out.write(buf.toString());
+                buf.setLength(0);
+            }
+            int remote = shownEntries;
             
             // now for posts in known blogs that we have and they don't
@@ -430 +571 @@
             }
             
-            if (shownEntries > 0) // skip blogs we have already syndicated
+            if (shownEntries > remote) // skip blogs we have already syndicated
                 out.write(buf.toString());
         }
@@ -478 +619 @@
             out.write("<input type=\"submit\" name=\"action\" value=\"Post selected entries\" /> \n");
         }
+        out.write("<hr />\n");
     }
     private final SimpleDateFormat _dateFormat = new SimpleDateFormat("yyyy/MM/dd", Locale.UK);

apps/syndie/jsp/remote.jsp

@@ -20 +20 @@
 } else { %>Import from: 
 <select name="schema">
- <option value="web">I2P/TOR/Freenet</option>
- <option value="mnet">MNet</option>
- <option value="feedspace">Feedspace</option>
- <option value="usenet">Usenet</option>
+ <option value="web" <%=("web".equals(request.getParameter("schema")) ? "selected=\"true\"" : "")%>>I2P/TOR/Freenet</option>
+ <option value="mnet" <%=("mnet".equals(request.getParameter("schema")) ? "selected=\"true\"" : "")%>>MNet</option>
+ <option value="feedspace" <%=("feedspace".equals(request.getParameter("schema")) ? "selected=\"true\"" : "")%>>Feedspace</option>
+ <option value="usenet" <%=("usenet".equals(request.getParameter("schema")) ? "selected=\"true\"" : "")%>>Usenet</option>
 </select> 
 Proxy <input type="text" size="10" name="proxyhost" value="localhost" />:<input type="text" size="4" name="proxyport" value="4444" />
-<input name="location" size="40" /> <input type="submit" name="action" value="Continue..." /><br />
+<input name="location" size="40" value="<%=(request.getParameter("location") != null ? request.getParameter("location") : "")%>" /> 
+<input type="submit" name="action" value="Continue..." /><br />
 <%
   String action = request.getParameter("action");
@@ -34 +35 @@
     remote.fetchMetadata(user, request.getParameterMap());
   } else if ("Fetch selected entries".equals(action)) {
-    remote.fetchSelectedEntries(user, request.getParameterMap());
+    //remote.fetchSelectedEntries(user, request.getParameterMap());
+    remote.fetchSelectedBulk(user, request.getParameterMap());
   } else if ("Fetch all new entries".equals(action)) {
-    remote.fetchAllEntries(user, request.getParameterMap());
+    //remote.fetchAllEntries(user, request.getParameterMap());
+    remote.fetchSelectedBulk(user, request.getParameterMap());
   } else if ("Post selected entries".equals(action)) {
     remote.postSelectedEntries(user, request.getParameterMap());

apps/syndie/jsp/web.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE web-app
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"

core/java/src/net/i2p/util/LogManager.java

@@ -142 +142 @@
         Log rv = null;
         String scope = Log.getScope(name, cls);
+        boolean isNew = false;
         synchronized (_logs) {
             rv = (Log)_logs.get(scope);
@@ -147 +148 @@
                 rv = new Log(this, cls, name);
                 _logs.put(scope, rv);
-            }
-        }
-        updateLimit(rv);
+                isNew = true;
+            }
+        }
+        if (isNew)
+            updateLimit(rv);
         return rv;
     }

history.txt

@@ -1 @@
-$Id: history.txt,v 1.229 2005/08/23 16:25:49 jrandom Exp $
+$Id: history.txt,v 1.230 2005/08/24 17:55:27 jrandom Exp $
+
+2005-08-27  jrandom
+    * Minor logging and optimization tweaks in the router and SDK
+    * Use ISO-8859-1 in the XML files (thanks redzara!)
+    * The consolePassword config property can now be used to bypass the router
+      console's nonce checking, allowing CLI restarts
 
 2005-08-24  jrandom

router/java/src/net/i2p/router/RouterVersion.java

@@ -16 +16 @@
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.218 $ $Date: 2005/08/23 16:25:49 $";
+    public final static String ID = "$Revision: 1.219 $ $Date: 2005/08/24 17:55:26 $";
     public final static String VERSION = "0.6.0.3";
-    public final static long BUILD = 2;
+    public final static long BUILD = 3;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);

router/java/src/net/i2p/router/client/ClientConnectionRunner.java

@@ -147 +147 @@
     /** current client's sessionId */
     SessionId getSessionId() { return _sessionId; }
-    void setSessionId(SessionId id) { _sessionId = id; }
+    void setSessionId(SessionId id) { if (id != null) _sessionId = id; }
     /** data for the current leaseRequest, or null if there is no active leaseSet request */
     LeaseRequestState getLeaseRequest() { return _leaseRequest; }

router/java/src/net/i2p/router/message/GarlicMessageReceiver.java

@@ -72 +72 @@
             }
         } else {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("CloveMessageParser failed to decrypt the message [" + message.getUniqueId() 
-                           + "]");
             if (_log.shouldLog(Log.WARN))
                 _log.warn("CloveMessageParser failed to decrypt the message [" + message.getUniqueId() 

router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java

@@ -13 +13 @@
 import java.util.Iterator;
 import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 import net.i2p.I2PAppContext;
@@ -23 +25 @@
     private Log _log;
     /** set of Hash objects for the peers in the kbucket */
-    private Set _entries;
+    private List _entries;
     /** we center the kbucket set on the given hash, and derive distances from this */
     private Hash _local;
@@ -35 +37 @@
         _context = context;
         _log = context.logManager().getLog(KBucketImpl.class);
-        _entries = new HashSet();
+        _entries = new ArrayList(64); //new HashSet();
         setLocal(local);
     }
@@ -194 +196 @@
         Set entries = new HashSet(64);
         synchronized (_entries) {
-            entries.addAll(_entries);
+            for (int i = 0; i < _entries.size(); i++) 
+                entries.add((Hash)_entries.get(i));
         }
         return entries;
@@ -201 +204 @@
         Set entries = new HashSet(64);
         synchronized (_entries) {
-            entries.addAll(_entries);
+            for (int i = 0; i < _entries.size(); i++) 
+                entries.add((Hash)_entries.get(i));
             entries.removeAll(toIgnoreHashes);
         }
@@ -209 +213 @@
     public void getEntries(SelectionCollector collector) {
         synchronized (_entries) {
-            for (Iterator iter = _entries.iterator(); iter.hasNext(); ) {
-                collector.add((Hash)iter.next());
+            for (int i = 0; i < _entries.size(); i++) 
+                collector.add((Hash)_entries.get(i));
+        }
+    }
+    
+    public void setEntries(Set entries) {
+        synchronized (_entries) {
+            _entries.clear();
+            for (Iterator iter = entries.iterator(); iter.hasNext(); ) {
+                Hash entry = (Hash)iter.next();
+                if (!_entries.contains(entry))
+                    _entries.add(entry);
             }
         }
     }
     
-    public void setEntries(Set entries) {
-        synchronized (_entries) {
-            _entries.clear();
-            _entries.addAll(entries);
-        }
-    }
-    
     public int add(Hash peer) {
         synchronized (_entries) {
-            _entries.add(peer);
+            if (!_entries.contains(peer))
+                _entries.add(peer);
             return _entries.size();
         }

router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java

@@ -808 +808 @@
 
     /** smallest allowed period */
-    private static final int MIN_PER_PEER_TIMEOUT = 1*1000;
+    private static final int MIN_PER_PEER_TIMEOUT = 2*1000;
     private static final int MAX_PER_PEER_TIMEOUT = 5*1000;
     

router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java

@@ -85 +85 @@
             if (_log.shouldLog(Log.WARN))
                 _log.warn("FAILED publishing of the leaseSet for " + _dest.toBase64());
-            RepublishLeaseSetJob.this.requeue(30*1000);
+            RepublishLeaseSetJob.this.requeue(getContext().random().nextInt(60*1000));
         }
     }

router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java

@@ -40 +40 @@
     private PeerSelector _peerSelector;
 
-    private final static int PARALLELIZATION = 3; // how many sent at a time
-    private final static int REDUNDANCY = 6; // we want the data sent to 6 peers
+    private final static int PARALLELIZATION = 4; // how many sent at a time
+    private final static int REDUNDANCY = 4; // we want the data sent to 6 peers
     /**
      * additionally send to 1 outlier(s), in case all of the routers chosen in our
@@ -76 +76 @@
         getContext().statManager().createRateStat("netDb.storeFailedPeers", "How many peers each netDb must be sent to before failing completely?", "NetworkDatabase", new long[] { 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
         getContext().statManager().createRateStat("netDb.ackTime", "How long does it take for a peer to ack a netDb store?", "NetworkDatabase", new long[] { 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
+        getContext().statManager().createRateStat("netDb.replyTimeout", "How long after a netDb send does the timeout expire (when the peer doesn't reply in time)?", "NetworkDatabase", new long[] { 60*1000, 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
         _facade = facade;
         _state = new StoreState(getContext(), key, data, toSkip);
@@ -155 +156 @@
                 } else {
                     int peerTimeout = _facade.getPeerTimeout(peer);
-                    //RateStat failing = prof.getDBHistory().getFailedLookupRate();
-                    //Rate failed = failing.getRate(60*60*1000);
+                    PeerProfile prof = getContext().profileOrganizer().getProfile(peer);
+                    RateStat failing = prof.getDBHistory().getFailedLookupRate();
+                    Rate failed = failing.getRate(60*60*1000);
+                    long failedCount = failed.getCurrentEventCount()+failed.getLastEventCount();
+                    if (failedCount > 10) {
+                        _state.addSkipped(peer);
+                        continue;
+                    }
+                    //
                     //if (failed.getCurrentEventCount() + failed.getLastEventCount() > avg) {
                     //    _state.addSkipped(peer);
@@ -251 +259 @@
         
         SendSuccessJob onReply = new SendSuccessJob(getContext(), peer);
-        FailedJob onFail = new FailedJob(getContext(), peer);
+        FailedJob onFail = new FailedJob(getContext(), peer, getContext().clock().now());
         StoreMessageSelector selector = new StoreMessageSelector(getContext(), getJobId(), peer, token, expiration);
         
@@ -322 +330 @@
     private class FailedJob extends JobImpl {
         private RouterInfo _peer;
-
-        public FailedJob(RouterContext enclosingContext, RouterInfo peer) {
+        private long _sendOn;
+
+        public FailedJob(RouterContext enclosingContext, RouterInfo peer, long sendOn) {
             super(enclosingContext);
             _peer = peer;
+            _sendOn = sendOn;
         }
         public void runJob() {
@@ -333 +343 @@
             _state.replyTimeout(_peer.getIdentity().getHash());
             getContext().profileManager().dbStoreFailed(_peer.getIdentity().getHash());
+            getContext().statManager().addRateData("netDb.replyTimeout", getContext().clock().now() - _sendOn, 0);
             
             sendNext();

router/java/src/net/i2p/router/transport/udp/MessageReceiver.java

@@ -114 +114 @@
             return m;
         } catch (I2NPMessageException ime) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Message invalid: " + state, ime);
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Message invalid: " + state, ime);
             return null;
         } catch (Exception e) {

router/java/src/net/i2p/router/tunnel/FragmentHandler.java

@@ -149 +149 @@
         boolean eq = DataHelper.eq(v.getData(), 0, preprocessed, offset + HopProcessor.IV_LENGTH, 4);
         if (!eq) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Corrupt tunnel message - verification fails: \n" + Base64.encode(preprocessed, offset+HopProcessor.IV_LENGTH, 4)
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Corrupt tunnel message - verification fails: \n" + Base64.encode(preprocessed, offset+HopProcessor.IV_LENGTH, 4)
                            + "\n" + Base64.encode(v.getData(), 0, 4));
             if (_log.shouldLog(Log.WARN))