code cleanup;

src/bridge/HostBridge.cpp

@@ -658,8 +658,7 @@ int HostBridge::run()
         //  -- Network Clocking                               --
         // ------------------------------------------------------
 
-        if (m_network != nullptr)
+        if (m_network != nullptr) {
-        {
             std::lock_guard<std::mutex> lock(HostBridge::m_networkMutex);
             m_network->clock(ms);
         }
@@ -2434,11 +2433,12 @@ void HostBridge::encodeP25AudioFrame(uint8_t* pcm, uint32_t forcedSrcId, uint32_
 
 /* Helper to send USRP end of transmission */
 
-void HostBridge::sendUsrpEot() {
+void HostBridge::sendUsrpEot() 
+{
     sockaddr_storage addr;
     uint32_t addrLen;
 
-    uint8_t* usrpHeader = new uint8_t[USRP_HEADER_LENGTH];
+    uint8_t usrpHeader[USRP_HEADER_LENGTH];
 
     m_usrpSeqNo = 0U;
     ::memcpy(usrpHeader, "USRP", 4);
@@ -2621,18 +2621,12 @@ void* HostBridge::threadAudioProcess(void* arg)
         ::pthread_setname_np(th->thread, threadName.c_str());
 #endif // _GNU_SOURCE
 
-        StopWatch stopWatch;
-        stopWatch.start();
-
         while (!g_killed) {
             if (!bridge->m_running) {
                 Thread::sleep(1U);
                 continue;
             }
 
-            uint32_t ms = stopWatch.elapsed();
-            stopWatch.start();
-
             // scope is intentional
             {
                 std::lock_guard<std::mutex> lock(m_audioMutex);
@@ -2779,18 +2773,12 @@ void* HostBridge::threadNetworkProcess(void* arg)
         ::pthread_setname_np(th->thread, threadName.c_str());
 #endif // _GNU_SOURCE
 
-        StopWatch stopWatch;
-        stopWatch.start();
-
         while (!g_killed) {
             if (!bridge->m_running) {
                 Thread::sleep(1U);
                 continue;
             }
 
-            uint32_t ms = stopWatch.elapsed();
-            stopWatch.start();
-
             uint32_t length = 0U;
             bool netReadRet = false;
             if (bridge->m_txMode == TX_MODE_DMR) {

src/common/lookups/LookupTable.h

@@ -182,7 +182,7 @@ namespace lookups
          * @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; }
+        void setReloadTime(uint32_t reloadTime) { m_reloadTime = reloadTime; }
 
     protected:
         std::string m_filename;

src/common/lookups/TalkgroupRulesLookup.h

@@ -603,7 +603,7 @@ namespace lookups
          * @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; }
+        void setReloadTime(uint32_t reloadTime) { m_reloadTime = reloadTime; }
 
     private:
         std::string m_rulesFile;

src/common/network/udp/Socket.cpp

@@ -333,6 +333,7 @@ bool Socket::write(const uint8_t* buffer, uint32_t length, const sockaddr_storag
             cryptedLen += alignment;
 
             // reallocate buffer and copy
+            delete[] cryptoBuffer;
             cryptoBuffer = new uint8_t[cryptedLen];
             ::memset(cryptoBuffer, 0x00U, cryptedLen);
             ::memcpy(cryptoBuffer, buffer, length);

src/common/p25/SiteData.h

@@ -122,13 +122,13 @@ namespace p25
                 m_netId = dist(mt);
 
                 // netId clamping
-                netId = P25Utils::netId(netId);
+                m_netId = P25Utils::netId(netId);
 
                 dist = std::uniform_int_distribution<uint32_t>(0x01, 0xFFEU);
                 m_sysId = dist(mt);
 
                 // sysId clamping
-                sysId = P25Utils::sysId(sysId);
+                m_sysId = P25Utils::sysId(sysId);
             }
 
             m_rfssId = rfssId;

src/fne/HostFNE.cpp

@@ -281,18 +281,18 @@ int HostFNE::run()
     }
 
     if (m_tidLookup != nullptr) {
+        m_tidLookup->setReloadTime(0U); // no reload
         m_tidLookup->stop();
-        delete m_tidLookup;
     }
 
     if (m_ridLookup != nullptr) {
+        m_ridLookup->setReloadTime(0U); // no reload
         m_ridLookup->stop();
-        delete m_ridLookup;
     }
 
     if (m_peerListLookup != nullptr) {
+        m_peerListLookup->setReloadTime(0U); // no reload
         m_peerListLookup->stop();
-        delete m_peerListLookup;
     }
 #if !defined(_WIN32)
     if (m_tun != nullptr) {

src/host/Host.cpp

@@ -1666,12 +1666,12 @@ void Host::setState(uint8_t state)
                 }
 
                 if (m_tidLookup != nullptr) {
+                    m_tidLookup->setReloadTime(0U);
                     m_tidLookup->stop();
-                    //delete m_tidLookup;
                 }
                 if (m_ridLookup != nullptr) {
+                    m_tidLookup->setReloadTime(0U);
                     m_ridLookup->stop();
-                    //delete m_ridLookup;
                 }
             }
             else {

src/host/p25/Control.cpp

@@ -1317,7 +1317,7 @@ void Control::processNetwork()
         }
 
         if (!m_dedicatedControl)
-            ret = m_data->processNetwork(data.get(), frameLength, blockLength);
+            m_data->processNetwork(data.get(), frameLength, blockLength);
 
         return;
     }
@@ -1414,7 +1414,7 @@ void Control::processNetwork()
                 break;
             }
 
-            ret = m_voice->processNetwork(data.get(), frameLength, control, lsd, duid, frameType);
+            m_voice->processNetwork(data.get(), frameLength, control, lsd, duid, frameType);
             break;
 
         case DUID::TDU: