bugfix reservation

Author: martin-ger

CMakeLists.txt

@@ -2,7 +2,7 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(PROJECT_VER "2.4.5")
+set(PROJECT_VER "2.4.6")
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp32_nat_router)
 

components/dhcpserver/dhcpserver.c

@@ -1116,6 +1116,16 @@ static s16_t parse_msg(dhcps_t *dhcps, struct dhcps_msg *m, u16_t len)
             dhcps->client_address.addr = first_address.addr;
         }
 
+        // Skip IPs that are reserved for a different MAC
+        while (dhcps->client_address.addr <= dhcps->dhcps_poll.end_ip.addr &&
+               is_ip_reserved_for_other(dhcps->client_address.addr, m->chaddr)) {
+            ip4_addr_t tmp;
+            tmp.addr = htonl(dhcps->client_address.addr);
+            tmp.addr++;
+            dhcps->client_address.addr = htonl(tmp.addr);
+            ESP_LOGD(TAG, "Skipping IP reserved for another device");
+        }
+
         // Check for DHCP reservation for this MAC address
         uint32_t reserved_ip = lookup_dhcp_reservation(m->chaddr);
         if (reserved_ip != 0) {

firmware_esp32/bootloader.bin

@@ -1,7 +1,7 @@
 ESP32 NAT Router Build Information
 =================================
 Target: ESP32 (Original) (esp32)
-Build Time: 2026-03-28 14:49:06
-Git Hash: 5527364
+Build Time: 2026-03-31 16:36:10
+Git Hash: 6d41e01
 Binary Files: 4
 Build Directory: build

firmware_esp32/build_info.txt

@@ -1,7 +1,7 @@
 ESP32 NAT Router Build Information
 =================================
 Target: ESP32-C3 (esp32c3)
-Build Time: 2026-03-28 15:05:43
-Git Hash: 5527364
+Build Time: 2026-03-31 16:50:31
+Git Hash: 6d41e01
 Binary Files: 4
 Build Directory: build

firmware_esp32/esp32_nat_router.bin

@@ -1,7 +1,7 @@
 ESP32 NAT Router Build Information
 =================================
 Target: ESP32-C5 (esp32c5)
-Build Time: 2026-03-28 14:58:57
-Git Hash: 5527364
+Build Time: 2026-03-31 16:44:52
+Git Hash: 6d41e01
 Binary Files: 4
 Build Directory: build