yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-05 02:39:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Updating mqtt topic processing to incorrect topic matching when a shorter topic than expected is used which in some situations could cause a crash

Browse source
This commit is contained in:
Matt Holmes 2025-03-21 17:10:47 +00:00
parent e6a6ce9925
commit 15b1543555
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Software/src/devboard/mqtt/mqtt.cpp
View file

@ -438,14 +438,17 @@ static void subscribe() {
esp_mqtt_client_subscribe(client, (topic_name + "/command/+").c_str(), 1); esp_mqtt_client_subscribe(client, (topic_name + "/command/+").c_str(), 1);
} }
void mqtt_message_received(char* topic, int topic_len, char* data, int data_len) { void mqtt_message_received(char* topic_raw, int topic_len, char* data, int data_len) {
char* topic = strndup(topic_raw, topic_len);
#ifdef DEBUG_LOG #ifdef DEBUG_LOG
logging.printf("MQTT message arrived: [%.*s]\n", topic_len, topic); logging.printf("MQTT message arrived: [%.*s]\n", topic_len, topic);
#endif // DEBUG_LOG #endif // DEBUG_LOG
#ifdef REMOTE_BMS_RESET #ifdef REMOTE_BMS_RESET
const char* bmsreset_topic = generateButtonTopic("BMSRESET").c_str(); const char* bmsreset_topic = generateButtonTopic("BMSRESET").c_str();
if (strncmp(topic, bmsreset_topic, topic_len) == 0) { if (strcmp(topic, bmsreset_topic) == 0) {
#ifdef DEBUG_LOG #ifdef DEBUG_LOG
logging.println("Triggering BMS reset"); logging.println("Triggering BMS reset");
#endif // DEBUG_LOG #endif // DEBUG_LOG
@ -453,21 +456,21 @@ void mqtt_message_received(char* topic, int topic_len, char* data, int data_len)
} }
#endif // REMOTE_BMS_RESET #endif // REMOTE_BMS_RESET
if (strncmp(topic, generateButtonTopic("PAUSE").c_str(), topic_len) == 0) { if (strcmp(topic, generateButtonTopic("PAUSE").c_str()) == 0) {
setBatteryPause(true, false); setBatteryPause(true, false);
} }
if (strncmp(topic, generateButtonTopic("RESUME").c_str(), topic_len) == 0) { if (strcmp(topic, generateButtonTopic("RESUME").c_str()) == 0) {
setBatteryPause(false, false, false); setBatteryPause(false, false, false);
} }
if (strncmp(topic, generateButtonTopic("RESTART").c_str(), topic_len) == 0) { if (strcmp(topic, generateButtonTopic("RESTART").c_str()) == 0) {
setBatteryPause(true, true, true, false); setBatteryPause(true, true, true, false);
delay(1000); delay(1000);
ESP.restart(); ESP.restart();
} }
if (strncmp(topic, generateButtonTopic("STOP").c_str(), topic_len) == 0) { if (strcmp(topic, generateButtonTopic("STOP").c_str()) == 0) {
setBatteryPause(true, false, true); setBatteryPause(true, false, true);
} }
} }