espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

esp_netif: add consistency checks for configs and interface key duplication

Browse Source
This commit is contained in:
David Cermak
2019-09-15 09:47:43 +02:00
parent cf710a3cb1
commit 359f6b3a21
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/esp_netif/lwip/esp_netif_lwip.c
View File

@@ -358,19 +358,27 @@ static esp_err_t esp_netif_init_configuration(esp_netif_t *esp_netif, const esp_
esp_netif_t *esp_netif_new(const esp_netif_config_t *esp_netif_config) esp_netif_t *esp_netif_new(const esp_netif_config_t *esp_netif_config)
{ {
// mandatory configuration must be provided when creating esp_netif object // mandatory configuration must be provided when creating esp_netif object
if (esp_netif_config == NULL) { if (esp_netif_config == NULL ||
esp_netif_config->base->if_key == NULL ||
NULL != esp_netif_get_handle_from_ifkey(esp_netif_config->base->if_key)) {
ESP_LOGE(TAG, "%s: Failed to configure netif with config=%p (config or if_key is NULL or duplicate key)",
__func__, esp_netif_config);
return NULL; return NULL;
} }
// Create parent esp-netif object // Create parent esp-netif object
esp_netif_t *esp_netif = calloc(1, sizeof(struct esp_netif_obj)); esp_netif_t *esp_netif = calloc(1, sizeof(struct esp_netif_obj));
if (!esp_netif) { if (!esp_netif) {
ESP_LOGE(TAG, "Failed to allocate %d bytes (fee heap size %d)", sizeof(struct esp_netif_obj),
esp_get_free_heap_size());
return NULL; return NULL;
} }
// Create ip info // Create ip info
esp_netif_ip_info_t *ip_info = calloc(1, sizeof(esp_netif_ip_info_t)); esp_netif_ip_info_t *ip_info = calloc(1, sizeof(esp_netif_ip_info_t));
if (!ip_info) { if (!ip_info) {
ESP_LOGE(TAG, "Failed to allocate %d bytes (fee heap size %d)", sizeof(esp_netif_ip_info_t),
esp_get_free_heap_size());
free(esp_netif); free(esp_netif);
return NULL; return NULL;
} }
@@ -379,6 +387,8 @@ esp_netif_t *esp_netif_new(const esp_netif_config_t *esp_netif_config)
// creating another ip info (to store old ip) // creating another ip info (to store old ip)
ip_info = calloc(1, sizeof(esp_netif_ip_info_t)); ip_info = calloc(1, sizeof(esp_netif_ip_info_t));
if (!ip_info) { if (!ip_info) {
ESP_LOGE(TAG, "Failed to allocate %d bytes (fee heap size %d)", sizeof(esp_netif_ip_info_t),
esp_get_free_heap_size());
free(esp_netif->ip_info); free(esp_netif->ip_info);
free(esp_netif); free(esp_netif);
return NULL; return NULL;
@@ -388,6 +398,8 @@ esp_netif_t *esp_netif_new(const esp_netif_config_t *esp_netif_config)
// Create underlying lwip netif // Create underlying lwip netif
struct netif * lwip_netif = calloc(1, sizeof(struct netif)); struct netif * lwip_netif = calloc(1, sizeof(struct netif));
if (!lwip_netif) { if (!lwip_netif) {
ESP_LOGE(TAG, "Failed to allocate %d bytes (fee heap size %d)", sizeof(struct netif),
esp_get_free_heap_size());
free(esp_netif->ip_info_old); free(esp_netif->ip_info_old);
free(esp_netif->ip_info); free(esp_netif->ip_info);
free(esp_netif); free(esp_netif);