Refactor RFConfiguration for remove std:vector and use dynamic arrays for white and black lists, adding destructor for memory management

Author: Odyno

main/config_RF.h

@@ -25,11 +25,9 @@
 */
 #ifndef config_RF_h
 #define config_RF_h
+#pragma once
 
 #include <rf/RFConfiguration.h>
-extern RFConfiguration iRFConfig;
-
-#include "TheengsCommon.h"
 
 #ifdef ZgatewayRF
 extern void RFtoX();
@@ -139,6 +137,9 @@ const char parameters[51][4][24] = {
 #    define DISCOVERY_TRACE_LOG(...)
 #  endif
 #endif
+
+extern RFConfiguration iRFConfig;
+
 /*-------------------RF topics & parameters----------------------*/
 //433Mhz MQTT Subjects and keys
 #define subjectMQTTtoRF              "/commands/MQTTto433"

main/rf/RFConfiguration.cpp

@@ -8,10 +8,16 @@ extern rtl_433_ESP rtl_433;
 #endif
 
 // Constructor
-RFConfiguration::RFConfiguration(RFReceiver& receiver) : iRFReceiver(receiver) {
+RFConfiguration::RFConfiguration(RFReceiver& receiver) : iRFReceiver(receiver), whiteList(nullptr), whiteListSize(0), blackList(nullptr), blackListSize(0) {
   reInit();
 }
 
+// Destructor
+RFConfiguration::~RFConfiguration() {
+  delete[] whiteList;
+  delete[] blackList;
+}
+
 // Getters and Setters
 float RFConfiguration::getFrequency() const {
   return frequency;
@@ -61,31 +67,17 @@ void RFConfiguration::setIgnoreBlacklist(bool ignore) {
   ignoreBlacklist = ignore;
 }
 
-const std::vector<uint64_t>& RFConfiguration::getWhiteList() const {
-  return whiteList;
-}
-
-void RFConfiguration::setWhiteList(const std::vector<uint64_t>& list) {
-  whiteList = list;
-}
-
-const std::vector<uint64_t>& RFConfiguration::getBlackList() const {
-  return blackList;
-}
-
-void RFConfiguration::setBlackList(const std::vector<uint64_t>& list) {
-  blackList = list;
-}
-
 // Utility methods
 void RFConfiguration::clearWhiteList() {
-  whiteList.clear();
-  whiteList.shrink_to_fit();
+  delete[] whiteList;
+  whiteList = nullptr;
+  whiteListSize = 0;
 }
 
 void RFConfiguration::clearBlackList() {
-  blackList.clear();
-  blackList.shrink_to_fit();
+  delete[] blackList;
+  blackList = nullptr;
+  blackListSize = 0;
 }
 
 /**
@@ -106,10 +98,8 @@ void RFConfiguration::reInit() {
   newOokThreshold = 0;
   ignoreWhitelist = false;
   ignoreBlacklist = false;
-  whiteList.clear();
-  whiteList.shrink_to_fit();
-  blackList.clear();
-  blackList.shrink_to_fit();
+  clearWhiteList();
+  clearBlackList();
 }
 
 /**
@@ -359,13 +349,13 @@ void RFConfiguration::toJson(JsonObject& RFdata) {
 
   // Add white-list vector to the JSON object
   JsonArray whiteListArray = RFdata.createNestedArray("white-list");
-  for (const auto& value : whiteList) {
-    whiteListArray.add(value);
+  for (size_t i = 0; i < whiteListSize; ++i) {
+    whiteListArray.add(whiteList[i]);
   }
   // Add black-list vector to the JSON object
   JsonArray blackListArray = RFdata.createNestedArray("black-list");
-  for (const auto& value : blackList) {
-    blackListArray.add(value);
+  for (size_t i = 0; i < blackListSize; ++i) {
+    blackListArray.add(blackList[i]);
   }
 }
 
@@ -385,8 +375,8 @@ bool RFConfiguration::inBlackList(uint64_t MQTTvalue) {
   if (ignoreBlacklist) {
     return false;
   }
-  for (const auto& value : blackList) {
-    if (value == MQTTvalue) {
+  for (size_t i = 0; i < blackListSize; ++i) {
+    if (blackList[i] == MQTTvalue) {
       return true;
     }
   }
@@ -405,11 +395,11 @@ bool RFConfiguration::inBlackList(uint64_t MQTTvalue) {
  * @return false if the value is not in the whitelist.
  */
 bool RFConfiguration::inWhiteList(uint64_t MQTTvalue) {
-  if (ignoreWhitelist || whiteList.empty()) {
+  if (ignoreWhitelist || whiteListSize == 0) {
     return true;
   }
-  for (const auto& value : whiteList) {
-    if (value == MQTTvalue) {
+  for (size_t i = 0; i < whiteListSize; ++i) {
+    if (whiteList[i] == MQTTvalue) {
       return true;
     }
   }
@@ -467,10 +457,12 @@ bool RFConfiguration::commandSetWhiteorBlackList(JsonObject& RFdata, bool isWhit
     if (value != NULL) {
       uint64_t MQTTvalue = strtoull(value, NULL, 10);
       if (isWhite) {
-        whiteList.push_back(MQTTvalue);
+        whiteList = (uint64_t*)realloc(whiteList, (whiteListSize + 1) * sizeof(uint64_t));
+        whiteList[whiteListSize++] = MQTTvalue;
         Log.trace(F("[RF] White list updated with value: %s" CR), value);
       } else {
-        blackList.push_back(MQTTvalue);
+        blackList = (uint64_t*)realloc(blackList, (blackListSize + 1) * sizeof(uint64_t));
+        blackList[blackListSize++] = MQTTvalue;
         Log.trace(F("[RF] Black list updated with value: %s" CR), value);
       }
     } else {

main/rf/RFConfiguration.h

@@ -5,12 +5,12 @@
 #include <TheengsCommon.h>
 #include <rf/RFReceiver.h>
 
-#include <vector>
 
 class RFConfiguration {
 public:
   // Constructor
   RFConfiguration(RFReceiver& receiver);
+  ~RFConfiguration();
 
   // Getters and Setters
   float getFrequency() const;
@@ -31,12 +31,6 @@ class RFConfiguration {
   bool isBlacklistIgnored() const;
   void setIgnoreBlacklist(bool ignore);
 
-  const std::vector<uint64_t>& getWhiteList() const;
-  void setWhiteList(const std::vector<uint64_t>& list);
-
-  const std::vector<uint64_t>& getBlackList() const;
-  void setBlackList(const std::vector<uint64_t>& list);
-
   // Utility methods
   void clearWhiteList();
   void clearBlackList();
@@ -150,8 +144,10 @@ class RFConfiguration {
   int activeReceiver;
   bool ignoreWhitelist;
   bool ignoreBlacklist;
-  std::vector<uint64_t> whiteList;
-  std::vector<uint64_t> blackList;
+  uint64_t* whiteList;
+  size_t whiteListSize;
+  uint64_t* blackList;
+  size_t blackListSize;
 
   bool commandSetWhiteorBlackList(JsonObject& RFdata, bool isWhite);
 };