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

Reduce logging of bad access attempts on D-Star.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-04-18 19:15:49 +01:00
parent 79f7048f27
commit b5a7ed83bf
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
DStarControl.cpp
View File

@@ -127,10 +127,15 @@ bool CDStarControl::writeModem(unsigned char *data)
CDStarHeader header(data + 1U); CDStarHeader header(data + 1U);
// Is this a transmission destined for a repeater? // Is this a transmission destined for a repeater?
if (!header.isRepeater()) { if (!header.isRepeater())
LogMessage("D-Star, non repeater RF header received"); return false;
unsigned char callsign[DSTAR_LONG_CALLSIGN_LENGTH];
header.getRPTCall1(callsign);
// Is it for us?
if (::memcmp(callsign, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH) != 0)
return false; return false;
}
unsigned char my1[DSTAR_LONG_CALLSIGN_LENGTH]; unsigned char my1[DSTAR_LONG_CALLSIGN_LENGTH];
header.getMyCall1(my1); header.getMyCall1(my1);
@@ -145,15 +150,6 @@ bool CDStarControl::writeModem(unsigned char *data)
return false; return false;
} }
unsigned char callsign[DSTAR_LONG_CALLSIGN_LENGTH];
header.getRPTCall1(callsign);
// Is it for us?
if (::memcmp(callsign, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH) != 0) {
LogMessage("D-Star, received RF header for wrong repeater - %8.8s", callsign);
return false;
}
unsigned char gateway[DSTAR_LONG_CALLSIGN_LENGTH]; unsigned char gateway[DSTAR_LONG_CALLSIGN_LENGTH];
header.getRPTCall2(gateway); header.getRPTCall2(gateway);
@@ -270,7 +266,15 @@ bool CDStarControl::writeModem(unsigned char *data)
// Is this a transmission destined for a repeater? // Is this a transmission destined for a repeater?
if (!header->isRepeater()) { if (!header->isRepeater()) {
LogMessage("D-Star, non repeater RF header received"); delete header;
return false;
}
unsigned char callsign[DSTAR_LONG_CALLSIGN_LENGTH];
header->getRPTCall1(callsign);
// Is it for us?
if (::memcmp(callsign, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH) != 0) {
delete header; delete header;
return false; return false;
} }
@@ -290,16 +294,6 @@ bool CDStarControl::writeModem(unsigned char *data)
return false; return false;
} }
unsigned char callsign[DSTAR_LONG_CALLSIGN_LENGTH];
header->getRPTCall1(callsign);
// Is it for us?
if (::memcmp(callsign, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH) != 0) {
LogMessage("D-Star, received RF header for wrong repeater - %8.8s", callsign);
delete header;
return false;
}
unsigned char gateway[DSTAR_LONG_CALLSIGN_LENGTH]; unsigned char gateway[DSTAR_LONG_CALLSIGN_LENGTH];
header->getRPTCall2(gateway); header->getRPTCall2(gateway);