mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
65917bb8c3
This commit removes the lock from the list manipulation code in esp_netif_objects.c, because we already have another lock/task context for lwip. So the list manipulation is unsafe and safety must be assured by the stack layer (in esp_netif_lwip). Problems with current locking: * implementation of locking was wrong -- lazy init style of creating the mutex is not thread safe (and destroying it if we have no interface makes the problem exhibit very frequently) * locking only the list won't solve issues when assessing interfaces atomically * maintaining multiple locks is problematic, as we often switch between lwip context and user context in internal implementation of esp_netif_lwip Closes https://github.com/espressif/esp-idf/issues/12261
116 lines
3.2 KiB
C
116 lines
3.2 KiB
C
/*
|
|
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "esp_netif.h"
|
|
#include "esp_netif_ppp.h"
|
|
#include "lwip/netif.h"
|
|
#include "lwip/esp_netif_net_stack.h"
|
|
#ifdef CONFIG_LWIP_DHCPS
|
|
#include "dhcpserver/dhcpserver.h"
|
|
#endif
|
|
|
|
struct esp_netif_api_msg_s;
|
|
|
|
typedef int (*esp_netif_api_fn)(struct esp_netif_api_msg_s *msg);
|
|
|
|
typedef struct esp_netif_api_msg_s {
|
|
int type; /**< The first field MUST be int */
|
|
int ret;
|
|
esp_netif_api_fn api_fn;
|
|
union {
|
|
esp_netif_t *esp_netif; /* esp_netif as input param */
|
|
esp_netif_t **p_esp_netif; /* esp_netif as output */
|
|
esp_netif_callback_fn user_fn; /* user callback */
|
|
}; /* Commonly used parameters what calling api_fn */
|
|
void *data;
|
|
} esp_netif_api_msg_t;
|
|
|
|
|
|
typedef struct esp_netif_dns_param_s {
|
|
esp_netif_dns_type_t dns_type;
|
|
esp_netif_dns_info_t *dns_info;
|
|
} esp_netif_dns_param_t;
|
|
|
|
typedef struct esp_netif_ip_lost_timer_s {
|
|
bool timer_running;
|
|
} esp_netif_ip_lost_timer_t;
|
|
|
|
/**
|
|
* @brief Check the netif if of a specific P2P type
|
|
*/
|
|
#if CONFIG_PPP_SUPPORT
|
|
#define ESP_NETIF_IS_POINT2POINT_TYPE(netif, type) (netif->related_data && netif->related_data->is_point2point && netif->related_data->netif_type == type)
|
|
#else
|
|
#define ESP_NETIF_IS_POINT2POINT_TYPE(netif, type) false
|
|
#endif
|
|
|
|
/**
|
|
* @brief Additional netif types when related data are needed
|
|
*/
|
|
enum netif_types {
|
|
COMMON_LWIP_NETIF,
|
|
PPP_LWIP_NETIF,
|
|
};
|
|
|
|
/**
|
|
* @brief Related data to esp-netif (additional data for some special types of netif
|
|
* (typically for point-point network types, such as PPP)
|
|
*/
|
|
typedef struct netif_related_data {
|
|
bool is_point2point;
|
|
enum netif_types netif_type;
|
|
} netif_related_data_t;
|
|
|
|
/**
|
|
* @brief Main esp-netif container with interface related information
|
|
*/
|
|
struct esp_netif_obj {
|
|
// default interface addresses
|
|
uint8_t mac[NETIF_MAX_HWADDR_LEN];
|
|
esp_netif_ip_info_t* ip_info;
|
|
esp_netif_ip_info_t* ip_info_old;
|
|
|
|
// lwip netif related
|
|
struct netif *lwip_netif;
|
|
err_t (*lwip_init_fn)(struct netif*);
|
|
esp_netif_recv_ret_t (*lwip_input_fn)(void *input_netif_handle, void *buffer, size_t len, void *eb);
|
|
void * netif_handle; // netif impl context (either vanilla lwip-netif or ppp_pcb)
|
|
netif_related_data_t *related_data; // holds additional data for specific netifs
|
|
#if ESP_DHCPS
|
|
dhcps_t *dhcps;
|
|
#endif
|
|
// io driver related
|
|
void* driver_handle;
|
|
esp_err_t (*driver_transmit)(void *h, void *buffer, size_t len);
|
|
esp_err_t (*driver_transmit_wrap)(void *h, void *buffer, size_t len, void *pbuf);
|
|
void (*driver_free_rx_buffer)(void *h, void* buffer);
|
|
|
|
// dhcp related
|
|
esp_netif_dhcp_status_t dhcpc_status;
|
|
esp_netif_dhcp_status_t dhcps_status;
|
|
bool timer_running;
|
|
|
|
// event translation
|
|
ip_event_t get_ip_event;
|
|
ip_event_t lost_ip_event;
|
|
|
|
// misc flags, types, keys, priority
|
|
esp_netif_flags_t flags;
|
|
char * hostname;
|
|
char * if_key;
|
|
char * if_desc;
|
|
int route_prio;
|
|
|
|
#if CONFIG_ESP_NETIF_BRIDGE_EN
|
|
// bridge configuration
|
|
uint16_t max_fdb_dyn_entries;
|
|
uint16_t max_fdb_sta_entries;
|
|
uint8_t max_ports;
|
|
#endif // CONFIG_ESP_NETIF_BRIDGE_EN
|
|
};
|