Add curl easy socket backend: consolidate mqtt_curl into mqtt_socket.

Author: philljj

examples/mqttnet.c

@@ -441,6 +441,7 @@ mqttcurl_connect(SocketContext * ctx, const char* host, word16 port,
 
     if (port == MQTT_SECURE_PORT) { use_tls = 1; }
 
+    /* Toggle with option, or put behind debug define? */
     res = curl_easy_setopt(ctx->curl, CURLOPT_VERBOSE, 1L);
 
     if (res != CURLE_OK) {
@@ -636,7 +637,7 @@ static int NetWrite(void *context, const byte* buf, int buf_len,
     }
 
 #if defined(WOLFMQTT_DEBUG_SOCKET)
-    PRINTF("ctx->curl = %lld, sockfd = %d", (long long) ctx->curl, sockfd);
+    PRINTF("ctx->curl = %p, sockfd = %d", (void *)ctx->curl, sockfd);
 #endif
 
     /* A very simple retry with timeout example. This assumes the entire
@@ -703,7 +704,7 @@ static int NetRead(void *context, byte* buf, int buf_len,
     }
 
 #if defined(WOLFMQTT_DEBUG_SOCKET)
-    PRINTF("ctx->curl = %lld, sockfd = %d", (long long) ctx->curl, sockfd);
+    PRINTF("ctx->curl = %p, sockfd = %d", (void *)ctx->curl, sockfd);
 #endif
 
     /* A very simple retry with timeout example. This assumes the entire

examples/mqttnet.h

@@ -26,6 +26,10 @@
     extern "C" {
 #endif
 
+#ifdef ENABLE_MQTT_CURL
+    #include <curl/curl.h>
+#endif
+
 #include "examples/mqttexample.h"
 #include "examples/mqttport.h"
 

src/include.am

@@ -5,15 +5,9 @@
 
 lib_LTLIBRARIES+=  src/libwolfmqtt.la
 
-if HAVE_LIBCURL
-src_libwolfmqtt_la_SOURCES = src/mqtt_client.c \
-                             src/mqtt_packet.c \
-                             src/mqtt_curl.c
-else
 src_libwolfmqtt_la_SOURCES = src/mqtt_client.c \
                              src/mqtt_packet.c \
                              src/mqtt_socket.c
-endif
 
 if BUILD_SN
 src_libwolfmqtt_la_SOURCES += src/mqtt_sn_client.c \

src/mqtt_curl.c

@@ -34,6 +34,10 @@
     #include <errno.h>
 #endif
 
+#ifdef ENABLE_MQTT_CURL
+    #include <curl/curl.h>
+#endif
+
 #include "wolfmqtt/mqtt_client.h"
 #include "wolfmqtt/mqtt_socket.h"
 
@@ -102,6 +106,10 @@ int MqttSocket_Init(MqttClient *client, MqttNet *net)
 {
     int rc = MQTT_CODE_ERROR_BAD_ARG;
     if (client) {
+    #ifdef ENABLE_MQTT_CURL
+        curl_global_init(CURL_GLOBAL_DEFAULT);
+    #endif
+
         client->net = net;
         MqttClient_Flags(client, (MQTT_CLIENT_FLAG_IS_CONNECTED |
             MQTT_CLIENT_FLAG_IS_TLS), 0);;
@@ -534,6 +542,10 @@ int MqttSocket_Disconnect(MqttClient *client)
             rc = client->net->disconnect(client->net->context);
         }
         MqttClient_Flags(client, MQTT_CLIENT_FLAG_IS_CONNECTED, 0);
+
+    #ifdef ENABLE_MQTT_CURL
+        curl_global_cleanup();
+    #endif
     }
 #ifdef WOLFMQTT_DEBUG_SOCKET
     PRINTF("MqttSocket_Disconnect: Rc=%d", rc);

src/mqtt_socket.c

@@ -11,9 +11,6 @@ nobase_include_HEADERS+= \
                          wolfmqtt/visibility.h \
                          wolfmqtt/options.h \
                          wolfmqtt/vs_settings.h
-if HAVE_LIBCURL
-nobase_include_HEADERS+= wolfmqtt/mqtt_curl.h
-endif
 
 if BUILD_SN
 nobase_include_HEADERS+= wolfmqtt/mqtt_sn_client.h \

wolfmqtt/include.am

@@ -40,11 +40,7 @@
 #endif
 #include "wolfmqtt/mqtt_types.h"
 #include "wolfmqtt/mqtt_packet.h"
-#ifdef ENABLE_MQTT_CURL
-    #include "wolfmqtt/mqtt_curl.h"
-#else
-    #include "wolfmqtt/mqtt_socket.h"
-#endif
+#include "wolfmqtt/mqtt_socket.h"
 
 #ifdef WOLFMQTT_SN
 #include "wolfmqtt/mqtt_sn_packet.h"