MQTT client rcommand completion

src/mqttclient.cpp

@@ -1,7 +1,6 @@
 #ifdef HAS_MQTT
 
 #include "mqttclient.h"
-#include <base64.h>
 
 static const char TAG[] = __FILE__;
 
@@ -99,12 +98,20 @@ void mqtt_client_task(void *param) {
       // prepare mqtt topic
       char topic[16];
       snprintf(topic, 16, "%s/%u", MQTT_OUTTOPIC, msg.MessagePort);
+      size_t out_len = 0;
 
-      // send base64 encoded message to mqtt server and delete it from queue
-      if (mqttClient.publish(topic,
-                             base64::encode(msg.Message, msg.MessageSize))) {
-        ESP_LOGD(TAG, "%s/%s sent to MQTT server", topic,
-                 base64::encode(msg.Message, msg.MessageSize));
+      // get length of base64 encoded message
+      mbedtls_base64_encode(NULL, 0, &out_len, (unsigned char *)msg.Message,
+                            msg.MessageSize);
+
+      // base64 encode the message
+      unsigned char encoded[out_len];
+      mbedtls_base64_encode(encoded, out_len, &out_len,
+                            (unsigned char *)msg.Message, msg.MessageSize);
+
+      // send encoded message to mqtt server and delete it from queue
+      if (mqttClient.publish(topic, (const char *)encoded, out_len)) {
+        ESP_LOGD(TAG, "%u bytes sent to MQTT server", out_len);
         xQueueReceive(MQTTSendQueue, &msg, (TickType_t)0);
       } else
         ESP_LOGD(TAG, "Couldn't sent message to MQTT server");
@@ -117,19 +124,29 @@ void mqtt_client_task(void *param) {
   } // while (1)
 }
 
+// process incoming MQTT messages
+void mqtt_callback(MQTTClient *client, char *topic, char *payload, int length) {
+  if (strcmp(topic, MQTT_INTOPIC) == 0) {
+
+    // get length of base64 encoded message
+    size_t out_len = 0;
+    mbedtls_base64_decode(NULL, 0, &out_len, (unsigned char *)payload, length);
+
+    // decode the base64 message
+    unsigned char decoded[out_len];
+    mbedtls_base64_decode(decoded, out_len, &out_len, (unsigned char *)payload,
+                          length);
+
+    rcommand(decoded, out_len);
+  }
+}
+
 // enqueue outgoing messages in MQTT send queue
 void mqtt_enqueuedata(MessageBuffer_t *message) {
   if (xQueueSendToBack(MQTTSendQueue, (void *)message, (TickType_t)0) != pdTRUE)
     ESP_LOGW(TAG, "MQTT sendqueue is full");
 }
 
-// process incoming MQTT messages
-void mqtt_callback(MQTTClient *client, char topic[], char payload[],
-                   int length) {
-  if (strcmp(topic, MQTT_INTOPIC) == 0)
-    rcommand((const uint8_t *)payload, (const uint8_t)length);
-}
-
 void mqtt_queuereset(void) { xQueueReset(MQTTSendQueue); }
 
 uint32_t mqtt_queuewaiting(void) {