diff --git a/src/cdmrmmdvmprotocol.cpp b/src/cdmrmmdvmprotocol.cpp index 36d0dbb..008ff7a 100644 --- a/src/cdmrmmdvmprotocol.cpp +++ b/src/cdmrmmdvmprotocol.cpp @@ -504,7 +504,7 @@ bool CDmrmmdvmProtocol::IsValidConnectPacket(const CBuffer &Buffer, CCallsign *c valid = callsign->IsValid(); if ( !valid) { - std::cout << "DMRmmdvm connect packet from IP address " << Ip << " / unrecognized id " << (int)callsign->GetDmrid() << std::endl; + std::cout << "Invalid callsign in DMRmmdvm RPTL packet from IP: " << Ip << " CS:" << callsign << " DMRID:" << callsign->GetDmrid() << std::endl; } } return valid; @@ -523,7 +523,7 @@ bool CDmrmmdvmProtocol::IsValidAuthenticationPacket(const CBuffer &Buffer, CCall valid = callsign->IsValid(); if ( !valid) { - std::cout << "DMRmmdvm authnetication packet from IP address " << Ip << " / unrecognized id " << (int)callsign->GetDmrid() << std::endl; + std::cout << "Invalid callsign in DMRmmdvm RPTK packet from IP: " << Ip << " CS:" << callsign << " DMRID:" << callsign->GetDmrid() << std::endl; } } @@ -558,7 +558,7 @@ bool CDmrmmdvmProtocol::IsValidConfigPacket(const CBuffer &Buffer, CCallsign *ca valid = callsign->IsValid(); if ( !valid) { - std::cout << "DMRmmdvm config packet from IP address " << Ip << " / unrecognized id " << (int)callsign->GetDmrid() << std::endl; + std::cout << "Invalid callsign in DMRmmdvm RPTC packet from IP: " << Ip << " CS:" << callsign << " DMRID:" << callsign->GetDmrid() << std::endl; } } diff --git a/src/cdmrplusprotocol.cpp b/src/cdmrplusprotocol.cpp index 39894ee..88ec6b9 100644 --- a/src/cdmrplusprotocol.cpp +++ b/src/cdmrplusprotocol.cpp @@ -386,7 +386,7 @@ bool CDmrplusProtocol::IsValidConnectPacket(const CBuffer &Buffer, CCallsign *ca valid = (callsign->IsValid() && (std::isupper(*reflectormodule) || (*reflectormodule == ' ')) ); if ( !valid) { - std::cout << "DMRplus connect packet from IP address " << Ip << " / unrecognized id " << (int)callsign->GetDmrid() << std::endl; + std::cout << "Invalid callsign in DMR+ connect packet from IP: " << Ip << " CS:" << callsign << " DMRID:" << callsign->GetDmrid() << " ReflectorModule:" << *reflectormodule << std::endl; } } return valid; diff --git a/src/main.h b/src/main.h index e8ae07c..b7ff5bb 100644 --- a/src/main.h +++ b/src/main.h @@ -66,7 +66,7 @@ #define VERSION_MAJOR 2 #define VERSION_MINOR 4 -#define VERSION_REVISION 30 +#define VERSION_REVISION 31 // global ------------------------------------------------------