Mirrors/esp-link
2
0
Fork 0
mirror of https://github.com/jeelabs/esp-link.git synced 2026-03-19 23:46:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

change length for mqtt username and password

Browse Source 
fix for #450

Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
This commit is contained in:
Bartlomiej Zimon
2019-07-11 17:44:27 +00:00
committed by Thorsten von Eicken
parent 5995df787d
commit ef3d68d8f0
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
esp-link/config.c
View File

@@ -23,7 +23,7 @@ FlashConfig flashDefault = {
.slip_enable = 0, .mqtt_enable = 0, .mqtt_status_enable = 0,
.mqtt_timeout = 2, .mqtt_clean_session = 1,
.mqtt_port = 1883, .mqtt_keepalive = 60,
.mqtt_old_host = "\0", .mqtt_old_password = "\0", .mqtt_clientid = "\0",
.mqtt_old_host = "\0", .mqtt_old_password = "\0", .mqtt_old_username = "\0", .mqtt_clientid = "\0",
.mqtt_username = "\0", .mqtt_password = "\0", .mqtt_status_topic = "\0",
.mqtt_host = "\0",
.sys_descr = "\0",
@@ -161,6 +161,13 @@ bool ICACHE_FLASH_ATTR configRestore(void) {
os_memset(flashConfig.mqtt_old_password, 0, 32);
}
if (flashConfig.mqtt_username[0] == 0 && flashConfig.mqtt_old_username[0] != 0) {
// the mqtt_username got changed from 32 chars to 64 in a new location
os_printf("Converting old mqtt_username\n");
os_memcpy(flashConfig.mqtt_password, flashConfig.mqtt_old_username, 32);
os_memset(flashConfig.mqtt_old_username, 0, 32);
}
if (flashConfig.data_bits == 0) {
// restore to default 8N1
flashConfig.data_bits = flashDefault.data_bits;

7
esp-link/config.h
View File

@@ -23,8 +23,8 @@ typedef struct {
uint16_t mqtt_port, mqtt_keepalive; // MQTT Host port, MQTT Keepalive timer
char mqtt_old_host[32], // replaced by 64-char mqtt_host below
mqtt_clientid[48],
mqtt_username[32],
mqtt_old_password[32], // replaced by 64-char mqtt_password below
mqtt_old_username[32],
mqtt_old_password[32], // replaced by 70-char mqtt_password below
mqtt_status_topic[32];
char sys_descr[129]; // system description
int8_t rx_pullup; // internal pull-up on RX pin
@@ -41,7 +41,8 @@ typedef struct {
int8_t data_bits;
int8_t parity;
int8_t stop_bits;
char mqtt_password[64]; // MQTT password, was 32-char mqtt_old_password
char mqtt_password[70]; // MQTT password, was 32-char mqtt_old_password
char mqtt_username[70]; // MQTT username, was 32-char mqtt_old_username
} FlashConfig;
extern FlashConfig flashConfig;