MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 15:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add even more debugging.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-12-06 14:06:48 +00:00
parent 08ccf148ad
commit 333757829f
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
M17Control.cpp
View File

@@ -539,10 +539,13 @@ void CM17Control::writeNetwork()
if (!exists) if (!exists)
return; return;
if (!m_enabled) if (!m_enabled) {
LogMessage("M17 not enabled");
return; return;
}
if (m_rfState != RS_RF_LISTENING && m_rfState != RS_RF_LATE_ENTRY && m_netState == RS_NET_IDLE) { 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(); m_network->reset();
return; return;
} }
@@ -552,6 +555,7 @@ void CM17Control::writeNetwork()
if (!m_allowEncryption) { if (!m_allowEncryption) {
unsigned char type = m_netLSF.getEncryptionType(); unsigned char type = m_netLSF.getEncryptionType();
if (type != M17_ENCRYPTION_TYPE_NONE) { if (type != M17_ENCRYPTION_TYPE_NONE) {
LogMessage("M17 encryption rejection");
m_network->reset(); m_network->reset();
return; return;
} }
@@ -616,6 +620,8 @@ void CM17Control::writeNetwork()
decorrelator(temp, start + 2U); decorrelator(temp, start + 2U);
writeQueueNet(start); 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) { if (m_netState == RS_NET_AUDIO || m_netState == RS_NET_DATA_AUDIO) {
@@ -728,6 +734,8 @@ void CM17Control::writeNetwork()
writeEndNet(); writeEndNet();
} }
} else {
LogMessage("M17 in an odd state 2 %d", m_netState);
} }
} }

14
M17Network.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2020,2021 by Jonathan Naylor G4KLX * Copyright (C) 2020,2021,2023 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -133,8 +133,10 @@ void CM17Network::clock(unsigned int ms)
if (m_debug) if (m_debug)
CUtils::dump(1U, "M17 Network Received", buffer, length); CUtils::dump(1U, "M17 Network Received", buffer, length);
if (!m_enabled) if (!m_enabled) {
LogMessage("M17 Network not enabled");
return; return;
}
if (::memcmp(buffer + 0U, "PING", 4U) == 0) if (::memcmp(buffer + 0U, "PING", 4U) == 0)
return; return;
@@ -148,8 +150,10 @@ void CM17Network::clock(unsigned int ms)
if (m_inId == 0U) { if (m_inId == 0U) {
m_inId = id; m_inId = id;
} else { } else {
if (id != m_inId) if (id != m_inId) {
LogMessage("M17 Network id rejection");
return; return;
}
} }
unsigned char c = length - 6U; unsigned char c = length - 6U;
@@ -188,7 +192,9 @@ void CM17Network::reset()
void CM17Network::enable(bool enabled) void CM17Network::enable(bool enabled)
{ {
if (!enabled && m_enabled) if (enabled && !m_enabled)
reset();
else if (!enabled && m_enabled)
m_buffer.clear(); m_buffer.clear();
m_enabled = enabled; m_enabled = enabled;

2
Version.h
View File

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