Merge pull request #9 from kojo1/connectTimeout

Author: cconlon

native/com_wolfssl_WolfSSLSession.c

@@ -749,6 +749,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_write
                 break;
             }
 
+            if (ret >= 0) /* return if it is success */
+                break;
+
             if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) {
 
                 sockfd = wolfSSL_get_fd(ssl);

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

@@ -1150,7 +1150,9 @@ synchronized public void startHandshake() throws IOException {
             try {
                 ret = EngineHelper.doHandshake(0, this.getSoTimeout());
             } catch (SocketTimeoutException e) {
-                throw new IOException(e);
+                WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
+                        "got socket timeout in doHandshake()");
+                throw e;
             }
 
             WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
@@ -1783,8 +1785,15 @@ public int read(byte[] b, int off, int len)
                 }
 
                 /* do handshake if not completed yet, handles synchronization */
-                if (socket.handshakeComplete == false) {
-                    socket.startHandshake();
+                try {
+                    /* do handshake if not completed yet, handles synchronization */
+                    if (socket.handshakeComplete == false) {
+                        socket.startHandshake();
+                    }
+                } catch (SocketTimeoutException e) {
+                    WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
+                            "got socket timeout in read()");
+                    throw e;
                 }
 
                 if (b.length == 0 || len == 0) {
@@ -1901,9 +1910,15 @@ public void write(byte[] b, int off, int len) throws IOException {
                     }
                 }
 
-                /* do handshake if not completed yet, handles synchronization */
-                if (socket.handshakeComplete == false) {
-                    socket.startHandshake();
+                try {
+                    /* do handshake if not completed yet, handles synchronization */
+                    if (socket.handshakeComplete == false) {
+                        socket.startHandshake();
+                    }
+                } catch (SocketTimeoutException e) {
+                    WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
+                            "got socket timeout in write()");
+                    throw e;
                 }
 
                 if (off < 0 || len < 0 || (off + len) > b.length) {