From 3e93ea9b7661354d187a51b27062c346c6d6e3b9 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Tue, 8 Feb 2022 17:08:04 +0100 Subject: [PATCH] esp_netif: Remove tcpip_adapter compatibility layer * Original commit: espressif/esp-idf@795b7ed993784e3134195e12b0978504d83dfd56 --- components/mdns/test_afl_fuzz_host/Makefile | 1 - .../mdns/test_afl_fuzz_host/esp32_mock.h | 26 ------------------- .../mdns/test_afl_fuzz_host/sdkconfig.h | 1 - 3 files changed, 28 deletions(-) diff --git a/components/mdns/test_afl_fuzz_host/Makefile b/components/mdns/test_afl_fuzz_host/Makefile index b700bf4f5..af58a3c05 100644 --- a/components/mdns/test_afl_fuzz_host/Makefile +++ b/components/mdns/test_afl_fuzz_host/Makefile @@ -33,7 +33,6 @@ CFLAGS=-g -Wno-unused-value -Wno-missing-declarations -Wno-pointer-bool-conversi -I$(COMPONENTS_DIR)/soc/include \ -I$(COMPONENTS_DIR)/soc/esp32/include \ -I$(COMPONENTS_DIR)/soc/src/esp32/include \ - -I$(COMPONENTS_DIR)/tcpip_adapter/include \ -I$(COMPONENTS_DIR)/xtensa/include \ -I$(COMPONENTS_DIR)/xtensa/esp32/include \ -I$(COMPILER_ICLUDE_DIR)/include diff --git a/components/mdns/test_afl_fuzz_host/esp32_mock.h b/components/mdns/test_afl_fuzz_host/esp32_mock.h index 8afe01fba..e76a17ab6 100644 --- a/components/mdns/test_afl_fuzz_host/esp32_mock.h +++ b/components/mdns/test_afl_fuzz_host/esp32_mock.h @@ -11,7 +11,6 @@ #define INC_FREERTOS_H #define QUEUE_H #define SEMAPHORE_H -#define _TCPIP_ADAPTER_H_ #define _ESP_TASK_H_ #ifdef USE_BSD_STRING @@ -92,14 +91,6 @@ extern const char * WIFI_EVENT; extern const char * IP_EVENT; extern const char * ETH_EVENT; -/* status of DHCP client or DHCP server */ -typedef enum { - TCPIP_ADAPTER_DHCP_INIT = 0, /**< DHCP client/server in initial state */ - TCPIP_ADAPTER_DHCP_STARTED, /**< DHCP client/server already been started */ - TCPIP_ADAPTER_DHCP_STOPPED, /**< DHCP client/server already been stopped */ - TCPIP_ADAPTER_DHCP_STATUS_MAX -} tcpip_adapter_dhcp_status_t; - struct udp_pcb { uint8_t dummy; }; @@ -114,23 +105,6 @@ struct ip6_addr { }; typedef struct ip6_addr ip6_addr_t; -typedef struct { - ip4_addr_t ip; - ip4_addr_t netmask; - ip4_addr_t gw; -} tcpip_adapter_ip_info_t; - -typedef enum { - TCPIP_ADAPTER_IF_STA = 0, /**< ESP32 station interface */ - TCPIP_ADAPTER_IF_AP, /**< ESP32 soft-AP interface */ - TCPIP_ADAPTER_IF_ETH, /**< ESP32 ethernet interface */ - TCPIP_ADAPTER_IF_MAX -} tcpip_adapter_if_t; - -typedef struct { - ip6_addr_t ip; -} tcpip_adapter_ip6_info_t; - typedef void* system_event_t; struct pbuf { diff --git a/components/mdns/test_afl_fuzz_host/sdkconfig.h b/components/mdns/test_afl_fuzz_host/sdkconfig.h index fe207b001..71bb12823 100644 --- a/components/mdns/test_afl_fuzz_host/sdkconfig.h +++ b/components/mdns/test_afl_fuzz_host/sdkconfig.h @@ -123,7 +123,6 @@ #define CONFIG_HTTPD_PURGE_BUF_LEN 32 #define CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL 120 #define CONFIG_ESP_NETIF_TCPIP_LWIP 1 -#define CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER 1 #define CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT 1 #define CONFIG_ESP_TIMER_TASK_STACK_SIZE 3584 #define CONFIG_ESP_TIMER_IMPL_TG0_LAC 1