oe7drt/YSFClients
1
0
Fork 0
mirror of https://github.com/oe7drt/YSFClients.git synced 2026-04-06 23:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bug fixes mostly,

Browse source
This commit is contained in:
Jonathan Naylor 2018-02-26 19:05:34 +00:00
parent 64db730870
commit c17ffdbb89
4 changed files with 46 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

27
YSFGateway/DTMF.cpp
View file

@ -167,30 +167,27 @@ WX_STATUS CDTMF::decodeVDMode2Slice(unsigned char* ambe, bool end)
WX_STATUS CDTMF::validate() const
{
size_t length = m_command.length();
if (length != 3U && length != 4U && length != 6U)
return WXS_NONE;
char first = m_command.at(0U);
if (first != '#' && first != 'A')
return WXS_NONE;
if (length == 3U) {
for (unsigned int i = 1U; i <= 3U; i++) {
if (m_command.at(1U) < '0' || m_command.at(1U) > '9')
if (length == 1U && first == '#') {
return WXS_DISCONNECT;
} else if (length == 3U && first == 'A') {
for (unsigned int i = 1U; i < 3U; i++) {
if (m_command.at(i) < '0' || m_command.at(i) > '9')
return WXS_NONE;
}
return WXS_CONNECT_FCS;
} else if (length == 4U) {
for (unsigned int i = 1U; i <= 4U; i++) {
if (m_command.at(1U) < '0' || m_command.at(1U) > '9')
} else if (length == 4U && first == 'A') {
for (unsigned int i = 1U; i < 4U; i++) {
if (m_command.at(i) < '0' || m_command.at(i) > '9')
return WXS_NONE;
}
return WXS_CONNECT_FCS;
} else {
for (unsigned int i = 1U; i <= 6U; i++) {
if (m_command.at(1U) < '0' || m_command.at(1U) > '9')
} else if (length == 6U && first == '#') {
for (unsigned int i = 1U; i < 6U; i++) {
if (m_command.at(i) < '0' || m_command.at(i) > '9')
return WXS_NONE;
}
@ -199,6 +196,8 @@ WX_STATUS CDTMF::validate() const
return WXS_CONNECT_YSF;
}
return WXS_NONE;
}
std::string CDTMF::getReflector()