diff --git a/M17Control.cpp b/M17Control.cpp index 5bca746d..070f5ba1 100644 --- a/M17Control.cpp +++ b/M17Control.cpp @@ -539,13 +539,10 @@ void CM17Control::writeNetwork() if (!exists) return; - if (!m_enabled) { - LogMessage("M17 not enabled"); + if (!m_enabled) return; - } if (m_rfState != RS_RF_LISTENING && m_rfState != RS_RF_LATE_ENTRY && m_netState == RS_NET_IDLE) { - LogMessage("M17 status is incorrect %d,%d", m_rfState, m_netState); m_network->reset(); return; } @@ -558,7 +555,6 @@ void CM17Control::writeNetwork() unsigned char type = lsf.getEncryptionType(); if (type != M17_ENCRYPTION_TYPE_NONE) { - LogMessage("M17 encryption rejection"); m_network->reset(); return; } @@ -623,8 +619,6 @@ void CM17Control::writeNetwork() decorrelator(temp, start + 2U); writeQueueNet(start); - } else { - LogMessage("M17 in an odd state 1 %d", m_netState); } if (m_netState == RS_NET_AUDIO || m_netState == RS_NET_DATA_AUDIO) { @@ -737,8 +731,6 @@ void CM17Control::writeNetwork() writeEndNet(); } - } else { - LogMessage("M17 in an odd state 2 %d", m_netState); } } diff --git a/M17Network.cpp b/M17Network.cpp index ed36ec7d..268f069e 100644 --- a/M17Network.cpp +++ b/M17Network.cpp @@ -133,10 +133,8 @@ void CM17Network::clock(unsigned int ms) if (m_debug) CUtils::dump(1U, "M17 Network Received", buffer, length); - if (!m_enabled) { - LogMessage("M17 Network not enabled"); + if (!m_enabled) return; - } if (::memcmp(buffer + 0U, "PING", 4U) == 0) return; @@ -150,10 +148,8 @@ void CM17Network::clock(unsigned int ms) if (m_inId == 0U) { m_inId = id; } else { - if (id != m_inId) { - LogMessage("M17 Network id rejection"); + if (id != m_inId) return; - } } unsigned char c = length - 6U;