replaced string for hash in 25segBuffer

include/station_utils.h

@@ -37,8 +37,7 @@ namespace STATION_Utils {
     void deleteNotHeard();
     void updateLastHeard(const String& station);
     bool wasHeard(const String& station);
-    void clean25SegBuffer();
-    bool check25SegBuffer(const String& station, const String& textMessage);
+    bool isIn25SegHashBuffer(const String& station, const String& textMessage);
     void processOutputPacketBufferUltraEcoMode();
     void processOutputPacketBuffer();
     void addToOutputPacketBuffer(const String& packet, bool flag = false);

src/LoRa_APRS_iGate.cpp

@@ -188,7 +188,6 @@ void loop() {
             }
 
             if (Config.loramodule.txActive && (Config.digi.mode == 2 || Config.digi.mode == 3 || backupDigiMode)) { // If Digi enabled
-                STATION_Utils::clean25SegBuffer();
                 DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi
             }
 

src/digi_utils.cpp

@@ -43,24 +43,29 @@ extern bool             backupDigiMode;
 
 namespace DIGI_Utils {
 
+    String cleanPathAsterisks(String path) {
+        String terms[] = {",WIDE1*", ",WIDE2*", "*"};
+        for (String term : terms) {
+            int index = path.indexOf(term);
+            if (index != -1) path.remove(index, term.length());     // less memory than: tempPath.replace("*", "");
+        }
+        return path;
+    }
+
     String buildPacket(const String& path, const String& packet, bool thirdParty, bool crossFreq) {
         String stationCallsign  = (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign);
+        String suffix           = thirdParty ? ":}" : ":";
+        int suffixIndex         = packet.indexOf(suffix);
+        String packetToRepeat;
         if (!crossFreq) {
-            String packetToRepeat = packet.substring(0, packet.indexOf(",") + 1);
-            String tempPath = path;
             int digiMode        = Config.digi.mode;
+            String tempPath     = path;
 
-            if (path.indexOf("WIDE1-1") != -1 && (digiMode == 2 || digiMode == 3)) {
+            if (tempPath.indexOf("WIDE1-1") != -1 && (digiMode == 2 || digiMode == 3)) {    // WIDE1-1 Digipeater
+                if (tempPath.indexOf("*") != -1 ) return "";                                  // "*" shouldn't be in WIDE1-1 (only) type of packet
                 tempPath.replace("WIDE1-1", stationCallsign + "*");
-            } else if (path.indexOf("WIDE2-") != -1 && digiMode == 3) {
-                int wide1AsteriskIndex = path.indexOf(",WIDE1*");   // less memory than: tempPath.replace(",WIDE1*", "");
-                if (wide1AsteriskIndex != -1) {
-                    tempPath.remove(wide1AsteriskIndex, 7);
-                }
-                int asteriskIndex = path.indexOf("*");              // less memory than: tempPath.replace("*", "");
-                if (asteriskIndex != -1) {
-                    tempPath.remove(asteriskIndex, 1);
-                }
+            } else if (tempPath.indexOf("WIDE2-") != -1 && digiMode == 3) {                 // WIDE2-n Digipeater
+                tempPath = cleanPathAsterisks(path);
                 if (path.indexOf("WIDE2-1") != -1) {
                     tempPath.replace("WIDE2-1", stationCallsign + "*");
                 } else if (path.indexOf("WIDE2-2") != -1) {
@@ -69,28 +74,18 @@ namespace DIGI_Utils {
                     return "";
                 }
             }
+            packetToRepeat = packet.substring(0, packet.indexOf(",") + 1);
             packetToRepeat += tempPath;
-            packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(thirdParty ? ":}" : ":")));
-            return packetToRepeat;
         } else {   // CrossFreq Digipeater
-            String suffix   = thirdParty ? ":}" : ":";
-            int suffixIndex = packet.indexOf(suffix);
-            String packetToRepeat = packet.substring(0, suffixIndex);
-
-            String terms[] = {",WIDE1*", ",WIDE2*", "*"};
-            for (String term : terms) {
-                int index = packetToRepeat.indexOf(term);
-                if (index != -1) {
-                    packetToRepeat.remove(index, term.length());
-                }
-            }
+            packetToRepeat = cleanPathAsterisks(packet.substring(0, suffixIndex));
+            if (packetToRepeat.indexOf(stationCallsign) != -1) return "";                   // stationCallsign shouldn't be in path
             packetToRepeat += ",";
             packetToRepeat += stationCallsign;
             packetToRepeat += "*";
+        }
         packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(suffixIndex));
         return packetToRepeat;
     }
-    }
 
     String generateDigipeatedPacket(const String& packet, bool thirdParty){
         String temp;
@@ -104,7 +99,7 @@ namespace DIGI_Utils {
         int digiMode        = Config.digi.mode;
         bool crossFreq      = abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000;   // CrossFreq Digi
 
-        if (commaIndex > 2) {   // Packet has "path"
+        if (commaIndex > 2) {   // "path" found
             const String& path  = temp.substring(commaIndex + 1);
             if (digiMode == 2 || backupDigiMode) {
                 bool hasWide = path.indexOf("WIDE1-1") != -1;
@@ -154,7 +149,8 @@ namespace DIGI_Utils {
         if (Sender == stationCallsign) return;          // Avoid listening to self packets
         if (!thirdPartyPacket && Config.tacticalCallsign == "" && !Utils::callsignIsValid(Sender)) return;  // No thirdParty + no tactical y no valid callsign
 
-        if (STATION_Utils::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) {
+        if (STATION_Utils::isIn25SegHashBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) return;
+
         STATION_Utils::updateLastHeard(Sender);
         Utils::typeOfPacket(temp, 2);               // Digi
         bool queryMessage = false;
@@ -167,7 +163,8 @@ namespace DIGI_Utils {
                 queryMessage = APRS_IS_Utils::processReceivedLoRaMessage(Sender, AddresseeAndMessage, thirdPartyPacket);
             }
         }
-            if (!queryMessage) {
+        if (queryMessage) return;                   // answer should not be repeated.
+
         String loraPacket = generateDigipeatedPacket(packet.substring(3), thirdPartyPacket);
         if (loraPacket != "") {
             STATION_Utils::addToOutputPacketBuffer(loraPacket);
@@ -175,7 +172,5 @@ namespace DIGI_Utils {
             lastScreenOn = millis();
         }
     }
-        }
-    }
 
 }

src/station_utils.cpp

@@ -45,12 +45,10 @@ std::vector<OutputPacketBuffer> outputPacketBuffer;
 
 struct Packet25SegBuffer {
     uint32_t    receivedTime;
-    String      station;
-    String      payload;
+    uint32_t    hash;
 };
 std::vector<Packet25SegBuffer>  packet25SegBuffer;
 
-
 bool saveNewDigiEcoModeConfig   = false;
 bool packetIsBeacon             = false;
 
@@ -166,18 +164,33 @@ namespace STATION_Utils {
         return false;
     }
 
-    void clean25SegBuffer() {
-        if (!packet25SegBuffer.empty() && (millis() - packet25SegBuffer[0].receivedTime) >  25 * 1000) packet25SegBuffer.erase(packet25SegBuffer.begin());
+    void clean25SegHashBuffer() {
+        uint32_t currentTime = millis();
+        for (int i = packet25SegBuffer.size() - 1; i >= 0; i--) {
+            if ((currentTime - packet25SegBuffer[i].receivedTime) > 25 * 1000) {
+                packet25SegBuffer.erase(packet25SegBuffer.begin() + i);
+            }
+        }
     }
 
-    bool check25SegBuffer(const String& station, const String& textMessage) {
-        if (!packet25SegBuffer.empty()) {
+    uint32_t makeHash(const String& station, const String& payload) {   // DJB2 Hash
+        uint32_t h = 5381;
+        for (size_t i = 0; i < station.length(); i++)
+            h = ((h << 5) + h) + station[i];
+        for (size_t i = 0; i < payload.length(); i++)
+            h = ((h << 5) + h) + payload[i];
+        return h;
+    }
+
+    bool isIn25SegHashBuffer(const String& station, const String& textMessage) {
+        uint32_t newHash = makeHash(station, textMessage);
+        uint32_t currentTime = millis();
+        clean25SegHashBuffer();
         for (int i = 0; i < packet25SegBuffer.size(); i++) {
-                if (packet25SegBuffer[i].station == station && packet25SegBuffer[i].payload == textMessage) return false;
+            if (packet25SegBuffer[i].hash == newHash) return true;
         }
-        }
-        packet25SegBuffer.emplace_back(Packet25SegBuffer{millis(), station, textMessage});
-        return true;
+        packet25SegBuffer.push_back({currentTime, newHash});
+        return false;
     }
 
     void processOutputPacketBufferUltraEcoMode() {