Merge pull request #17819 from jakesmith/HPCC-30361-HeartBeatPacketHe…

…ader-serialization-bug HPCC-30361 watchdog SocketEndpoint serialization fix Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Sep 26, 2023 · da0298e · da0298e
2 parents 2b038c1 + 954a2a5
commit da0298e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/thorlcr/shared/thwatchdog.hpp b/thorlcr/shared/thwatchdog.hpp
@@ -30,11 +30,13 @@
 struct HeartBeatPacketHeader
 {
 public:
+    // NB: packetSize and progressSize are back-patched and must remain at fixed offsets from the start of this struct
     size32_t packetSize = 0;   // used as validity check must be first
-    SocketEndpoint sender;
-    unsigned tick = 0;         // sequence check
     size32_t progressSize = 0; // size of progress data (following performance data)
 
+    unsigned tick = 0;         // sequence check
+    SocketEndpoint sender;
+
 public:
     void serialize(MemoryBuffer & out) const
     {