Improve wificfg #732
Open
Improve wificfg #732
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Without these, wificfg.h can fail to compile because types like uint32_t, size_t or ssize_t are not available.
FreeRTOS/Source/include/FreeRTOSConfig.h makes sure configUSE_TRACE_FACILITY is always defined. But it's defined to 0 when TRACE_FACILITY is disabled. When #ifdef is used, the guarded blocks of code are always compiled and this results in link failure when TRACE_FACILITY is in fact not enabled.
wificfg.c defines the default values for ssid, password and hostname. But because these are not weak, trying to redefine these causes a link error. This change marks the definitions in wificfg.c weak, thus making it possible for a program using the wificfg component to redefine these w/o having to touch wificfg.c.
| const char *wificfg_default_hostname = "eor-%02x%02x%02x"; | ||
| const char *wificfg_default_ssid __attribute__ ((weak)) = "EOR_%02X%02X%02X"; | ||
| const char *wificfg_default_password __attribute__ ((weak)) = "esp-open-rtos"; | ||
| const char *wificfg_default_hostname __attribute__ ((weak)) = "eor-%02x%02x%02x"; |
There was a problem hiding this comment.
These don't need to be 'weak', they are variables that can be trivially modified, just set them in your app initialization code.
There was a problem hiding this comment.
You are right. I didn't realize it's a const char*, not a const char[].
I was motivated by several things:
- I thought I can't really change it (which was wrong)
- I didn't want the literals from the wificfg.c to be present in the binary at all (just a few bytes, but still needless if I'm using my own strings)
- when re-defining a weak symbol, there is no need to do anything at runtime, linker just handles that (yes, just 3 assignments, but when just a declaration can suffice, it seems nicer)
Because the type is const char*, even the second point was not fulfilled. If the type is changed to const char[], then it seems to do what I wanted.
What do you think about keeping these weak and making them const char[]? Or are the last two points from the list above not interesting to you?
| @@ -1540,7 +1540,7 @@ static int handle_wificfg_challenge_post(int s, wificfg_method method, | |||
| return wificfg_write_string(s, http_redirect_header); | |||
| } | |||
|
|
|||
| #ifdef configUSE_TRACE_FACILITY | |||
| #if configUSE_TRACE_FACILITY | |||
There was a problem hiding this comment.
Yes, that looks right, thanks.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Several small improvements of extras/wificfg: