From 64db730870d8d97c9a5cf35ab09cb0c123f625d0 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Fri, 23 Feb 2018 08:06:54 +0000
Subject: [PATCH] Blank out the DTMF tones.

---
 YSFGateway/DTMF.cpp       | 10 ++++++++--
 YSFGateway/DTMF.h         |  6 +++---
 YSFGateway/YSFGateway.cpp |  2 +-
 YSFGateway/YSFGateway.h   |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/YSFGateway/DTMF.cpp b/YSFGateway/DTMF.cpp
index de30b72..35b95f7 100644
--- a/YSFGateway/DTMF.cpp
+++ b/YSFGateway/DTMF.cpp
@@ -42,6 +42,8 @@ const unsigned char DTMF_VD2_SYMD[] = { 0x11U, 0x10U, 0x20U, 0x20U, 0x11U, 0x01U
 const unsigned char DTMF_VD2_SYMS[] = { 0x00U, 0x23U, 0x02U, 0x02U, 0x11U, 0x10U, 0x10U, 0x01U, 0x22U, 0x62U, 0x04U };
 const unsigned char DTMF_VD2_SYMH[] = { 0x00U, 0x22U, 0x00U, 0x20U, 0x11U, 0x11U, 0x10U, 0x00U, 0x22U, 0x62U, 0x04U };
 
+const unsigned char VD2_SILENCE[] = { 0x7BU, 0xB2U, 0x8EU, 0x43U, 0x36U, 0xE4U, 0xA2U, 0x39U, 0x78U, 0x49U, 0x33U, 0x68U, 0x33U };
+
 CDTMF::CDTMF() :
 m_data(),
 m_command(),
@@ -56,7 +58,7 @@ CDTMF::~CDTMF()
 {
 }
 
-WX_STATUS CDTMF::decodeVDMode2(const unsigned char* payload, bool end)
+WX_STATUS CDTMF::decodeVDMode2(unsigned char* payload, bool end)
 {
 	assert(payload != NULL);
 
@@ -71,7 +73,7 @@ WX_STATUS CDTMF::decodeVDMode2(const unsigned char* payload, bool end)
 	return WXS_NONE;
 }
 
-WX_STATUS CDTMF::decodeVDMode2Slice(const unsigned char* ambe, bool end)
+WX_STATUS CDTMF::decodeVDMode2Slice(unsigned char* ambe, bool end)
 {
 	// DTMF begins with these byte values
 	if (!end && (ambe[0] & DTMF_VD2_MASK[0]) == DTMF_VD2_SIG[0] && (ambe[1] & DTMF_VD2_MASK[1]) == DTMF_VD2_SIG[1] &&
@@ -127,6 +129,10 @@ WX_STATUS CDTMF::decodeVDMode2Slice(const unsigned char* ambe, bool end)
 		else if (sym0 == DTMF_VD2_SYMH[0] && sym1 == DTMF_VD2_SYMH[1] && sym2 == DTMF_VD2_SYMH[2] && sym3 == DTMF_VD2_SYMH[3] && sym4 == DTMF_VD2_SYMH[4] && sym5 == DTMF_VD2_SYMH[5] && sym6 == DTMF_VD2_SYMH[6] && sym7 == DTMF_VD2_SYMH[7] && sym8 == DTMF_VD2_SYMH[8] && sym9 == DTMF_VD2_SYMH[9] && sym10 == DTMF_VD2_SYMH[10])
 			c = '#';
 
+		// Blank out the DTMF tones.
+		if (c != ' ')
+			::memcpy(ambe, VD2_SILENCE, 13U);
+
 		if (c == m_lastChar) {
 			m_pressCount++;
 		} else {
diff --git a/YSFGateway/DTMF.h b/YSFGateway/DTMF.h
index f73dfb9..8410505 100644
--- a/YSFGateway/DTMF.h
+++ b/YSFGateway/DTMF.h
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2012,2013,2017 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2012,2013,2017,2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ public:
 	CDTMF();
 	~CDTMF();
 
-	WX_STATUS decodeVDMode2(const unsigned char* payload, bool end);
+	WX_STATUS decodeVDMode2(unsigned char* payload, bool end);
 
 	std::string getReflector();
 
@@ -42,7 +42,7 @@ private:
 	unsigned int m_pressCount;
 	char         m_lastChar;
 
-	WX_STATUS decodeVDMode2Slice(const unsigned char* ambe, bool end);
+	WX_STATUS decodeVDMode2Slice(unsigned char* ambe, bool end);
 	WX_STATUS validate() const;
 };
 
diff --git a/YSFGateway/YSFGateway.cpp b/YSFGateway/YSFGateway.cpp
index 61cabb4..25b2adc 100644
--- a/YSFGateway/YSFGateway.cpp
+++ b/YSFGateway/YSFGateway.cpp
@@ -523,7 +523,7 @@ void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, u
 	}
 }
 
-void CYSFGateway::processDTMF(const unsigned char* buffer, unsigned char dt)
+void CYSFGateway::processDTMF(unsigned char* buffer, unsigned char dt)
 {
 	assert(buffer != NULL);
 
diff --git a/YSFGateway/YSFGateway.h b/YSFGateway/YSFGateway.h
index 7b05afb..d401565 100644
--- a/YSFGateway/YSFGateway.h
+++ b/YSFGateway/YSFGateway.h
@@ -62,7 +62,7 @@ private:
 	void startupLinking();
 	std::string calculateLocator();
 	void processWiresX(const unsigned char* buffer, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft);
-	void processDTMF(const unsigned char* buffer, unsigned char dt);
+	void processDTMF(unsigned char* buffer, unsigned char dt);
 	void createWiresX(CYSFNetwork* rptNetwork);
 	void createGPS();
 };