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

Jump to bottom

Fix the race condition that happens when in LOAD_AND_RESTORE mode and a user tries to configure a new network. #135

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix the race condition that happens when in LOAD_AND_RESTORE mode and a user tries to configure a new network. #135

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e71a56c
Move web components to folders
mtetreault May 29, 2021
24f16a7
Allows enabling/disabling dns server as needed
mtetreault May 31, 2021
c02b129
When in WM_ORDER_LOAD_AND_RESTORE_STA and there is one connection to …
mtetreault Jun 1, 2021
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ if(IDF_VERSION_MAJOR GREATER_EQUAL 4)
idf_component_register(SRC_DIRS src
REQUIRES log nvs_flash mdns wpa_supplicant lwip esp_http_server
INCLUDE_DIRS src
EMBED_FILES src/style.css src/code.js src/index.html)
EMBED_FILES src/web/style.css src/web/code.js src/web/index.html)
else()
set(COMPONENT_SRCDIRS src)
set(COMPONENT_ADD_INCLUDEDIRS src)
set(COMPONENT_REQUIRES log nvs_flash mdns wpa_supplicant lwip esp_http_server)
set(COMPONENT_EMBED_FILES src/style.css src/code.js src/index.html)
set(COMPONENT_EMBED_FILES src/web/style.css src/web/code.js src/web/index.html)
register_component()
endif()
6 changes: 6 additions & 0 deletions Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
menu "Wifi Manager Configuration"

config WIFI_MANAGER_DNS_SERVER_ENABLE
bool "Enable the DNS server if set"
default y
help
Enables the DNS Server when set to true.

config WIFI_MANAGER_TASK_PRIORITY
int "RTOS Task Priority for the wifi_manager"
default 5
Expand Down
2 changes: 1 addition & 1 deletion component.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COMPONENT_ADD_INCLUDEDIRS = src
COMPONENT_SRCDIRS = src
COMPONENT_DEPENDS = log esp_http_server
COMPONENT_EMBED_FILES := src/style.css src/code.js src/index.html
COMPONENT_EMBED_FILES := src/web/style.css src/web/code.js src/web/index.html
0 src/lock.svg → src/assets/lock.svg
View file
Open in desktop
File renamed without changes
0 src/settings.svg → src/assets/settings.svg
View file
Open in desktop
File renamed without changes
0 src/wifi0.svg → src/assets/wifi0.svg
View file
Open in desktop
File renamed without changes
0 src/wifi1.svg → src/assets/wifi1.svg
View file
Open in desktop
File renamed without changes
0 src/wifi2.svg → src/assets/wifi2.svg
View file
Open in desktop
File renamed without changes
0 src/wifi3.svg → src/assets/wifi3.svg
View file
Open in desktop
File renamed without changes
2 changes: 0 additions & 2 deletions src/connect
View file
Open in desktop

This file was deleted.

0 src/ap.json → src/examples/ap.json
View file
Open in desktop
File renamed without changes.
0 src/status → src/examples/status.json
View file
Open in desktop
File renamed without changes.
0 src/code.js → src/web/code.js
View file
Open in desktop
File renamed without changes.
0 src/compress.bat → src/web/compress.bat
View file
Open in desktop
File renamed without changes.
0 src/index.html → src/web/index.html
View file
Open in desktop
File renamed without changes.
0 src/style.css → src/web/style.css
View file
Open in desktop
File renamed without changes.
19 changes: 15 additions & 4 deletions src/wifi_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,19 @@ Contains the freeRTOS task and all necessary support
#include "lwip/err.h"
#include "lwip/netdb.h"
#include "lwip/ip4_addr.h"
#include "sdkconfig.h"


#include "json.h"
#include "dns_server.h"
#include "nvs_sync.h"
#include "wifi_manager.h"


Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not too sure about this. It adds nothing useful. The build system will always define CONFIG_WIFI_MANAGER_DNS_SERVER_ENABLE

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should define the build time variables as per wifi_manager.h which is best practice. No need to define a new global byte.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have to validate, from what I remember when set to 'n' `CONFIG_WIFI_MANAGER_DNS_SERVER_ENABLE' was simply undefined. That why I check if it's defined or not.

You're right though, this should be in wifi_manager.h.

#ifdef CONFIG_WIFI_MANAGER_DNS_SERVER_ENABLE
uint8_t dns_server_enable = 1;
#else
uint8_t dns_server_enable = 0;
#endif

/* objects used to manipulate the main queue of events */
QueueHandle_t wifi_manager_queue;
Expand Down Expand Up @@ -1218,7 +1223,9 @@ void wifi_manager( void * pvParameters ){
http_app_start(true);

/* start DNS */
dns_server_start();
if(dns_server_enable) {
dns_server_start();
}

/* callback */
if(cb_ptr_arr[msg.code]) (*cb_ptr_arr[msg.code])(NULL);
Expand All @@ -1240,7 +1247,9 @@ void wifi_manager( void * pvParameters ){
esp_wifi_set_mode(WIFI_MODE_STA);

/* stop DNS */
dns_server_stop();
if(dns_server_enable) {
dns_server_stop();
}

/* restart HTTP daemon */
http_app_stop();
Expand Down Expand Up @@ -1283,7 +1292,9 @@ void wifi_manager( void * pvParameters ){
else { abort(); }

/* bring down DNS hijack */
dns_server_stop();
if(dns_server_enable) {
dns_server_stop();
}

/* start the timer that will eventually shutdown the access point
* We check first that it's actually running because in case of a boot and restore connection
Expand Down