From 72ac3a7f8e32de7441a009f78a63792792212ed2 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 8 Sep 2020 09:59:39 +0100 Subject: [PATCH] Ignore incoming YSFO messages in the YSF Gateway. --- YSFGateway/Version.h | 2 +- YSFGateway/YSFNetwork.cpp | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/YSFGateway/Version.h b/YSFGateway/Version.h index 8fabccf..3102ae7 100644 --- a/YSFGateway/Version.h +++ b/YSFGateway/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20200803"; +const char* VERSION = "20200908"; #endif diff --git a/YSFGateway/YSFNetwork.cpp b/YSFGateway/YSFNetwork.cpp index 0e54e8d..4f2cc4d 100644 --- a/YSFGateway/YSFNetwork.cpp +++ b/YSFGateway/YSFNetwork.cpp @@ -197,6 +197,13 @@ void CYSFNetwork::clock(unsigned int ms) if (address.s_addr != m_address.s_addr || port != m_port) return; + if (m_debug) + CUtils::dump(1U, "YSF Network Data Received", buffer, length); + + // Throw away any options messages + if (::memcmp(buffer, "YSFO", 4U) == 0) + return; + if (::memcmp(buffer, "YSFP", 4U) == 0 && !m_linked) { if (strcmp(m_name.c_str(),"MMDVM")== 0) LogMessage("Link successful to %s", m_name.c_str()); @@ -209,9 +216,6 @@ void CYSFNetwork::clock(unsigned int ms) m_socket.write(m_options, 50U, m_address, m_port); } - if (m_debug) - CUtils::dump(1U, "YSF Network Data Received", buffer, length); - unsigned char len = length; m_buffer.addData(&len, 1U);