callsign validation process fix

more 3rd party filtering
fix firstColon on last position
2026-07-09 19:31:20 +02:00 · 2024-06-25 16:36:49 -04:00 · 2024-06-24 13:25:30 -04:00 · 2024-06-24 11:36:40 -04:00 · 2024-06-24 11:18:42 -04:00 · 2024-06-24 11:16:52 -04:00
5 changed files with 91 additions and 85 deletions
@@ -37,7 +37,7 @@ ________________________________________________________________________________
    #include "A7670_utils.h"
 #endif

-String          versionDate             = "2024.06.21";
+String          versionDate             = "2024.06.25";
 Configuration   Config;
 WiFiClient      espClient;

@@ -129,51 +129,6 @@ namespace APRS_IS_Utils {
        return buildedPacket;
    }

-    String buildPacketToTx(const String& aprsisPacket, uint8_t packetType) {
-        String packet = aprsisPacket;
-        packet.trim();
-        String outputPacket = Config.callsign;
-        outputPacket += ">APLRG1";
-        if (Config.beacon.path != "") {
-            outputPacket += ",";
-            outputPacket += Config.beacon.path;
-        }
-        outputPacket += ":}";
-        outputPacket += packet.substring(0, packet.indexOf(",")); // Callsign>Tocall
-        outputPacket.concat(",TCPIP,");
-        outputPacket.concat(Config.callsign);
-        outputPacket.concat("*");
-        switch (packetType) {
-            case 0: // gps
-                if (packet.indexOf(":=") > 0) {
-                    outputPacket += packet.substring(packet.indexOf(":="));
-                } else {
-                    outputPacket += packet.substring(packet.indexOf(":!"));
-                }
-                break;
-            case 1: // messages
-                outputPacket += packet.substring(packet.indexOf("::"));
-                break;
-            case 2: // status
-                outputPacket += packet.substring(packet.indexOf(":>"));
-                break;
-            case 3: // telemetry
-                outputPacket += packet.substring(packet.indexOf("::"));
-                break;
-            case 4: // mic-e
-                if (packet.indexOf(":`") > 0) {
-                    outputPacket += packet.substring(packet.indexOf(":`"));
-                } else {
-                    outputPacket += packet.substring(packet.indexOf(":'"));
-                }
-                break;
-            case 5: // object
-                outputPacket += packet.substring(packet.indexOf(":;"));
-                break;
-        }
-        return outputPacket;
-    }
-
    bool processReceivedLoRaMessage(const String& sender, const String& packet) {
        String receivedMessage;
        if (packet.indexOf("{") > 0) {     // ack?
@@ -220,40 +175,88 @@ namespace APRS_IS_Utils {
    void processLoRaPacket(const String& packet) {
        if (espClient.connected() || modemLoggedToAPRSIS) {
            if (packet != "") {
-                if ((packet.substring(0, 3) == "\x3c\xff\x01")  && (packet.indexOf("}") == -1 && packet.indexOf("TCPIP") == -1) && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("RFONLY") == -1)) {                    
-                    const String& Sender = packet.substring(3, packet.indexOf(">"));
-                    if (Sender != Config.callsign && Utils::checkValidCallsign(Sender)) {
-                        STATION_Utils::updateLastHeard(Sender);
-                        Utils::typeOfPacket(packet.substring(3), 0);  // LoRa-APRS
-                        const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
-                        String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
-                        Addressee.trim();
-                        bool queryMessage = false;
-                        if (packet.indexOf("::") > 10 && Addressee == Config.callsign) {      // its a message for me!
-                            queryMessage = processReceivedLoRaMessage(Sender, checkForStartingBytes(AddresseeAndMessage));
-                        }
-                        if (!queryMessage) {
-                            const String& aprsPacket = buildPacketToUpload(packet);
-                            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
-                                display_toggle(true);
+                if ((packet.substring(0, 3) == "\x3c\xff\x01")  && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("RFONLY") == -1)) {                    
+                    int firstColonIndex = packet.indexOf(":");
+                    if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] != '}' && packet.indexOf("TCPIP") == -1) {
+                        const String& Sender = packet.substring(3, packet.indexOf(">"));
+                        if (Sender != Config.callsign && Utils::checkValidCallsign(Sender)) {
+                            STATION_Utils::updateLastHeard(Sender);
+                            Utils::typeOfPacket(packet.substring(3), 0);  // LoRa-APRS
+                            const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
+                            String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+                            Addressee.trim();
+                            bool queryMessage = false;
+                            if (packet.indexOf("::") > 10 && Addressee == Config.callsign) {      // its a message for me!
+                                queryMessage = processReceivedLoRaMessage(Sender, checkForStartingBytes(AddresseeAndMessage));
+                            }
+                            if (!queryMessage) {
+                                const String& aprsPacket = buildPacketToUpload(packet);
+                                if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                                    display_toggle(true);
+                                }
+                                lastScreenOn = millis();
+                                #ifdef HAS_A7670
+                                    stationBeacon = true;
+                                    A7670_Utils::uploadToAPRSIS(aprsPacket);
+                                    stationBeacon = false;
+                                #else
+                                    upload(aprsPacket);
+                                #endif
+                                Utils::println("---> Uploaded to APRS-IS");
+                                show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                            }
-                            lastScreenOn = millis();
-                            #ifdef HAS_A7670
-                                stationBeacon = true;
-                                A7670_Utils::uploadToAPRSIS(aprsPacket);
-                                stationBeacon = false;
-                            #else
-                                upload(aprsPacket);
-                            #endif
-                            Utils::println("---> Uploaded to APRS-IS");
-                            show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                        }
-                    }
+                    }                    
                }
            }
        }
    }

+    String buildPacketToTx(const String& aprsisPacket, uint8_t packetType) {
+        String packet = aprsisPacket;
+        packet.trim();
+        String outputPacket = Config.callsign;
+        outputPacket += ">APLRG1";
+        if (Config.beacon.path != "") {
+            outputPacket += ",";
+            outputPacket += Config.beacon.path;
+        }
+        outputPacket += ":}";
+        outputPacket += packet.substring(0, packet.indexOf(",")); // Callsign>Tocall
+        outputPacket.concat(",TCPIP,");
+        outputPacket.concat(Config.callsign);
+        outputPacket.concat("*");
+        switch (packetType) {
+            case 0: // gps
+                if (packet.indexOf(":=") > 0) {
+                    outputPacket += packet.substring(packet.indexOf(":="));
+                } else {
+                    outputPacket += packet.substring(packet.indexOf(":!"));
+                }
+                break;
+            case 1: // messages
+                outputPacket += packet.substring(packet.indexOf("::"));
+                break;
+            case 2: // status
+                outputPacket += packet.substring(packet.indexOf(":>"));
+                break;
+            case 3: // telemetry
+                outputPacket += packet.substring(packet.indexOf("::"));
+                break;
+            case 4: // mic-e
+                if (packet.indexOf(":`") > 0) {
+                    outputPacket += packet.substring(packet.indexOf(":`"));
+                } else {
+                    outputPacket += packet.substring(packet.indexOf(":'"));
+                }
+                break;
+            case 5: // object
+                outputPacket += packet.substring(packet.indexOf(":;"));
+                break;
+        }
+        return outputPacket;
+    }
+
    void processAPRSISPacket(const String& packet) {
        if (!packet.startsWith("#")) {
            if (Config.aprs_is.messagesToRF && packet.indexOf("::") > 0) {
@@ -10,10 +10,12 @@ namespace APRS_IS_Utils {
    void    connect();
    void    checkStatus();
    String  checkForStartingBytes(const String& packet);
+    
    String  buildPacketToUpload(const String& packet);
-    String  buildPacketToTx(const String& aprsisPacket, uint8_t packetType);
    bool    processReceivedLoRaMessage(const String& sender, const String& packet);
    void    processLoRaPacket(const String& packet);
+
+    String  buildPacketToTx(const String& aprsisPacket, uint8_t packetType);
    void    processAPRSISPacket(const String& packet);
    void    listenAPRSIS();

@@ -62,7 +62,8 @@ namespace DIGI_Utils {
            if ((packet.substring(0, 3) == "\x3c\xff\x01") && (packet.indexOf("NOGATE") == -1)) {
                bool thirdPartyPacket = false;
                String temp, Sender;
-                if (packet.indexOf("}") > 0 && packet.indexOf("TCPIP") > 0) {   // 3rd Party 
+                int firstColonIndex = packet.indexOf(":");
+                if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] == '}' && packet.indexOf("TCPIP") > 0) {   // 3rd Party 
                    thirdPartyPacket = true;
                    temp    = packet.substring(packet.indexOf(":}") + 2);
                    Sender  = temp.substring(0, temp.indexOf(">"));
@@ -237,13 +237,14 @@ namespace Utils {
        seventhLineHelper += String(snr);
        seventhLineHelper += "dBm";

-        if (packet.indexOf("::") >= 10) {
+        int firstColonIndex = packet.indexOf(":");
+        if (packet[firstColonIndex + 1] == ':') {
            sixthLine += "> MESSAGE";
            seventhLine = seventhLineHelper;
-        } else if (packet.indexOf(":>") >= 10) {
+        } else if (packet[firstColonIndex + 1] == '>') {
            sixthLine += "> NEW STATUS";
            seventhLine = seventhLineHelper;
-        } else if (packet.indexOf(":!") >= 10 || packet.indexOf(":=") >= 10) {
+        } else if (packet[firstColonIndex + 1] == '!' || packet[firstColonIndex + 1] == '=') {
            sixthLine += "> GPS BEACON";
            if (!Config.syslog.active) {
                GPS_Utils::getDistanceAndComment(packet);       // to be checked!!!
@@ -262,15 +263,15 @@ namespace Utils {
            seventhLine += "D:";
            seventhLine += distance;
            seventhLine += "km";
-        } else if (packet.indexOf(":T#") >= 10 && packet.indexOf(":=/") == -1) {
-            sixthLine += "> TELEMETRY";
-            seventhLine = seventhLineHelper;
-        } else if (packet.indexOf(":`") >= 10) {
+        } else if (packet[firstColonIndex + 1] == '`') {
            sixthLine += ">  MIC-E";
            seventhLine = seventhLineHelper;
-        } else if (packet.indexOf(":;") >= 10) {
+        } else if (packet[firstColonIndex + 1] == ';') {
            sixthLine += ">  OBJECT";
            seventhLine = seventhLineHelper;
+        } else if (packet.indexOf(":T#") >= 10 && packet.indexOf(":=/") == -1) {
+            sixthLine += "> TELEMETRY";
+            seventhLine = seventhLineHelper;
        } else {
            sixthLine += "> ??????????";
            seventhLine = seventhLineHelper;
@@ -330,7 +331,7 @@ namespace Utils {
        if (callsign == "WLNK-1") return true;
        
        String cleanCallsign;
-        if (callsign.indexOf("-")) {    // SSID Validation
+        if (callsign.indexOf("-") > 0) {    // SSID Validation
            cleanCallsign = callsign.substring(0, callsign.indexOf("-"));
            String ssid = callsign.substring(callsign.indexOf("-") + 1);
            if (ssid.indexOf("-") != -1 || ssid.length() > 2) return false;
@@ -362,7 +363,6 @@ namespace Utils {
                if (!isAlpha(cleanCallsign[i - 1])) return false;
            }
        }
-
        return true;
    }
Author	SHA1	Message	Date
richonguzman	ad1129c588	callsign validation process fix	2024-06-25 16:36:49 -04:00
richonguzman	8bb0b0446c	more 3rd party filtering	2024-06-24 13:25:30 -04:00
richonguzman	6b1d319901	fix firstColon on last position	2024-06-24 11:36:40 -04:00
richonguzman	1ceaf159ba	colonIndex fix3	2024-06-24 11:18:42 -04:00
richonguzman	f1de8d2df0	colonIndex upload fix	2024-06-24 11:16:52 -04:00
richonguzman	b9b4f46c66	typeOfPacket fix3	2024-06-24 11:02:38 -04:00
richonguzman	22b2c679d2	typeofPacket initial fix	2024-06-24 10:54:21 -04:00
richonguzman	7baa98bf7e	first 3rdparty correction	2024-06-24 10:32:58 -04:00