From c4147ecc5b731a1077aecc680089e558f5b159de Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Sat, 6 Jul 2024 22:54:40 -0400
Subject: [PATCH] ensure exSAP is reset properly;

---
 src/common/p25/data/DataHeader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common/p25/data/DataHeader.cpp b/src/common/p25/data/DataHeader.cpp
index 198955f4..3c06b728 100644
--- a/src/common/p25/data/DataHeader.cpp
+++ b/src/common/p25/data/DataHeader.cpp
@@ -42,7 +42,7 @@ DataHeader::DataHeader() :
     m_ackNeeded(false),
     m_outbound(false),
     m_fmt(PDUFormatType::CONFIRMED),
-    m_sap(0U),
+    m_sap(PDUSAP::USER_DATA),
     m_mfId(MFG_STANDARD),
     m_llId(0U),
     m_blocksToFollow(0U),
@@ -53,6 +53,7 @@ DataHeader::DataHeader() :
     m_Ns(0U),
     m_lastFragment(true),
     m_headerOffset(0U),
+    m_exSap(PDUSAP::USER_DATA),
     m_srcLlId(0U),
     m_rspClass(PDUAckClass::NACK),
     m_rspType(PDUAckType::NACK_ILLEGAL),
@@ -399,7 +400,9 @@ void DataHeader::reset()
 
     m_headerOffset = 0U;
 
+    m_exSap = PDUSAP::USER_DATA;
     m_srcLlId = 0U;
+
     m_rspClass = PDUAckClass::NACK;
     m_rspType = PDUAckType::NACK_ILLEGAL;
     m_rspStatus = 0U;