Skip to content

Commit

Permalink
D-Star rejected transmissions are still valid RF for the host.
Browse files Browse the repository at this point in the history
  • Loading branch information
g4klx committed Jun 25, 2021
1 parent e344fc5 commit f9e953d
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions DStarControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
if (!header.isRepeater()) {
LogMessage("D-Star, non repeater RF header received from %8.8s", my1);
m_rfState = RS_RF_INVALID;
return false;
return true;
}

unsigned char callsign[DSTAR_LONG_CALLSIGN_LENGTH];
Expand All @@ -319,19 +319,19 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
if (::memcmp(callsign, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH) != 0) {
LogMessage("D-Star, received RF header for wrong repeater (%8.8s) from %8.8s", callsign, my1);
m_rfState = RS_RF_INVALID;
return false;
return true;
}

if (m_selfOnly && ::memcmp(my1, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH - 1U) != 0 && !(std::find_if(m_whiteList.begin(), m_whiteList.end(), std::bind(CallsignCompare, std::placeholders::_1, my1)) != m_whiteList.end())) {
LogMessage("D-Star, invalid access attempt from %8.8s", my1);
m_rfState = RS_RF_REJECTED;
return false;
return true;
}

if (!m_selfOnly && std::find_if(m_blackList.begin(), m_blackList.end(), std::bind(CallsignCompare, std::placeholders::_1, my1)) != m_blackList.end()) {
LogMessage("D-Star, invalid access attempt from %8.8s", my1);
m_rfState = RS_RF_REJECTED;
return false;
return true;
}

unsigned char gateway[DSTAR_LONG_CALLSIGN_LENGTH];
Expand Down Expand Up @@ -502,7 +502,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
LogMessage("D-Star, non repeater RF header received from %8.8s", my1);
m_rfState = RS_RF_INVALID;
delete header;
return false;
return true;
}

unsigned char callsign[DSTAR_LONG_CALLSIGN_LENGTH];
Expand All @@ -513,21 +513,21 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
LogMessage("D-Star, received RF header for wrong repeater (%8.8s) from %8.8s", callsign, my1);
m_rfState = RS_RF_INVALID;
delete header;
return false;
return true;
}

if (m_selfOnly && ::memcmp(my1, m_callsign, DSTAR_LONG_CALLSIGN_LENGTH - 1U) != 0 && !(std::find_if(m_whiteList.begin(), m_whiteList.end(), std::bind(CallsignCompare, std::placeholders::_1, my1)) != m_whiteList.end())) {
LogMessage("D-Star, invalid access attempt from %8.8s", my1);
m_rfState = RS_RF_REJECTED;
delete header;
return false;
return true;
}

if (!m_selfOnly && std::find_if(m_blackList.begin(), m_blackList.end(), std::bind(CallsignCompare, std::placeholders::_1, my1)) != m_blackList.end()) {
LogMessage("D-Star, invalid access attempt from %8.8s", my1);
m_rfState = RS_RF_REJECTED;
delete header;
return false;
return true;
}

unsigned char gateway[DSTAR_LONG_CALLSIGN_LENGTH];
Expand Down

0 comments on commit f9e953d

Please sign in to comment.