Add curl easy socket backend: fix warning, fix multithread test.

wolfSSL · Dec 8, 2023 · c329ef7 · c329ef7
1 parent d98607e
commit c329ef7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/examples/mqttnet.c b/examples/mqttnet.c
@@ -432,7 +432,7 @@ static int
 mqttcurl_connect(SocketContext * sock, const char* host, word16 port,
     int timeout_ms)
 {
-    CURLcode res = 0;
+    CURLcode res = CURLE_OK;
 
     if (sock == NULL) {
         return MQTT_CODE_ERROR_BAD_ARG;
@@ -644,7 +644,7 @@ static int NetConnect(void *context, const char* host, word16 port,
 static int NetWrite(void *context, const byte* buf, int buf_len,
     int timeout_ms)
 {
-    CURLcode        res = 0;
+    CURLcode        res = CURLE_OK;
     SocketContext * sock = (SocketContext*)context;
     size_t          sent = 0;
     curl_socket_t   sockfd = 0;
@@ -711,7 +711,7 @@ static int NetWrite(void *context, const byte* buf, int buf_len,
 static int NetRead(void *context, byte* buf, int buf_len,
     int timeout_ms)
 {
-    CURLcode        res = 0;
+    CURLcode        res = CURLE_OK;
     SocketContext * sock = (SocketContext*)context;
     size_t          recvd = 0;
     curl_socket_t   sockfd = 0;

diff --git a/scripts/multithread.test b/scripts/multithread.test
@@ -72,6 +72,7 @@ then
     def_args="${def_args} -h localhost"
     tls_port_args="-p 18883"
     port_args="-p ${port}"
+    cacert_args="-A scripts/broker_test/ca-cert.pem"
 fi
 
 echo -e "Base args: $def_args $port_args"
@@ -92,15 +93,15 @@ RESULT=$?
 if test $has_tls == yes
 then
     # Run with TLS and QoS 0-2
-    ./examples/multithread/multithread $def_args $tls_port_args -t -q 0 $1
+    ./examples/multithread/multithread $def_args $cacert_args $tls_port_args -t -q 0 $1
     RESULT=$?
     [ $RESULT -ne 0 ] && echo -e "\n\nMultithread Client failed! TLS=On, QoS=0" && do_cleanup "-1"
 
-    ./examples/multithread/multithread $def_args $tls_port_args -t -q 1 $1
+    ./examples/multithread/multithread $def_args $cacert_args $tls_port_args -t -q 1 $1
     RESULT=$?
     [ $RESULT -ne 0 ] && echo -e "\n\nMultithread Client failed! TLS=On, QoS=1" && do_cleanup "-1"
 
-    ./examples/multithread/multithread $def_args $tls_port_args -t -q 2 $1
+    ./examples/multithread/multithread $def_args $cacert_args $tls_port_args -t -q 2 $1
     RESULT=$?
     [ $RESULT -ne 0 ] && echo -e "\n\nMultithread Client failed! TLS=On, QoS=2" && do_cleanup "-1"
 fi