From 0b041698c6026a4ca75018016dfec287e2134dc0 Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Mon, 31 Oct 2022 21:06:12 -0400
Subject: [PATCH] add support back to set the MFId for some transmitted P25
 packets;

---
 network/RemoteControl.cpp | 2 ++
 p25/packet/Trunk.h        | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/network/RemoteControl.cpp b/network/RemoteControl.cpp
index 7e447889..48875ad0 100644
--- a/network/RemoteControl.cpp
+++ b/network/RemoteControl.cpp
@@ -483,6 +483,8 @@ void RemoteControl::process(Host* host, dmr::Control* dmr, p25::Control* p25, nx
                         LogMessage(LOG_RCON, "Remote P25, mfgId reset, mfgId = $%02X", mfId);
                         m_p25MFId = p25::P25_MFG_STANDARD;
                     }
+
+                    p25->trunk()->setLastMFId(m_p25MFId);
                 }
                 else {
                     reply = CMD_FAILED_STR "P25 mode is not enabled!";
diff --git a/p25/packet/Trunk.h b/p25/packet/Trunk.h
index 46213907..d939bbda 100644
--- a/p25/packet/Trunk.h
+++ b/p25/packet/Trunk.h
@@ -93,6 +93,9 @@ namespace p25
             /// <summary>Helper to change the conventional fallback state.</summary>
             void setConvFallback(bool fallback);
 
+            /// <summary>Helper to change the last MFId value.</summary>
+            void setLastMFId(uint8_t mfId) { m_lastMFID = mfId; }
+
             /// <summary>Flag indicating whether P25 TSBK verbosity is enabled or not.</summary>
             bool getTSBKVerbose() const { return m_dumpTSBK; };
             /// <summary>Helper to change the TSBK verbose state.</summary>