From 494dd789d177308b801a05921de82dffd434559c Mon Sep 17 00:00:00 2001 From: Tom Early Date: Tue, 30 Jul 2024 13:36:28 -0700 Subject: [PATCH] Fix destination CS for WPSD --- reflector/DVHeaderPacket.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/reflector/DVHeaderPacket.cpp b/reflector/DVHeaderPacket.cpp index 3272afc..057cf78 100644 --- a/reflector/DVHeaderPacket.cpp +++ b/reflector/DVHeaderPacket.cpp @@ -150,7 +150,17 @@ CDvHeaderPacket::CDvHeaderPacket(const CM17Packet &m17) : CPacket(m17) m_uiCrc = 0; m_csUR = CCallsign("CQCQCQ"); m_csMY = m17.GetSourceCallsign(); - m_csRPT1 = m_csRPT2 = m17.GetDestCallsign(); + auto str = m17.GetDestCallsign().GetCS(); + if (0 == str.compare(0, 4, "URF-")) + { + // take care of WPSD M17Host file format + str.erase(str.begin()+3); + m_csRPT1 = m_csRPT2 = CCallsign(str); + } + else + { + m_csRPT1 = m_csRPT2 = m17.GetDestCallsign(); + } m_csRPT1.SetCSModule('G'); }