Merge branch 'master' into IPv6

YSFGateway/Version.h

@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200905";
+const char* VERSION = "20200908";
 
 #endif

YSFGateway/YSFNetwork.cpp

@@ -202,6 +202,13 @@ void CYSFNetwork::clock(unsigned int ms)
 	if (!CUDPSocket::match(addr, m_addr))
 		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());
@@ -214,9 +221,6 @@ void CYSFNetwork::clock(unsigned int ms)
 			m_socket.write(m_options, 50U, m_addr, m_addrLen);
 	}
 
-	if (m_debug)
-		CUtils::dump(1U, "YSF Network Data Received", buffer, length);
-
 	unsigned char len = length;
 	m_buffer.addData(&len, 1U);