chriz/OpenMQTT-Gateway
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

[SYS] Fix wrong connection index record during onboarding (#1961)

Browse Source 
and no connection validation if CNT_DEFAULT_INDEX is different than 0
This commit is contained in:
Florian authored and GitHub committed 2024-06-10 12:46:24 -05:00
1 parent d538316e03
commit db8e850570
1 file changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files
main/main.ino
+3 -2
View File
@@ -1896,7 +1896,6 @@ void setupwifi(bool reset_settings) {
// The extra parameters to be configured (can be either global or just in the setup) // The extra parameters to be configured (can be either global or just in the setup)
// After connecting, parameter.getValue() will get you the configured value // After connecting, parameter.getValue() will get you the configured value
// id/name placeholder/prompt default // id/name placeholder/prompt default
// Index of connection parameters is 1 for onboarding parameters
# ifndef WIFIMNG_HIDE_MQTT_CONFIG # ifndef WIFIMNG_HIDE_MQTT_CONFIG
WiFiManagerParameter custom_mqtt_server("server", "mqtt server", cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_server, parameters_size, " minlength='1' maxlength='64' required"); WiFiManagerParameter custom_mqtt_server("server", "mqtt server", cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_server, parameters_size, " minlength='1' maxlength='64' required");
WiFiManagerParameter custom_mqtt_port("port", "mqtt port", cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_port, 6, " minlength='1' maxlength='5' required"); WiFiManagerParameter custom_mqtt_port("port", "mqtt port", cnt_parameters_array[CNT_DEFAULT_INDEX].mqtt_port, 6, " minlength='1' maxlength='5' required");
@@ -2025,7 +2024,7 @@ void setupwifi(bool reset_settings) {
if (shouldSaveConfig) { if (shouldSaveConfig) {
//read updated parameters //read updated parameters
cnt_index = 1; cnt_index = CNT_DEFAULT_INDEX;
# ifndef WIFIMNG_HIDE_MQTT_CONFIG # ifndef WIFIMNG_HIDE_MQTT_CONFIG
strcpy(cnt_parameters_array[cnt_index].mqtt_server, custom_mqtt_server.getValue()); strcpy(cnt_parameters_array[cnt_index].mqtt_server, custom_mqtt_server.getValue());
strcpy(cnt_parameters_array[cnt_index].mqtt_port, custom_mqtt_port.getValue()); strcpy(cnt_parameters_array[cnt_index].mqtt_port, custom_mqtt_port.getValue());
@@ -2050,6 +2049,8 @@ void setupwifi(bool reset_settings) {
cnt_parameters_array[cnt_index].client_cert = processCert(custom_client_cert.getValue()); cnt_parameters_array[cnt_index].client_cert = processCert(custom_client_cert.getValue());
cnt_parameters_array[cnt_index].client_key = processCert(custom_client_key.getValue()); cnt_parameters_array[cnt_index].client_key = processCert(custom_client_key.getValue());
# endif # endif
// We suppose the connection is valid (could be tested before)
cnt_parameters_array[cnt_index].validConnection = true;
# endif # endif
//save the custom parameters to FS //save the custom parameters to FS