Skip to content

Commit 0bff693

Browse files
committed
Fix curl GH test
1 parent cb0f8f8 commit 0bff693

1 file changed

Lines changed: 9 additions & 15 deletions

File tree

examples/mqttnet.c

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -737,22 +737,16 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
737737

738738
if (timeout_ms != 0) {
739739
res = curl_easy_setopt(sock->curl, CURLOPT_CONNECTTIMEOUT_MS,
740-
timeout_ms);
740+
(long)timeout_ms);
741741

742742
if (res != CURLE_OK) {
743743
PRINTF("error: curl_easy_setopt(CONNECTTIMEOUT_MS, %d) "
744744
"returned %d", timeout_ms, res);
745745
return MQTT_CODE_ERROR_CURL;
746746
}
747-
748-
res = curl_easy_setopt(sock->curl, CURLOPT_TIMEOUT_MS,
749-
timeout_ms);
750-
751-
if (res != CURLE_OK) {
752-
PRINTF("error: curl_easy_setopt(TIMEOUT_MS, %d) "
753-
"returned %d", timeout_ms, res);
754-
return MQTT_CODE_ERROR_CURL;
755-
}
747+
/* Note: CURLOPT_TIMEOUT_MS is not used here because it sets a total
748+
* transfer timeout, which is not applicable with CURLOPT_CONNECT_ONLY
749+
* mode where we use curl_easy_send/recv manually after connect. */
756750
}
757751

758752
res = curl_easy_setopt(sock->curl, CURLOPT_URL, host);
@@ -763,7 +757,7 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
763757
return MQTT_CODE_ERROR_CURL;
764758
}
765759

766-
res = curl_easy_setopt(sock->curl, CURLOPT_PORT, port);
760+
res = curl_easy_setopt(sock->curl, CURLOPT_PORT, (long)port);
767761

768762
if (res != CURLE_OK) {
769763
PRINTF("error: curl_easy_setopt(PORT, %d) returned: %d",
@@ -845,7 +839,7 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
845839
*/
846840

847841
/* Set peer and host verification. */
848-
res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYPEER, 1);
842+
res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYPEER, 1L);
849843

850844
if (res != CURLE_OK) {
851845
PRINTF("error: curl_easy_setopt(SSL_VERIFYPEER) returned: %d",
@@ -856,10 +850,10 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
856850
/* Only do server host verification when not running against
857851
* localhost broker. */
858852
if (XSTRCMP(host, "localhost") == 0) {
859-
res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 0);
853+
res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 0L);
860854
}
861855
else {
862-
res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 2);
856+
res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 2L);
863857
}
864858

865859
if (res != CURLE_OK) {
@@ -898,7 +892,7 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
898892
}
899893
#endif
900894

901-
res = curl_easy_setopt(sock->curl, CURLOPT_CONNECT_ONLY, 1);
895+
res = curl_easy_setopt(sock->curl, CURLOPT_CONNECT_ONLY, 1L);
902896

903897
if (res != CURLE_OK) {
904898
PRINTF("error: curl_easy_setopt(CONNECT_ONLY, 1) returned: %d",

0 commit comments

Comments
 (0)