diff --git a/data_embed/index.html b/data_embed/index.html index 2f0b21b..e3231e0 100644 --- a/data_embed/index.html +++ b/data_embed/index.html @@ -667,7 +667,7 @@ Black List - Add Callsigns with space between them to Blacklist them (* wild card allowed) + Add Callsigns with space between them to Blacklist (* wildcard allowed)
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 3385ad8..db14e6d 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -67,7 +67,7 @@ ___________________________________________________________________*/ #endif -String versionDate = "2025-11-08"; +String versionDate = "2025-11-29"; String versionNumber = "3.1.4.1"; Configuration Config; WiFiClient aprsIsClient; diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index 63f5c79..2172ff1 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -204,7 +204,7 @@ namespace LoRa_Utils { if (packet != "") { String sender = packet.substring(3, packet.indexOf(">")); - if (packet.substring(0,3) == "\x3c\xff\x01" && !STATION_Utils::isBlacklisted(sender)){ // avoid processing BlackListed stations + if (packet.substring(0,3) == "\x3c\xff\x01" && !STATION_Utils::isBlacklisted(sender)) { // avoid processing BlackListed stations rssi = radio.getRSSI(); snr = radio.getSNR(); freqError = radio.getFrequencyError(); diff --git a/src/station_utils.cpp b/src/station_utils.cpp index 86b5eae..b538bad 100644 --- a/src/station_utils.cpp +++ b/src/station_utils.cpp @@ -57,7 +57,7 @@ bool packetIsBeacon = false; namespace STATION_Utils { - std::vector loadCallSignList(const String& list) { + std::vector loadCallsignList(const String& list) { std::vector loadedList; String callsigns = list; @@ -77,12 +77,12 @@ namespace STATION_Utils { } void loadBlacklistAndManagers() { - blacklist = loadCallSignList(Config.blacklist); - managers = loadCallSignList(Config.remoteManagement.managers); + blacklist = loadCallsignList(Config.blacklist); + managers = loadCallsignList(Config.remoteManagement.managers); } bool checkCallsignList(const std::vector& list, const String& callsign) { - for (int i = 0; i < list.size(); i++) { + for (size_t i = 0; i < list.size(); i++) { int wildcardIndex = list[i].indexOf("*"); if (wildcardIndex >= 0) { String wildcard = list[i].substring(0, wildcardIndex);