From 907c6046b1f7c5a833f120e0ccd7693a3db7a47e Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Sun, 26 Feb 2023 16:27:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=81=D1=8F=20=D0=BE=D1=82=20=D0=BF=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=D1=8F=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=BE=D1=88=D0=B8?=
 =?UTF-8?q?=D0=B1=D0=BA=D0=B8=20Udp=20packet=20invalid=20=D0=92=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=BD=D0=B8=D0=BA=D0=B0=D0=BB=D0=B0=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D1=87=D0=B8=D0=BD=D0=B5=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B0=D0=BA=D0=B5?=
 =?UTF-8?q?=D1=82=D0=B0=20=D0=B8=D0=B7=20=D0=B4=D1=80=D1=83=D0=B3=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B=20=D0=9F=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=81=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=81=D1=8C=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B0=20Json=20=D0=B8?=
 =?UTF-8?q?=20=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D1=8F=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8F=20wg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/DeviceList.h |  1 -
 src/DeviceList.cpp   | 26 ++++++++++----------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/include/DeviceList.h b/include/DeviceList.h
index 7aeb422a..5f376a29 100644
--- a/include/DeviceList.h
+++ b/include/DeviceList.h
@@ -13,6 +13,5 @@ extern const String getThisDevice();
 extern void addThisDeviceToList();
 extern void asyncUdpInit();
 extern String uint8tToString(uint8_t* data, size_t len);
-extern bool udpPacketValidation(String& data);
 extern void udpPacketParse(String& data);
 extern void jsonMergeArrays(String& existJson, String& incJson);
\ No newline at end of file
diff --git a/src/DeviceList.cpp b/src/DeviceList.cpp
index 9e5d99c2..c1e398cb 100644
--- a/src/DeviceList.cpp
+++ b/src/DeviceList.cpp
@@ -37,12 +37,16 @@ void asyncUdpInit() {
             // Serial.print(", Data: ");
             // Serial.write(packet.data(), packet.length());
             String data = uint8tToString(packet.data(), packet.length());
-            // Serial.println(data);
-            if (udpPacketValidation(data)) {
-                SerialPrint("i", F("UDP"), "IP: " + packet.remoteIP().toString() + ":" + String(packet.remotePort()));
-                // Serial.println(data);
-                jsonMergeArrays(devListHeapJson, data);
-                // Serial.println(devListHeapJson);
+            String remoteWorkgroup = "";
+            data.replace("[", "");
+            data.replace("]", "");
+            if (jsonRead(data, F("wg"), remoteWorkgroup)) {    // проверяем чтоб полученный формат был Json и заодно вытягиваем имя группы
+                String loacalWorkgroup = "";
+                jsonRead(settingsFlashJson, F("wg"), loacalWorkgroup);  
+                if (remoteWorkgroup == loacalWorkgroup) {
+                    SerialPrint("i", F("UDP"), "IP: " + packet.remoteIP().toString() + ":" + String(packet.remotePort()));
+                    jsonMergeArrays(devListHeapJson, data);
+                }
             } else {
                 SerialPrint("E", F("UDP"), F("Udp packet invalid"));
             }
@@ -68,16 +72,6 @@ void asyncUdpInit() {
     SerialPrint("i", F("UDP"), F("Udp Init"));
 }
 
-bool udpPacketValidation(String& data) {
-    // SerialPrint("i", F("UDP"), data);
-    String workgroup = jsonReadStr(settingsFlashJson, "wg");
-    if (workgroup != "" && data.indexOf(workgroup) != -1) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
 void jsonMergeArrays(String& existJson, String& incJson) {
     DynamicJsonDocument incJsonDoc(1024);
     DeserializationError incJsonError = deserializeJson(incJsonDoc, incJson);