Setup timeouts before TLS starting TLS handshake (aws#3503)

aggarg · web-flow · commit 5c0121777f30 · 2022-06-28T21:40:02.000+05:30
This was reported here - aws#3458 Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>
diff --git a/libraries/abstractions/transport/secure_sockets/transport_secure_sockets.c b/libraries/abstractions/transport/secure_sockets/transport_secure_sockets.c
@@ -455,13 +455,6 @@ static TransportSocketStatus_t establishConnect( NetworkContext_t * pNetworkCont
         }
     }
 
-    if( returnStatus == TRANSPORT_SOCKET_STATUS_SUCCESS )
-    {
-        /* Establish the TCP connection. */
-        returnStatus = connectToServer( tcpSocket,
-                                        pServerInfo );
-    }
-
     if( returnStatus == TRANSPORT_SOCKET_STATUS_SUCCESS )
     {
         /* Configure send and receive timeouts for the socket. */
@@ -474,6 +467,13 @@ static TransportSocketStatus_t establishConnect( NetworkContext_t * pNetworkCont
         }
     }
 
+    if( returnStatus == TRANSPORT_SOCKET_STATUS_SUCCESS )
+    {
+        /* Establish the TCP connection. */
+        returnStatus = connectToServer( tcpSocket,
+                                        pServerInfo );
+    }
+
     if( returnStatus == TRANSPORT_SOCKET_STATUS_SUCCESS )
     {
         /* Set the socket in the network context. */

Original file line number	Diff line number	Diff line change
`@@ -455,13 +455,6 @@ static TransportSocketStatus_t establishConnect( NetworkContext_t * pNetworkCont`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
`458`		`- if( returnStatus == TRANSPORT_SOCKET_STATUS_SUCCESS )`
`459`		`- {`
`460`		`- /* Establish the TCP connection. */`
`461`		`- returnStatus = connectToServer( tcpSocket,`
`462`		`- pServerInfo );`
`463`		`- }`
`464`		`-`
`465`	`458`	`if( returnStatus == TRANSPORT_SOCKET_STATUS_SUCCESS )`
`466`	`459`	`{`
`467`	`460`	`/* Configure send and receive timeouts for the socket. */`
`@@ -474,6 +467,13 @@ static TransportSocketStatus_t establishConnect( NetworkContext_t * pNetworkCont`
`474`	`467`	`}`
`475`	`468`	`}`
`476`	`469`
	`470`	`+ if( returnStatus == TRANSPORT_SOCKET_STATUS_SUCCESS )`
	`471`	`+ {`
	`472`	`+ /* Establish the TCP connection. */`
	`473`	`+ returnStatus = connectToServer( tcpSocket,`
	`474`	`+ pServerInfo );`
	`475`	`+ }`
	`476`	`+`
`477`	`477`	`if( returnStatus == TRANSPORT_SOCKET_STATUS_SUCCESS )`
`478`	`478`	`{`
`479`	`479`	`/* Set the socket in the network context. */`