Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(nan_console): Error when NAN Discovery is started more than once (IDFGH-13923) #14762

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+6 −1
Open

fix(nan_console): Error when NAN Discovery is started more than once (IDFGH-13923) #14762

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83ec999
fix(nan_console): Error when NAN Discovery is started more than once
entrop1a Oct 22, 2024
4301645
fix(nan_console): Removal of network interface unconditional initiali…
entrop1a Oct 23, 2024
545777e
fix(nan_console): extending the logic for case netif start fails
entrop1a Oct 31, 2024
71d2e16
fix(nan_console): fix redundant global variable initialization
entrop1a Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions examples/wifi/wifi_aware/nan_console/main/nan_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static struct {
} ping_args;

static const char *TAG = "nan_console";
static esp_netif_t *g_nan_netif;
static esp_netif_t *g_nan_netif = NULL;
entrop1a marked this conversation as resolved.
Show resolved Hide resolved

#define NAN_EXAMPLE_SERVICE_NAME "ESP_NAN-Service"

Expand Down Expand Up @@ -235,7 +235,10 @@ static int wifi_cmd_nan_disc(int argc, char **argv)
nan_cfg.warm_up_sec = nan_args.warmup_time->ival[0];
}

g_nan_netif = esp_netif_create_default_wifi_nan();
if(!g_nan_netif){
g_nan_netif = esp_netif_create_default_wifi_nan();
}

if ((esp_wifi_nan_start(&nan_cfg)) != ESP_OK) {
ESP_LOGI(TAG, "Failed to start NAN");
esp_netif_destroy_default_wifi(g_nan_netif);
entrop1a marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -252,6 +255,7 @@ static int wifi_cmd_nan_disc(int argc, char **argv)
return 1;
}
esp_netif_destroy_default_wifi(g_nan_netif);
g_nan_netif = NULL;
}

return 0;
Expand Down