progress; need to look at setDeviceId some more

Signed-off-by: Brenton Poke <[email protected]>
BrentonPoke · Oct 21, 2024 · afd5bb7 · afd5bb7
1 parent f46e2dc
commit afd5bb7
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/src/CdpPacket.h b/src/CdpPacket.h
@@ -211,7 +211,7 @@ class CdpPacket {
     std::array<byte,8>().swap(sduid);
     std::array<byte,8>().swap(muid);
     //std::array<byte,8>().swap(path);
-    std::array<byte,229>().swap(data);
+    data.clear();
     duckType = DuckType::UNKNOWN;
     hopCount = 0;
     topic = 0;

diff --git a/src/DuckPacket.cpp b/src/DuckPacket.cpp
@@ -50,7 +50,7 @@ int DuckPacket::prepareForSending(BloomFilter *filter,
                                   std::array<byte,8> targetDevice, byte duckType,
                                   byte topic, std::vector<byte> app_data) {
 
-  std::vector<byte> encryptedData;
+  std::vector<uint8_t> encryptedData;
   uint8_t app_data_length = app_data.size();
 
   this->reset();

diff --git a/src/Ducks/Duck.cpp b/src/Ducks/Duck.cpp
@@ -68,14 +68,12 @@ void Duck::logIfLowMemory() {
   }
 }
 
-int Duck::setDeviceId(std::vector<byte> id) {
+int Duck::setDeviceId(std::array<byte,8> id) {
   if (id.size() != DUID_LENGTH) {
     logerr_ln("ERROR  device id too long rc = %d", DUCK_ERR_ID_TOO_LONG);
     return DUCK_ERR_ID_TOO_LONG;
   }
-
-  duid.clear();
-  duid.assign(id.begin(), id.end());
+    std::copy(id.begin(), id.end(),duid.begin());
   loginfo_ln("setupDeviceId rc = %d",DUCK_ERR_NONE);
   return DUCK_ERR_NONE;
 }
@@ -251,18 +249,18 @@ int Duck::sendData(byte topic, std::vector<byte> data,
   }
 
   lastMessageAck = false;
-  lastMessageMuid.assign(packet.muid.begin(), packet.muid.end());
+    std::copy(packet.muid.begin(),packet.muid.end(),lastMessageMuid.begin());
   assert(lastMessageMuid.size() == MUID_LENGTH);
   if (outgoingMuid != NULL) {
-    outgoingMuid->assign(packet.muid.begin(), packet.muid.end());
+      std::copy(packet.muid.cbegin(),packet.muid.cend(),outgoingMuid->begin());
     assert(outgoingMuid->size() == MUID_LENGTH);
   }
   txPacket->reset();
 
   return err;
 }
 
-muidStatus Duck::getMuidStatus(const std::vector<byte> & muid) const {
+muidStatus Duck::getMuidStatus(const std::array<byte,8> & muid) const {
   if (duckutils::isEqual(muid, lastMessageMuid)) {
     if (lastMessageAck) {
       return muidStatus::acked;

diff --git a/src/include/Duck.h b/src/include/Duck.h
@@ -55,7 +55,7 @@ class Duck {
    * @param an 8 byte unique id 
    * @return DUCK_ERR_NONE if successful, an error code otherwise 
    */
-  int setDeviceId(std::vector<byte> id);
+  int setDeviceId(std::array<byte,8> id);
 
   /**
    * @brief setup the duck unique ID
@@ -198,7 +198,7 @@ class Duck {
   /**
    * @brief Get the status of an MUID
    */
-  muidStatus getMuidStatus(const std::vector<byte> & muid) const;
+  muidStatus getMuidStatus(const std::array<byte,8> & muid) const;
 
   /**
    * @brief Check wifi connection status
@@ -304,7 +304,7 @@ class Duck {
 
   DuckPacket* txPacket = NULL;
   DuckPacket* rxPacket = NULL;
-  std::vector<byte> lastMessageMuid;
+  std::array<byte,8> lastMessageMuid;
 
   bool lastMessageAck = true;
   // Since this may be used to throttle outgoing packets, start out in a state

diff --git a/src/include/DuckUtils.h b/src/include/DuckUtils.h
@@ -85,6 +85,25 @@ std::string toString(const std::vector<T>& vec) {
     return result;
 }
 
+/**
+ * @brief Convert a array into an ASCII string.
+ *
+ * @param arr A vector to convert
+ * @returns A std::string representing the byte array in ASCII.
+ *
+ */
+    template<typename T>
+    std::string toString(const std::array<T,8>& arr) {
+        std::string result;
+        for (const auto& element : arr) {
+            if (!std::isprint(element)) {
+                return "ERROR: Non-printable character";
+            }
+            result += static_cast<char>(element);
+        }
+        return result;
+    }
+
 /**
  * @brief Compare two vectors with regard to both size and contents.
  *