2005-09-25 jrandom

* Allow reseeding on the console if the netDb knows less than 30 peers,
      rather than less than 10 (without internet connectivity, we keep the
      last 15 router references)
    * Reenable the x-i2p-gzip HTTP processing by default, flushing the stream
      more aggressively.
    * Show the status that used to be called "ERR-Reject" as "OK (NAT)"
    * Reduced the default maximum number of streaming lib resends of a packet
      (10 retransmits is a bit much with a reasonable RTO)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java

@@ -65,6 +65,7 @@ class HTTPResponseOutputStream extends FilterOutputStream {
         if (_headerWritten) {
             out.write(buf, off, len);
             _dataWritten += len;
+            out.flush();
             return;
         }
 
@@ -80,6 +81,7 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                     // write out the remaining
                     out.write(buf, off+i+1, len-i-1);
                     _dataWritten += len-i-1;
+                    out.flush();
                 }
                 return;
             }
@@ -236,15 +238,15 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                 if (_out != null) try { _out.close(); } catch (IOException ioe) {}
             }
             long end = System.currentTimeMillis();
-            long compressed = in.getTotalRead();
-            long expanded = in.getTotalExpanded();
+            double compressed = in.getTotalRead();
+            double expanded = in.getTotalExpanded();
             double ratio = 0;
             if (expanded > 0)
                 ratio = compressed/expanded;
 
             _context.statManager().addRateData("i2ptunnel.httpCompressionRatio", (int)(100d*ratio), end-start);
-            _context.statManager().addRateData("i2ptunnel.httpCompressed", compressed, end-start);
-            _context.statManager().addRateData("i2ptunnel.httpExpanded", expanded, end-start);
+            _context.statManager().addRateData("i2ptunnel.httpCompressed", (long)compressed, end-start);
+            _context.statManager().addRateData("i2ptunnel.httpExpanded", (long)expanded, end-start);
         }
     }
     private class InternalGZIPInputStream extends GZIPInputStream {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

@@ -195,6 +195,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
         return opts;
     }
 
+    private static final boolean DEFAULT_GZIP = true;
+    
     private static long __requestId = 0;
     protected void clientConnectionRun(Socket s) {
         OutputStream out = null;
@@ -439,7 +441,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                 if (line.length() == 0) {
                     
                     String ok = getTunnel().getContext().getProperty("i2ptunnel.gzip");
-                    boolean gzip = false;
+                    boolean gzip = DEFAULT_GZIP;
                     if (ok != null)
                         gzip = Boolean.valueOf(ok).booleanValue();
                     if (gzip)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java

@@ -178,7 +178,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
             if (_log.shouldLog(Log.INFO))
                 _log.info(_name + ": Begin sending");
             try {
-                byte buf[] = new byte[4096];
+                byte buf[] = new byte[16*1024];
                 int read = 0;
                 int total = 0;
                 while ( (read = _in.read(buf)) != -1) {