pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-22 21:18:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix TLS port bug on default mqtt validation

Browse Source
This commit is contained in:
Ben Meadors 2025-08-19 20:10:47 -05:00
parent 5de61b1a3d
commit c19f573b49
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mqtt/MQTT.cpp
View File

@ -279,6 +279,8 @@ struct PubSubConfig {
// Defaults // Defaults
static constexpr uint16_t defaultPort = 1883; static constexpr uint16_t defaultPort = 1883;
static constexpr uint16_t defaultPortTls = 8883;
uint16_t serverPort = defaultPort; uint16_t serverPort = defaultPort;
String serverAddr = default_mqtt_address; String serverAddr = default_mqtt_address;
const char *mqttUsername = default_mqtt_username; const char *mqttUsername = default_mqtt_username;
@ -641,7 +643,7 @@ bool MQTT::isValidConfig(const meshtastic_ModuleConfig_MQTTConfig &config, MQTTC
} }
const bool defaultServer = isDefaultServer(parsed.serverAddr); const bool defaultServer = isDefaultServer(parsed.serverAddr);
if (defaultServer && parsed.serverPort != PubSubConfig::defaultPort) { if (defaultServer && !IS_ONE_OF(parsed.serverPort, PubSubConfig::defaultPort, PubSubConfig::defaultPortTls)) {
const char *warning = "Invalid MQTT config: default server address must not have a port specified"; const char *warning = "Invalid MQTT config: default server address must not have a port specified";
LOG_ERROR(warning); LOG_ERROR(warning);
#if !IS_RUNNING_TESTS #if !IS_RUNNING_TESTS