DDP invalid packet filter

Author: blazoncek

wled00/e131.cpp

@@ -266,7 +266,8 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, byte protocol) {
         }
       }
     }
-    unsigned ddpChannelsPerLed = ((p->dataType & 0b00111000)>>3 == 0b011) ? 4 : 3; // data type 0x1B (formerly 0x1A) is RGBW (type 3, 8 bit/channel)
+    if (!(p->dataType == DDP_TYPE_RGBW32 || p->dataType == DDP_TYPE_RGB24) && p->destination != 1) return; // only RGB or RGBW supported and default device ID
+    unsigned ddpChannelsPerLed = 3 + (p->dataType == DDP_TYPE_RGBW32); // data type 0x1B (formerly 0x1A) is RGBW (type 3, 8 bit/channel)
     uint32_t start =  htonl(p->channelOffset) / ddpChannelsPerLed;
     start += DMXAddress / ddpChannelsPerLed;
     unsigned stop = start + htons(p->dataLen) / ddpChannelsPerLed;

wled00/src/dependencies/e131/ESPAsyncE131.cpp

@@ -124,8 +124,13 @@ void ESPAsyncE131::parsePacket(AsyncUDPPacket _packet) {
 	} 
 
   if (error && _packet.localPort() == DDP_DEFAULT_PORT) { //DDP packet
-    error = false;
-    protocol = P_DDP;
+    // check if it is indeed DDP packet (version bits >0; data len == actual packet length - header)
+    if (_packet.length() > DDP_HEADER_SIZE && (sbuff->flags & DDP_VERSION_MASK) != 0) {
+      if (sbuff->dataLen == _packet.length() - DDP_HEADER_SIZE - (sbuff->flags & DDP_TIMECODE_FLAG ? sizeof(uint32_t) : 0)) {
+        error = false;
+        protocol = P_DDP;
+      }
+    }
   }
 
   if (!error) {

wled00/src/dependencies/e131/ESPAsyncE131.h

@@ -50,6 +50,8 @@ typedef struct ip_addr ip4_addr_t;
 #define ARTNET_DEFAULT_PORT 6454
 #define DDP_DEFAULT_PORT    4048
 
+#define DDP_HEADER_SIZE 10   // increases to 14 if timecode flag is set
+#define DDP_VERSION_MASK 0xC0
 #define DDP_PUSH_FLAG 0x01
 #define DDP_TIMECODE_FLAG 0x10
 

wled00/udp.cpp

@@ -835,7 +835,7 @@ uint8_t realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, const
         // write the header
         /*0*/ddpUdp.write(flags);
         /*1*/ddpUdp.write(sequenceNumber++ & 0x0F); // sequence may be unnecessary unless we are sending twice (as requested in Sync settings)
-        /*2*/ddpUdp.write(isRGBW ?  DDP_TYPE_RGBW32 : DDP_TYPE_RGB24);
+        /*2*/ddpUdp.write(isRGBW ? DDP_TYPE_RGBW32 : DDP_TYPE_RGB24);
         /*3*/ddpUdp.write(DDP_ID_DISPLAY);
         // data offset in bytes, 32-bit number, MSB first
         /*4*/ddpUdp.write(0xFF & (channel >> 24));

wled00/wled.cpp

@@ -460,9 +460,12 @@ void WLED::setup()
   WiFi.persistent(false);
   //WiFi.enableLongRange(true);
   WiFi.onEvent(WiFiEvent);
-//#if defined(ARDUINO_ARCH_ESP32) && ESP_IDF_VERSION_MAJOR==4 && !defined(CONFIG_IDF_TARGET_ESP32S2)
-//  WiFi.useStaticBuffers(true);    // use preallocated buffers (for speed); WARNING: uses 60kB of RAM!!!
-//#endif
+#if defined(ARDUINO_ARCH_ESP32) && ESP_IDF_VERSION_MAJOR==4
+  WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN);
+  #if defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(WLED_ENABLE_HUB75MATRIX)
+  WiFi.useStaticBuffers(true);    // use preallocated buffers (for speed); WARNING: uses 60kB of RAM!!!
+  #endif
+#endif
   delay(15);                      // wait for hardware to be ready
 
   if (isWiFiConfigured()) {