Merge commit '0bff693' into curl_gh_fix

Author: embhorn

examples/mqttnet.c

@@ -737,22 +737,16 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
 
     if (timeout_ms != 0) {
         res = curl_easy_setopt(sock->curl, CURLOPT_CONNECTTIMEOUT_MS,
-                               timeout_ms);
+                               (long)timeout_ms);
 
         if (res != CURLE_OK) {
             PRINTF("error: curl_easy_setopt(CONNECTTIMEOUT_MS, %d) "
                    "returned %d", timeout_ms, res);
             return MQTT_CODE_ERROR_CURL;
         }
-
-        res = curl_easy_setopt(sock->curl, CURLOPT_TIMEOUT_MS,
-                               timeout_ms);
-
-        if (res != CURLE_OK) {
-            PRINTF("error: curl_easy_setopt(TIMEOUT_MS, %d) "
-                   "returned %d", timeout_ms, res);
-            return MQTT_CODE_ERROR_CURL;
-        }
+        /* Note: CURLOPT_TIMEOUT_MS is not used here because it sets a total
+         * transfer timeout, which is not applicable with CURLOPT_CONNECT_ONLY
+         * mode where we use curl_easy_send/recv manually after connect. */
     }
 
     res = curl_easy_setopt(sock->curl, CURLOPT_URL, host);
@@ -763,7 +757,7 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
         return MQTT_CODE_ERROR_CURL;
     }
 
-    res = curl_easy_setopt(sock->curl, CURLOPT_PORT, port);
+    res = curl_easy_setopt(sock->curl, CURLOPT_PORT, (long)port);
 
     if (res != CURLE_OK) {
         PRINTF("error: curl_easy_setopt(PORT, %d) returned: %d",
@@ -845,7 +839,7 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
         */
 
         /* Set peer and host verification. */
-        res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYPEER, 1);
+        res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYPEER, 1L);
 
         if (res != CURLE_OK) {
             PRINTF("error: curl_easy_setopt(SSL_VERIFYPEER) returned: %d",
@@ -856,10 +850,10 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
         /* Only do server host verification when not running against
          * localhost broker. */
         if (XSTRCMP(host, "localhost") == 0) {
-            res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 0);
+            res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 0L);
         }
         else {
-            res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 2);
+            res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 2L);
         }
 
         if (res != CURLE_OK) {
@@ -898,7 +892,7 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
     }
     #endif
 
-    res = curl_easy_setopt(sock->curl, CURLOPT_CONNECT_ONLY, 1);
+    res = curl_easy_setopt(sock->curl, CURLOPT_CONNECT_ONLY, 1L);
 
     if (res != CURLE_OK) {
         PRINTF("error: curl_easy_setopt(CONNECT_ONLY, 1) returned: %d",

src/mqtt_socket.c

@@ -143,9 +143,8 @@ static int MqttSocket_WriteDo(MqttClient *client, const byte* buf, int buf_len,
 
         rc = wolfSSL_write(client->tls.ssl, (char*)buf, buf_len);
         if (rc < 0) {
-        #if defined(WOLFMQTT_DEBUG_SOCKET) || defined(WOLFSSL_ASYNC_CRYPT)
             int error = wolfSSL_get_error(client->tls.ssl, 0);
-        #endif
+            client->tls.lastError = error;
         #ifdef WOLFMQTT_DEBUG_SOCKET
             if (error != WOLFSSL_ERROR_WANT_WRITE
             #ifdef WOLFSSL_ASYNC_CRYPT
@@ -248,6 +247,7 @@ static int MqttSocket_ReadDo(MqttClient *client, byte* buf, int buf_len,
         rc = wolfSSL_read(client->tls.ssl, (char*)buf, buf_len);
         if (rc < 0) {
             int error = wolfSSL_get_error(client->tls.ssl, 0);
+            client->tls.lastError = error;
         #ifdef WOLFMQTT_DEBUG_SOCKET
             if (error != WOLFSSL_ERROR_WANT_READ
             #ifdef WOLFSSL_ASYNC_CRYPT
@@ -404,6 +404,9 @@ int MqttSocket_Connect(MqttClient *client, const char* host, word16 port,
 #if defined(ENABLE_MQTT_TLS) && !defined(ENABLE_MQTT_CURL) && \
     !defined(ENABLE_MQTT_WEBSOCKET)
     if (use_tls) {
+        /* Clear any previous TLS error */
+        client->tls.lastError = 0;
+
         if (client->tls.ctx == NULL) {
         #ifdef DEBUG_WOLFSSL
             wolfSSL_Debugging_ON();
@@ -502,6 +505,8 @@ int MqttSocket_Connect(MqttClient *client, const char* host, word16 port,
             ) {
                 return MQTT_CODE_CONTINUE;
             }
+            /* Preserve the error to be used later, e.g. in net callback */
+            client->tls.lastError = errnum;
         #ifdef WOLFMQTT_DEBUG_SOCKET
             errstr = wolfSSL_ERR_reason_error_string(errnum);
         #endif

wolfmqtt/mqtt_socket.h

@@ -73,6 +73,7 @@ typedef struct _MqttTls {
     int                 sockRcWrite;
     int                 timeout_ms_read;
     int                 timeout_ms_write;
+    int                 lastError;
 } MqttTls;
 #endif