new components and include structure

Author: martin-ger

components/acl/CMakeLists.txt

@@ -3,7 +3,8 @@
 # Provides packet filtering for the ESP32 NAT Router.
 
 idf_component_register(
-    SRCS "acl.c"
+    SRCS "acl.c" "acl_nvs.c"
     INCLUDE_DIRS "include"
     REQUIRES lwip esp_netif esp_timer
+    PRIV_REQUIRES nvs_flash cmd_router
 )

main/acl_nvs.c components/acl/acl_nvs.cmain/acl_nvs.c renamed to components/acl/acl_nvs.c

@@ -8,7 +8,7 @@
 #include "esp_log.h"
 #include "nvs.h"
 #include "acl.h"
-#include "router_globals.h"
+#include "router_config.h"
 
 static const char *TAG = "acl_nvs";
 

components/acl/include/acl.h

@@ -16,6 +16,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "esp_err.h"
 #include "lwip/pbuf.h"
 
 #ifdef __cplusplus
@@ -208,6 +209,18 @@ char* acl_format_ip(uint32_t ip, uint32_t mask, char* buf, size_t buf_len);
  */
 bool acl_parse_ip(const char* str, uint32_t* ip, uint32_t* mask);
 
+/**
+ * @brief Save all ACL rules to NVS
+ * @return ESP_OK on success
+ */
+esp_err_t save_acl_rules(void);
+
+/**
+ * @brief Load all ACL rules from NVS
+ * @return ESP_OK on success
+ */
+esp_err_t load_acl_rules(void);
+
 #ifdef __cplusplus
 }
 #endif

components/cmd_router/CMakeLists.txt

@@ -1,3 +1,3 @@
 idf_component_register(SRCS "cmd_router.c"
-                    INCLUDE_DIRS .
+                    INCLUDE_DIRS . "${CMAKE_SOURCE_DIR}/include"
                     REQUIRES console nvs_flash esp_wifi driver spi_flash pcap_capture acl remote_console oled_display mbedtls)

components/cmd_router/router_globals.h

@@ -14,7 +14,7 @@
 #include "esp_console.h"
 #include "esp_system.h"
 #include "nvs.h"
-#include "router_globals.h"
+#include "router_config.h"
 #include "esp_sleep.h"
 #include "esp_flash.h"
 #include "esp_chip_info.h"

components/cmd_system/cmd_system.c

@@ -19,7 +19,7 @@
 
 #include "dhcpserver/dhcpserver.h"
 #include "dhcpserver/dhcpserver_options.h"
-#include "router_globals.h"
+#include "dhcp_reservations.h"
 
 #if ESP_DHCPS
 

components/dhcpserver/dhcpserver.c

@@ -0,0 +1,8 @@
+idf_component_register(
+    SRCS "http_server.c"
+    INCLUDE_DIRS "include"
+    PRIV_REQUIRES esp_http_server esp_wifi esp_netif esp_event nvs_flash
+                  esp_timer json cmd_router acl pcap_capture
+                  remote_console dhcpserver wpa_supplicant
+)
+target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-unused-function)