propagate from branch 'i2p.i2p.zzz.test' (head 48448fc896d1e0859f481e98d0e80e764cc40736)

            to branch 'i2p.i2p' (head aedb9b8335d6de72dd633e79716fff6ffec263a1)

.tx/config

@@ -10,6 +10,7 @@ trans.fr = apps/i2ptunnel/locale/messages_fr.po
 trans.hu = apps/i2ptunnel/locale/messages_hu.po
 trans.it = apps/i2ptunnel/locale/messages_it.po
 trans.nl = apps/i2ptunnel/locale/messages_nl.po
+trans.pt = apps/i2ptunnel/locale/messages_pt.po
 trans.ru = apps/i2ptunnel/locale/messages_ru.po
 trans.sv_SE = apps/i2ptunnel/locale/messages_sv.po
 trans.uk_UA = apps/i2ptunnel/locale/messages_uk.po
@@ -32,6 +33,7 @@ trans.hu = apps/routerconsole/locale/messages_hu.po
 trans.it = apps/routerconsole/locale/messages_it.po
 trans.nl = apps/routerconsole/locale/messages_nl.po
 trans.pl = apps/routerconsole/locale/messages_pl.po
+trans.pt = apps/routerconsole/locale/messages_pt.po
 trans.ru = apps/routerconsole/locale/messages_ru.po
 trans.sv_SE = apps/routerconsole/locale/messages_sv.po
 trans.uk_UA = apps/routerconsole/locale/messages_uk.po
@@ -70,6 +72,7 @@ trans.hu = apps/susidns/locale/messages_hu.po
 trans.it = apps/susidns/locale/messages_it.po
 trans.nl = apps/susidns/locale/messages_nl.po
 trans.pl = apps/susidns/locale/messages_pl.po
+trans.pt = apps/susidns/locale/messages_pt.po
 trans.ru = apps/susidns/locale/messages_ru.po
 trans.sv_SE = apps/susidns/locale/messages_sv.po
 trans.uk_UA = apps/susidns/locale/messages_uk.po

apps/i2psnark/java/src/net/i2p/kademlia/KBucketSet.java

@@ -518,6 +518,7 @@ public class KBucketSet<T extends SimpleDataStructure> {
     
     /**
      *  For every bucket that hasn't been updated in this long,
+     *  or isn't close to full,
      *  generate a random key that would be a member of that bucket.
      *  The returned keys may be searched for to "refresh" the buckets.
      *  @return non-null, closest first
@@ -528,7 +529,7 @@ public class KBucketSet<T extends SimpleDataStructure> {
         getReadLock();
         try {
             for (KBucket b : _buckets) {
-                if (b.getLastChanged() < old)
+                if (b.getLastChanged() < old || b.getKeyCount() < BUCKET_SIZE * 3 / 4)
                     rv.add(generateRandomKey(b));
             }
         } finally { releaseReadLock(); }

apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java

@@ -744,7 +744,19 @@ class PeerCoordinator implements PeerListener
                 break;
             if (havePieces.get(p.getId()) && !p.isRequested())
               {
-                piece = p;
+                // never ever choose one that's in partialPieces, or we
+                // will create a second one and leak
+                boolean hasPartial = false;
+                for (PartialPiece pp : partialPieces) {
+                    if (pp.getPiece() == p.getId()) {
+                        if (_log.shouldLog(Log.INFO))
+                            _log.info("wantPiece() skipping partial for " + peer + ": piece = " + pp);
+                        hasPartial = true;
+                        break;
+                    }
+                }
+                if (!hasPartial)
+                    piece = p;
               }
             else if (p.isRequested()) 
             {
@@ -946,13 +958,14 @@ class PeerCoordinator implements PeerListener
    */
   public boolean gotPiece(Peer peer, PartialPiece pp)
   {
-    if (metainfo == null || storage == null)
-        return true;
-    if (storage.isChecking())
+    if (metainfo == null || storage == null || storage.isChecking()) {
+        pp.release();
         return true;
+    }
     int piece = pp.getPiece();
     if (halted) {
       _log.info("Got while-halted piece " + piece + "/" + metainfo.getPieces() +" from " + peer + " for " + metainfo.getName());
+      pp.release();
       return true; // We don't actually care anymore.
     }
     
@@ -967,8 +980,10 @@ class PeerCoordinator implements PeerListener
             // Assume we got a good piece, we don't really care anymore.
             // Well, this could be caused by a change in priorities, so
             // only return true if we already have it, otherwise might as well keep it.
-            if (storage.getBitField().get(piece))
+            if (storage.getBitField().get(piece)) {
+                pp.release();
                 return true;
+            }
           }
         
         try
@@ -1285,6 +1300,7 @@ class PeerCoordinator implements PeerListener
               PartialPiece pp = iter.next();
               if (pp.getPiece() == piece) {
                   iter.remove();
+                  pp.release();
                   // there should be only one but keep going to be sure
               }
           }

apps/i2psnark/java/src/org/klomp/snark/PeerState.java

@@ -592,6 +592,7 @@ class PeerState implements DataLoader
                 // Send cancel even when we are choked to make sure that it is
                 // really never ever send.
                 out.sendCancel(req);
+                req.getPartialPiece().release();
               }
           }
   }
@@ -741,6 +742,10 @@ class PeerState implements DataLoader
                   out.sendRequest(r);
                 lastRequest = r;
                 return true;
+            } else {
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Got dup from coord: " + pp);
+                pp.release();
             }
         }
 

apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java

@@ -572,7 +572,9 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
         _session.removeListener(I2PSession.PROTO_DATAGRAM_RAW, _rPort);
         // clear the DHT and tracker
         _tracker.stop();
-        PersistDHT.saveDHT(_knownNodes, _dhtFile);
+        // don't lose all our peers if we didn't have time to check them
+        boolean saveAll = _context.clock().now() - _started < 20*60*1000;
+        PersistDHT.saveDHT(_knownNodes, saveAll, _dhtFile);
         _knownNodes.stop();
         for (Iterator<ReplyWaiter> iter = _sentQueries.values().iterator(); iter.hasNext(); ) {
             ReplyWaiter waiter = iter.next();

apps/i2psnark/java/src/org/klomp/snark/dht/PersistDHT.java

@@ -56,12 +56,15 @@ abstract class PersistDHT {
             log.info("Loaded " + count + " nodes from " + file);
     }
 
-    public static synchronized void saveDHT(DHTNodes nodes, File file) {
+    /**
+     *  @param saveAll if true, don't check last seen time
+     */
+    public static synchronized void saveDHT(DHTNodes nodes, boolean saveAll, File file) {
         if (nodes.size() <= 0)
             return;
         Log log = I2PAppContext.getGlobalContext().logManager().getLog(PersistDHT.class);
         int count = 0;
-        long maxAge = I2PAppContext.getGlobalContext().clock().now() - MAX_AGE;
+        long maxAge = saveAll ? 0 : I2PAppContext.getGlobalContext().clock().now() - MAX_AGE;
         PrintWriter out = null;
         try {
             out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "ISO-8859-1")));

apps/i2psnark/locale/messages_it.po

@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-12 00:46+0000\n"
-"PO-Revision-Date: 2012-10-12 00:39+0000\n"
-"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"POT-Creation-Date: 2012-10-15 17:57+0000\n"
+"PO-Revision-Date: 2012-10-12 00:54+0000\n"
+"Last-Translator: BadCluster <badcluster@i2pmail.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/"
 "it/)\n"
 "Language: it\n"
@@ -342,7 +342,7 @@ msgstr "Torrent in aggiunta in {0}"
 #: ../java/src/org/klomp/snark/SnarkManager.java:1374
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
-msgstr ""
+msgstr "La banda di Upload massima è {0} KBps"
 
 #: ../java/src/org/klomp/snark/SnarkManager.java:1396
 #, java-format
@@ -606,7 +606,7 @@ msgstr "File torrent eliminato: {0}"
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 #, java-format
 msgid "Download deleted: {0}"
-msgstr ""
+msgstr "Downloads cancellati: {0}"
 
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:656
 #, java-format
@@ -701,12 +701,12 @@ msgstr "Ripristina tracker di default"
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:997
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:998
 msgid "Checking"
-msgstr ""
+msgstr "Controllo (Check)"
 
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1000
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1001
 msgid "Allocating"
-msgstr ""
+msgstr "Allocando"
 
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1005
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1011

apps/i2ptunnel/jsp/index.jsp

@@ -296,7 +296,9 @@
             </label>
             <div class="text">
             <% String cdest = indexBean.getClientDestination(curClient);
-               if (cdest.length() > 0) {
+               if (cdest.length() > 70) { // Probably a B64 (a B32 is 60 chars) so truncate
+                   %><%=cdest.substring(0, 45)%>&hellip;<%=cdest.substring(cdest.length() - 15, cdest.length())%><%
+               } else if (cdest.length() > 0) {
                    %><%=cdest%><%
                } else {
                    %><i><%=intl._("none")%></i><%

apps/i2ptunnel/locale/messages_it.po

@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-12 00:46+0000\n"
-"PO-Revision-Date: 2012-10-12 00:40+0000\n"
-"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"POT-Creation-Date: 2012-10-15 17:57+0000\n"
+"PO-Revision-Date: 2012-10-12 00:51+0000\n"
+"Last-Translator: BadCluster <badcluster@i2pmail.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/"
 "it/)\n"
 "Language: it\n"
@@ -185,11 +185,11 @@ msgstr "Porta non impostata"
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:463
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:589
 msgid "Invalid port"
-msgstr ""
+msgstr "Porta non valida"
 
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:466
 msgid "Warning - ports less than 1024 are not recommended"
-msgstr ""
+msgstr "Attenzione - E' meglio non utilizzare porte inderiori alla 1024"
 
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:482
 msgid "Standard client"
@@ -246,7 +246,7 @@ msgstr "Host non impostato"
 
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:583
 msgid "Invalid address"
-msgstr ""
+msgstr "Indirizzo non valido"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
 msgid "I2P Tunnel Manager - Edit Client Tunnel"

apps/routerconsole/locale/messages_it.po

@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-12 00:46+0000\n"
-"PO-Revision-Date: 2012-10-12 00:44+0000\n"
+"POT-Creation-Date: 2012-10-15 17:57+0000\n"
+"PO-Revision-Date: 2012-10-12 00:50+0000\n"
 "Last-Translator: BadCluster <badcluster@i2pmail.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/"
 "it/)\n"
@@ -361,7 +361,7 @@ msgstr "Quanto è passato dall'inizio di questa connessione"
 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:540
 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:756
 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2188
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:835
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:836
 msgid "Up"
 msgstr "Su"
 
@@ -722,7 +722,7 @@ msgstr "Bannato"
 
 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2310
 msgid "backlogged"
-msgstr ""
+msgstr "ritardi"
 
 #. buf.append("<tr><td colspan=\"16\"><hr></td></tr>\n");
 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2390
@@ -2134,7 +2134,7 @@ msgstr "Cancella"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:25
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:855
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:856
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:419
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:439
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:455
@@ -2143,7 +2143,7 @@ msgstr "Elimina selezionati"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:26
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:27
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:874
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:875
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:417
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:425
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:437
@@ -2294,7 +2294,7 @@ msgstr "WARN"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/HomeHelper.java:192
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:809
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:810
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -2448,12 +2448,12 @@ msgstr "Aggiornamento porta TCP a {0}"
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:224
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249
 msgid "Warning - ports less than 1024 are not recommended"
-msgstr ""
+msgstr "Attenzione - è meglio non utilizzare le porte da 0 a 1024!"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:228
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:255
 msgid "Invalid port"
-msgstr ""
+msgstr "Porta non valida"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:233
 msgid "Updating inbound TCP port to auto"
@@ -2462,7 +2462,7 @@ msgstr "Aggiornando le porte TCP entranti a automatiche"
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:247
 #, java-format
 msgid "Updating UDP port to {0}"
-msgstr ""
+msgstr "Aggiornamento porta UDP a {0}"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:272
 msgid "Gracefully restarting into Hidden Router Mode"
@@ -2502,7 +2502,7 @@ msgstr "Introduttori SSU richiesti"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:369
 msgid "Invalid address"
-msgstr ""
+msgstr "Indirizzo non valido"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
 #, java-format
@@ -2745,11 +2745,11 @@ msgstr "La console non verrà mostrata all'avvio"
 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:457
 msgid "Force GC"
-msgstr ""
+msgstr "Forza GC"
 
 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223
 msgid "Full garbage collection requested"
-msgstr ""
+msgstr "Richieste totali"
 
 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:232
 msgid "Service installed"
@@ -3468,7 +3468,7 @@ msgstr ""
 "Il tuo browser non è configurato correttamente per usare il proxy HTTP al {0}"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:194
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:811
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:812
 msgid "Name"
 msgstr "Nome"
 
@@ -3477,7 +3477,7 @@ msgid "URL"
 msgstr "URL"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:214
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:857
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:858
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -4135,37 +4135,37 @@ msgstr "Bannato fino al riavvio o in {0}"
 msgid "unban now"
 msgstr "riammissione istantanea"
 
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:314
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:312
 msgid "Bandwidth usage"
 msgstr "Utilizzo di larghezza di banda"
 
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:324
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:322
 msgid "Outbound Bytes/sec"
 msgstr "Bytes/s In Uscita"
 
 #. def.line(sendName, Color.BLUE, "Outbound bytes/sec", 3);
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:326
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:324
 msgid "Inbound Bytes/sec"
 msgstr "Bytes/s In Entrata"
 
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:327
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:328
 #: ../java/src/net/i2p/router/web/StatSummarizer.java:329
 #: ../java/src/net/i2p/router/web/StatSummarizer.java:330
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:331
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bps"
 msgstr "Bps"
 
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:329
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:327
 msgid "Out average"
 msgstr "Media In Uscita"
 
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:328
 #: ../java/src/net/i2p/router/web/StatSummarizer.java:330
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:155
 msgid "max"
 msgstr "massimo"
 
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:331
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:329
 msgid "In average"
 msgstr "Media In Entrata"
 
@@ -4678,13 +4678,13 @@ msgstr "Costruendo i tunnel"
 #. nicely under 'local destinations' in the summary bar
 #. note that if the wording changes in i2ptunnel.config, we have to
 #. keep the old string here as well for existing installs
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:462
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:459
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "client condivisi"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:676
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:677
 #, java-format
 msgid "Download {0} Update"
 msgstr "Scaricamento {0} Aggiornamento"
@@ -4692,40 +4692,40 @@ msgstr "Scaricamento {0} Aggiornamento"
 #. Note to translators: parameter is a date and time, e.g. "02-Mar 20:34 UTC"
 #. <br> is optional, to help the browser make the lines even in the button
 #. If the translation is shorter than the English, you should probably not include <br>
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:685
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Scaricamento Aggiornamento {0} Non Firmato<br>"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:709
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:710
 msgid "Help with firewall configuration"
 msgstr "Aiuto con la configurazione del firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:711
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:712
 msgid "Check network connection and NAT/firewall"
 msgstr "Controlla la connessione di rete e il NAT/firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:730
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:731
 msgid "Reseed"
 msgstr "Reseed"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:813
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:814
 msgid "Order"
 msgstr "Ordine"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:830
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:831
 msgid "Top"
 msgstr "Sopra"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:843
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:844
 msgid "Down"
 msgstr "Sotto"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:848
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:849
 msgid "Bottom"
 msgstr "Basso"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:860
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
 msgid "Select a section to add"
 msgstr "Seleziona una sezione da aggiungere"
 

apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java

@@ -42,7 +42,7 @@ public class POP3MailBox {
 
 	private String host = null, user = null, pass = null;
 
-	private String lastLine = "-ERR", lastError = null;
+	private String lastLine = "-ERR No response from server", lastError = null;
 
 	private int port = 0, mails = 0, read = 0;