fix idiotic bug where the activity log path wasn't being properly used; add potential fix for "tail riding" conditions with network traffic, that could cause the RF talkgroup hangtimer to be active when it shouldn't be;

src/fne/ActivityLog.cpp

@@ -4,7 +4,7 @@
  * GPLv2 Open Source. Use is subject to license terms.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  Copyright (C) 2024 Bryan Biedenkapp, N2PLL
+ *  Copyright (C) 2024-2025 Bryan Biedenkapp, N2PLL
  *
  */
 #include "ActivityLog.h"
@@ -64,7 +64,7 @@ static bool ActivityLogOpen()
     }
 
     char filename[200U];
-    ::sprintf(filename, "%s/%s-%04d-%02d-%02d.activity.log", LogGetFilePath().c_str(), LogGetFileRoot().c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
+    ::sprintf(filename, "%s/%s-%04d-%02d-%02d.activity.log", m_actFilePath.c_str(), m_actFileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
 
     m_actFpLog = ::fopen(filename, "a+t");
     m_actTm = *tm;

src/host/ActivityLog.cpp

@@ -7,7 +7,7 @@
 * @package DVM / Modem Host Software
 * @license GPLv2 License (https://opensource.org/licenses/GPL-2.0)
 *
-*  Copyright (C) 2024 Bryan Biedenkapp, N2PLL
+*  Copyright (C) 2024-2025 Bryan Biedenkapp, N2PLL
 *
 */
 #include "ActivityLog.h"
@@ -76,7 +76,7 @@ static bool ActivityLogOpen()
     }
 
     char filename[200U];
-    ::sprintf(filename, "%s/%s-%04d-%02d-%02d.activity.log", LogGetFilePath().c_str(), LogGetFileRoot().c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
+    ::sprintf(filename, "%s/%s-%04d-%02d-%02d.activity.log", m_actFilePath.c_str(), m_actFileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
 
     m_actFpLog = ::fopen(filename, "a+t");
     m_actTm = *tm;

src/host/p25/packet/Voice.cpp

@@ -1144,6 +1144,12 @@ bool Voice::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L
         }
     }
 
+    // bryanb: possible fix for a "tail ride" condition where network traffic immediately follows RF traffic *while*
+    // the RF TG hangtimer is running
+    if (m_p25->m_rfTGHang.isRunning() && !m_p25->m_rfTGHang.hasExpired()) {
+        m_p25->m_rfTGHang.stop();
+    }
+
     // perform authoritative network TG hangtimer and traffic preemption
     if (m_p25->m_authoritative) {
         // don't process network frames if the destination ID's don't match and the network TG hang timer is running