Changeset 0196275 for core

Timestamp:

Feb 22, 2018 2:54:57 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

6fe25cd

Parents:

2374471

Message:

Util: Support setSoTimeout() for InternalSockets?
to keep susimail server connections from hanging too long

Location:

core/java/src/net/i2p/util

Files:

• InternalServerSocket.java (modified) (1 diff)
• InternalSocket.java (modified) (1 diff)
• TimeoutPipedInputStream.java (added)
• TimeoutPipedOutputStream.java (added)

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

@@ -101 +101 @@
         if (iss == null)
              throw new IOException("No server for port: " + port);
-        PipedInputStream cis = new PipedInputStream(64*1024);
-        PipedInputStream sis = new PipedInputStream(64*1024);
-        PipedOutputStream cos = new PipedOutputStream(sis);
-        PipedOutputStream sos = new PipedOutputStream(cis);
+        TimeoutPipedInputStream cis = new TimeoutPipedInputStream(64*1024);
+        TimeoutPipedInputStream sis = new TimeoutPipedInputStream(64*1024);
+        PipedOutputStream cos = new TimeoutPipedOutputStream(sis);
+        PipedOutputStream sos = new TimeoutPipedOutputStream(cis);
         clientSock.setInputStream(cis);
         clientSock.setOutputStream(cos);

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

@@ -99 +99 @@
     }
 
+    /**
+     *  Supported as of 0.9.34, if constructed with TimeoutPipedInputStream
+     *  and TimeoutPipedOutputStream. Otherwise, does nothing.
+     *  @see TimeoutPipedInputStream
+     */
+    @Override
+    public synchronized void setSoTimeout(int timeout) {
+        if (_is != null && _is instanceof TimeoutPipedInputStream)
+            ((TimeoutPipedInputStream) _is).setReadTimeout(timeout);
+    }
+
     // ignored stuff
-    /** warning - unsupported */
-    @Override
-    public void setSoTimeout(int timeout) {}
-
+
+    /**
+     *  Always returns 0, even if setSoTimeout() was called.
+     */
     @Override
     public int getSoTimeout () {