From 293962a7f7dfb83c361a78eac9a2fa7b9432eede Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Thu, 19 Aug 2021 20:50:31 +0100
Subject: [PATCH] Filter the EOF marker out of the FN for retransmission.

---
 M17Control.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/M17Control.cpp b/M17Control.cpp
index afef9e6..3c3337f 100644
--- a/M17Control.cpp
+++ b/M17Control.cpp
@@ -556,7 +556,12 @@ void CM17Control::writeNetwork()
 
 		// Add the FN and the data/audio
 		unsigned char payload[M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES];
-		::memcpy(payload, netData + 28U, M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES);
+
+		// Copy the FN minus the EOF marker
+		payload[0U] = netData[28U] & 0x7FU;
+		payload[1U] = netData[29U];
+
+		::memcpy(payload + 2U, netData + 30U, M17_PAYLOAD_LENGTH_BYTES);
 
 		// Add the Convolution FEC
 		CM17Convolution conv;