From 494dd789d177308b801a05921de82dffd434559c Mon Sep 17 00:00:00 2001
From: Tom Early <ham.n7tae@gmail.com>
Date: Tue, 30 Jul 2024 13:36:28 -0700
Subject: [PATCH 1/2] 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');
 }
 

From 60ccf326ec0e6218b27aed70556246db204b49a7 Mon Sep 17 00:00:00 2001
From: Tom Early <ham.n7tae@gmail.com>
Date: Wed, 31 Jul 2024 05:17:16 -0700
Subject: [PATCH 2/2] version bump for WPSD fix

---
 reflector/Main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reflector/Main.cpp b/reflector/Main.cpp
index 22cd1d4..8f8757b 100644
--- a/reflector/Main.cpp
+++ b/reflector/Main.cpp
@@ -28,7 +28,7 @@ SJsonKeys   g_Keys;
 CReflector  g_Reflector;
 CGateKeeper g_GateKeeper;
 CConfigure  g_Configure;
-CVersion    g_Version(3,1,2); // The major byte should only change if the interlink packet changes!
+CVersion    g_Version(3,1,3); // The major byte should only change if the interlink packet changes!
 CLookupDmr  g_LDid;
 CLookupNxdn g_LNid;
 CLookupYsf  g_LYtr;