Distinguish between linked und unlinked state for messages

This commit is contained in:
phl0 2016-04-20 22:33:06 +02:00
parent 991065fb0c
commit 86aeaffd4c
No known key found for this signature in database
GPG key ID: 48EA1E640798CA9A

View file

@ -489,15 +489,13 @@ void CDStarControl::writeNetwork()
LINK_STATUS status = LS_NONE;
unsigned char reflector[DSTAR_LONG_CALLSIGN_LENGTH];
if (m_network != NULL)
m_network->getStatus(status, reflector);
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) reflector);
if (strcmp((char*) reflector, " ") == 0) {
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your);
} else {
m_network->getStatus(status, reflector);
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) {
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) reflector);
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s via %8.8s", my1, my2, your, reflector);
} else {
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) " ");
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your);
}
} else if (type == TAG_EOT) {
if (m_netState != RS_NET_AUDIO)