fix issue with potentional concurrency crash when updating lookup tab…

…les in PEER_LINK;
DVMProject · Jan 17, 2025 · 3b395a9 · 3b395a9
1 parent a82f848
commit 3b395a9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/common/Thread.cpp b/src/common/Thread.cpp
@@ -63,6 +63,8 @@ bool Thread::run()
 
 void Thread::wait()
 {
+    if (!m_started)
+        return;
 #if defined(_WIN32)
     ::WaitForSingleObject(m_thread, INFINITE);
     ::CloseHandle(m_thread);

diff --git a/src/common/lookups/LookupTable.h b/src/common/lookups/LookupTable.h
@@ -178,6 +178,12 @@ namespace lookups
          */
         void filename(std::string filename) { m_filename = filename; };
 
+        /**
+         * @brief Helper to set the reload time of this lookup table.
+         * @param reloadTime Lookup time in seconds.
+         */
+        void setReloadTime(uint32_t reloadTime) { m_reloadTime = 0U; }
+
     protected:
         std::string m_filename;
         uint32_t m_reloadTime;

diff --git a/src/common/lookups/TalkgroupRulesLookup.h b/src/common/lookups/TalkgroupRulesLookup.h
@@ -599,6 +599,12 @@ namespace lookups
          */
         void filename(std::string filename) { m_rulesFile = filename; };
 
+        /**
+         * @brief Helper to set the reload time of this lookup table.
+         * @param reloadTime Lookup time in seconds.
+         */
+        void setReloadTime(uint32_t reloadTime) { m_reloadTime = 0U; }
+
     private:
         std::string m_rulesFile;
         uint32_t m_reloadTime;

diff --git a/src/fne/network/PeerNetwork.cpp b/src/fne/network/PeerNetwork.cpp
@@ -222,6 +222,7 @@ void PeerNetwork::userPacketHandler(uint32_t peerId, FrameQueue::OpcodePair opco
                             file.close();
 
                             m_tidLookup->stop(true);
+                            m_tidLookup->setReloadTime(0U);
                             m_tidLookup->filename(filename);
                             m_tidLookup->reload();
 
@@ -359,6 +360,7 @@ void PeerNetwork::userPacketHandler(uint32_t peerId, FrameQueue::OpcodePair opco
                             file.close();
 
                             m_ridLookup->stop(true);
+                            m_ridLookup->setReloadTime(0U);
                             m_ridLookup->filename(filename);
                             m_ridLookup->reload();
 
@@ -496,6 +498,7 @@ void PeerNetwork::userPacketHandler(uint32_t peerId, FrameQueue::OpcodePair opco
                             file.close();
 
                             m_pidLookup->stop(true);
+                            m_pidLookup->setReloadTime(0U);
                             m_pidLookup->filename(filename);
                             m_pidLookup->reload();