Merge pull request #66 from cconlon/getSoTimeout

Correct behavior of WolfSSLSocket.getSoTimeout()

Author: JacobBarthelmeh

src/java/com/wolfssl/provider/jsse/WolfSSLSocket.java

@@ -69,7 +69,6 @@ public class WolfSSLSocket extends SSLSocket {
     private Socket socket = null;
     private boolean autoClose;
     private InetSocketAddress address = null;
-    private int readTimeout = 0;
 
     private WolfSSLInputStream inStream;
     private WolfSSLOutputStream outStream;
@@ -1283,7 +1282,6 @@ public void setSoTimeout(int timeout) throws SocketException {
         } else {
             super.setSoTimeout(timeout);
         }
-        this.readTimeout = timeout;
     }
 
     /**
@@ -1295,7 +1293,11 @@ public void setSoTimeout(int timeout) throws SocketException {
      */
     @Override
     public int getSoTimeout() throws SocketException {
-        return this.readTimeout;
+        if (this.socket != null) {
+            return this.socket.getSoTimeout();
+        } else {
+            return super.getSoTimeout();
+        }
     }
 
     /**
@@ -1324,6 +1326,8 @@ synchronized public void setSSLParameters(SSLParameters params) {
     @Override
     synchronized public void close() throws IOException {
 
+        int ret;
+
         WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
             "entered close()");
 
@@ -1353,7 +1357,11 @@ synchronized public void close() throws IOException {
                     WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
                                      "thread got ioLock (shutdown)");
 
-                    int ret = ssl.shutdownSSL(this.readTimeout);
+                    if (this.socket != null) {
+                        ret = ssl.shutdownSSL(this.socket.getSoTimeout());
+                    } else {
+                        ret = ssl.shutdownSSL(super.getSoTimeout());
+                    }
                     WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
                             "ssl.shutdownSSL() ret = " + ret);
 
@@ -1655,9 +1663,9 @@ public int read(byte[] b, int off, int len)
                     int err;
 
                     WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
-                        "ssl.read() socket timeout = " + socket.readTimeout);
+                        "ssl.read() socket timeout = " + socket.getSoTimeout());
 
-                    ret = ssl.read(data, len, socket.readTimeout);
+                    ret = ssl.read(data, len, socket.getSoTimeout());
                     err = ssl.getError(ret);
 
                     WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,

src/test/com/wolfssl/provider/jsse/test/WolfSSLSocketFactoryTest.java

@@ -280,12 +280,26 @@ public void testCreateSocket()
 
                 /* Socket, String, int, boolean */
                 s = new Socket(addr, port);
+
+                /* Set timeout, to test that createSocket returns it */
+                int tmpTimeout = 15000;
+                s.setSoTimeout(tmpTimeout);
+
                 ss = (SSLSocket)sf.createSocket(s, addrStr, port, true);
                 if (ss == null) {
                     System.out.println("\t\t\t... failed");
                     fail("SSLSocketFactory.createSocket(SkSib) failed");
                     return;
                 }
+
+                /* verify getSoTimeout matches set value */
+                if (ss.getSoTimeout() != tmpTimeout) {
+                    System.out.println("\t\t\t... failed");
+                    fail("SSLSocketFactory.createSocket(SkSib) failed " +
+                         "setSoTimeout check");
+                    return;
+                }
+
                 ss.close();
                 s.close();