@alteriom/painlessmesh 2.0.3 → 2.1.1

package/src/painlessmesh/message_queue.hpp

@@ -37,10 +37,10 @@ enum QueueState {
  * Contains all metadata needed for reliable message delivery
  */
 struct QueuedMessage {
-  uint32_t id;              // Unique message ID
-  MessagePriority priority; // Message priority level
-  uint32_t timestamp;       // When message was queued (millis)
-  uint32_t attempts;        // Number of send attempts
+  uint32_t id = 0;          // Unique message ID
+  MessagePriority priority = PRIORITY_NORMAL; // Message priority level
+  uint32_t timestamp = 0;   // When message was queued (millis)
+  uint32_t attempts = 0;    // Number of send attempts
   TSTRING payload;          // Message content
   TSTRING destination;      // Cloud endpoint/topic (optional metadata)
   
@@ -298,8 +298,8 @@ public:
 
 private:
   std::vector<QueuedMessage> messages;
-  uint32_t maxQueueSize;
-  uint32_t nextMessageId;
+  uint32_t maxQueueSize = 1000;
+  uint32_t nextMessageId = 1;
   QueueStats stats;
   QueueState currentState = QUEUE_EMPTY;
   queueStateChangedCallback_t stateChangedCallback;

package/src/painlessmesh/metrics.hpp

@@ -51,7 +51,7 @@ class Timer {
 #endif
   }
 
-  uint32_t start_time_;
+  uint32_t start_time_ = 0;
 #ifdef ESP32
   int64_t start_time_us_ = esp_timer_get_time();
 #endif

package/src/painlessmesh/ota.hpp

@@ -112,7 +112,7 @@ class Announce : public BroadcastPackage {
    */
   bool compressed = false;
 
-  size_t noPart;
+  size_t noPart = 0;
 
   Announce() : BroadcastPackage(10) {}
 

package/src/painlessmesh/plugin.hpp

@@ -39,10 +39,13 @@ namespace plugin {
 
 class SinglePackage : public protocol::PackageInterface {
  public:
-  uint32_t from;
-  uint32_t dest;
-  router::Type routing;
-  int type;
+  // `from` and `dest` are the application's to fill; a package built by
+  // the type constructor and sent before they are set addresses node 0,
+  // not whatever the stack held.
+  uint32_t from = 0;
+  uint32_t dest = 0;
+  router::Type routing = router::SINGLE;
+  int type = 0;
   int noJsonFields = 4;
 
   SinglePackage(int type) : routing(router::SINGLE), type(type) {}
@@ -65,9 +68,9 @@ class SinglePackage : public protocol::PackageInterface {
 
 class BroadcastPackage : public protocol::PackageInterface {
  public:
-  uint32_t from;
-  router::Type routing;
-  int type;
+  uint32_t from = 0;
+  router::Type routing = router::BROADCAST;
+  int type = 0;
   int noJsonFields = 3;
 
   BroadcastPackage(int type) : routing(router::BROADCAST), type(type) {}

package/src/painlessmesh/protocol.hpp

@@ -75,6 +75,10 @@ constexpr uint8_t PRIORITY_LOW = 3;
 
 class PackageInterface {
  public:
+  // A base with virtual functions destroyed through a derived pointer needs
+  // this, and a package held in a shared_ptr is exactly that case (#469);
+  // clang refuses the build without it under -Werror.
+  virtual ~PackageInterface() = default;
   virtual JsonObject addTo(JsonObject&& jsonObj) const = 0;
 #if ARDUINOJSON_VERSION_MAJOR < 7
   virtual size_t jsonObjectSize() const = 0;
@@ -89,8 +93,8 @@ class PackageInterface {
 class Single : public PackageInterface {
  public:
   int type = SINGLE;
-  uint32_t from;
-  uint32_t dest;
+  uint32_t from = 0;
+  uint32_t dest = 0;
   TSTRING msg = "";
   // Non-zero when the sender requested a delivery acknowledgment. Only
   // serialized when set, so plain sends carry zero overhead.
@@ -273,8 +277,8 @@ class NodeTree : public PackageInterface {
 class NodeSyncRequest : public NodeTree {
  public:
   int type = NODE_SYNC_REQUEST;
-  uint32_t from;
-  uint32_t dest;
+  uint32_t from = 0;
+  uint32_t dest = 0;
 
   NodeSyncRequest() {}
   NodeSyncRequest(uint32_t fromID, uint32_t destID, std::list<NodeTree> subTree,
@@ -351,8 +355,8 @@ struct time_sync_msg_t {
 class TimeSync : public PackageInterface {
  public:
   int type = TIME_SYNC;
-  uint32_t dest;
-  uint32_t from;
+  uint32_t dest = 0;
+  uint32_t from = 0;
   time_sync_msg_t msg;
 
   TimeSync() {}

package/src/painlessmesh/rtc.hpp

@@ -192,9 +192,9 @@ class RTCManager {
   }
   
  private:
-  RTCInterface* rtcInterface;
-  bool rtcEnabled;
-  uint32_t lastSyncTime;
+  RTCInterface* rtcInterface = nullptr;
+  bool rtcEnabled = false;
+  uint32_t lastSyncTime = 0;
 };
 
 }  // namespace rtc

package/src/plugin/performance.hpp

@@ -53,10 +53,10 @@ class Stats {
 
 class PerformancePackage : public plugin::BroadcastPackage {
  public:
-  int id = 0;      // Can see if we missed values
-  int time;        // Get an idea of the delay, by comparing it with nodetime
-  int stability;   // stability of the sending node
-  int freeMemory;  // memory of the sending node
+  int id = 0;          // Can see if we missed values
+  int time = 0;        // Get an idea of the delay, by comparing it with nodetime
+  int stability = 0;   // stability of the sending node
+  int freeMemory = 0;  // memory of the sending node
 #ifdef ESP32
   TSTRING hardware = "ESP32";
 #else
@@ -93,7 +93,7 @@ class PerformancePackage : public plugin::BroadcastPackage {
 /// Numbers to track for each node we receive PerformancePackages from
 class Track {
  public:
-  uint32_t nodeId;
+  uint32_t nodeId = 0;
   TSTRING hardware;
   uint32_t hits = 0;
   uint32_t misses = 0;