Convert MQTT server to hostname:port

This commit is contained in:
Ben Meadors 2021-07-01 16:57:50 -05:00 committed by GitHub
parent 753ae00ddb
commit 3ea03dadb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -62,12 +62,17 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), pubSub(mqttClient)
void MQTT::reconnect()
{
// pubSub.setServer("devsrv.ezdevice.net", 1883); or 192.168.10.188
const char *serverAddr = "mqtt.meshtastic.org"; // default hostname
const char *serverAddr = "mqtt.meshtastic.org:1883"; // default hostname
if (*radioConfig.preferences.mqtt_server)
serverAddr = radioConfig.preferences.mqtt_server; // Override the default
pubSub.setServer(serverAddr, 1883);
String server = String(serverAddr);
int delimIndex = server.indexOf(':');
String host = server.substring(0, delimIndex);
String port = server.substring(delimIndex+1, server.length());
pubSub.setServer(host.c_str(), port.toInt());
DEBUG_MSG("Connecting to MQTT server\n", serverAddr);
auto myStatus = (statusTopic + owner.id);