From e04633bfd5de00a976c861e71df317778fcfe27c Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Sun, 12 Dec 2021 06:04:57 -0700
Subject: [PATCH] trivial changes

---
 radmin                    | 22 ++++++++++++----------
 reflector/M17Protocol.cpp | 11 +++++++----
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/radmin b/radmin
index 6157c0d..9b0fc14 100755
--- a/radmin
+++ b/radmin
@@ -27,7 +27,7 @@ UninstallReflector () {
 		sudo make uninstall
 		popd
 	fi
-	if [ -e $tcserv ]; then
+	if [ -e $tcdserv ]; then
 		pushd ../tcd
 		sudo make uninstall
 		popd
@@ -83,7 +83,7 @@ Compile () {
 
 # service file locations
 urfserv='/etc/systemd/system/urfd.service'
-tcserv='/etc/systemd/system/ambed.service'
+tcdserv='/etc/systemd/system/ambed.service'
 
 # default values, we only need a few
 tcaddress='none'
@@ -120,12 +120,12 @@ do
 		if [ -e $urfserv ]; then
 			echo "us : Uninstall the XLX reflector"
 			echo "rl : Reflector log"
-			if [ -e $tcserv ]; then
+			if [ -e $tcdserv ]; then
 				echo "tl : Transcoder log"
 			fi
 		fi
 		echo "rr : Reflector restart"
-		if [ -e $tcserv ]; then
+		if [ -e $tcdserv ]; then
 			echo "tr : Transcoder restart"
 		fi
 	else
@@ -173,18 +173,20 @@ do
 		git checkout "$value"
 		echo
 		read -p "<Enter> to continue: " ans
+		pushd ../tcd
+		git checkout "$value"
+		echo
+		read -p "<Enter> to continue: " ans
+		popd
 	elif [[ "$key" == rr* ]]; then
 		if   [ -e $urfserv ]; then
 			sudo systemctl restart urfd
 		fi
-	elif [[ "$key" == tr* ]] && [ -e $tcserv ]; then sudo systemctl restart tcd
+	elif [[ "$key" == tr* ]] && [ -e $tcdserv ]; then sudo systemctl restart tcd
 	elif [[ "$key" == cl* ]]; then Clean
 	elif [[ "$key" == co* ]]; then Compile
-	elif [[ "$key" == tl* ]] && [ -e $tcserv ]; then sudo journalctl -u tcd -f
-	elif [[ "$key" == rl* ]]; then
-		if [ -e $urfserv ]; then
-			sudo journalctl -u urfd -f
-		fi
+	elif [[ "$key" == tl* ]] && [ -e $tcdserv ]; then sudo journalctl -u tcd -f
+	elif [[ "$key" == rl* ]] && [ -e $urfserv ]; then sudo journalctl -u urfd -f
 	fi
 done
 exit 0
diff --git a/reflector/M17Protocol.cpp b/reflector/M17Protocol.cpp
index 7c31bee..7f3d97f 100644
--- a/reflector/M17Protocol.cpp
+++ b/reflector/M17Protocol.cpp
@@ -243,11 +243,11 @@ void CM17Protocol::HandleQueue(void)
 			memcpy(frame.magic, "M17 ", 4);
 			if ( packet->IsLastPacket() )
 			{
-				EncodeLastM17Packet(frame, m_StreamsCache[module].m_dvHeader, (const CDvFramePacket &)*packet.get(), m_StreamsCache[module].m_iSeqCounter++);
+				EncodeLastM17Packet(frame, m_StreamsCache[module].m_dvHeader, (CDvFramePacket &)*packet.get(), m_StreamsCache[module].m_iSeqCounter++);
 			}
 			else if ( packet->IsDvFrame() )
 			{
-				EncodeM17Packet(frame, m_StreamsCache[module].m_dvHeader, (const CDvFramePacket &)*packet.get(), m_StreamsCache[module].m_iSeqCounter++);
+				EncodeM17Packet(frame, m_StreamsCache[module].m_dvHeader, (CDvFramePacket &)*packet.get(), m_StreamsCache[module].m_iSeqCounter++);
 			}
 
 			// push it to all our clients linked to the module and who are not streaming in
@@ -357,8 +357,11 @@ bool CM17Protocol::IsValidDvPacket(const CBuffer &Buffer, std::unique_ptr<CDvHea
 	uint8_t tag[] = { 'M', '1', '7', ' ' };
 
 	if ( (Buffer.size() == sizeof(SM17Frame)) && (0 == Buffer.Compare(tag, sizeof(tag))) && (0x4U == (0x1CU & Buffer[19])) )
-	// Buffer[19] is the lsb byte of the frametype. 0x4 means payload contains Codec2 voice data and there is no encryption.
-	// the 0x1CU mask just lets us see the encryptions bytes (must be zero) and the msb of the payload type (must be set)
+	// Buffer[19] is the low-order byte of the uint16_t frametype.
+	// the 0x1CU mask (00011100 binary) just lets us see:
+	// 1. the encryptions bytes (mask 0x18U) which must be zero, and
+	// 2. the msb of the 2-bit payload type (mask 0x4U) which must be set. This bit set means it's voice or voice+data.
+	// An masked result of 0x4U means the payload contains Codec2 voice data and there is no encryption.
 	{
 		// Make the M17 header
 		CM17Packet m17(Buffer.data());