Compare commits
No commits in common. "main" and "fix/wifi-manager-dangling-pointer" have entirely different histories.
main
...
fix/wifi-m
@ -17,7 +17,6 @@ MQTTBridge::MQTTBridge(INetworkManager* network, mesh::PacketManager* mgr, mesh:
|
||||
_last_status_publish(0),
|
||||
_last_stats_publish(0),
|
||||
_connected_since(0),
|
||||
_current_backoff_ms(BACKOFF_MIN_MS),
|
||||
_messages_sent(0),
|
||||
_messages_received(0),
|
||||
_reconnect_count(0),
|
||||
@ -46,11 +45,10 @@ void MQTTBridge::begin(const MQTTConfig& config, const uint8_t* self_pubkey) {
|
||||
if (_config.use_tls) {
|
||||
_wifi_client_secure.setInsecure(); // Skip cert verification
|
||||
_mqtt_client.setClient(_wifi_client_secure);
|
||||
Serial.println("[MQTT] TLS enabled");
|
||||
Serial.println("[MQTT] WARNING: Certificate verification DISABLED - vulnerable to MITM attacks!");
|
||||
Serial.printf("[MQTT] TLS enabled\n");
|
||||
} else {
|
||||
_mqtt_client.setClient(_wifi_client);
|
||||
Serial.println("[MQTT] Plain TCP (no encryption)");
|
||||
Serial.printf("[MQTT] Plain TCP\n");
|
||||
}
|
||||
|
||||
_mqtt_client.setServer(_config.broker, _config.port);
|
||||
@ -75,15 +73,14 @@ void MQTTBridge::loop() {
|
||||
if (!_network->isConnected()) {
|
||||
if (_state == MQTTState::CONNECTED) {
|
||||
_state = MQTTState::DISCONNECTED;
|
||||
Serial.println("[MQTT] Network connection lost, disconnecting");
|
||||
Serial.println("[MQTTS] WiFi lost, disconnected");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
switch (_state) {
|
||||
case MQTTState::DISCONNECTED:
|
||||
// Use exponential backoff for reconnection attempts
|
||||
if (millis() - _last_connect_attempt > _current_backoff_ms) {
|
||||
if (millis() - _last_connect_attempt > 5000) {
|
||||
attemptConnection();
|
||||
}
|
||||
break;
|
||||
@ -94,9 +91,8 @@ void MQTTBridge::loop() {
|
||||
case MQTTState::CONNECTED:
|
||||
if (!_mqtt_client.connected()) {
|
||||
_state = MQTTState::DISCONNECTED;
|
||||
Serial.println("[MQTT] Connection lost");
|
||||
Serial.println("[MQTTS] Connection lost");
|
||||
_last_connect_attempt = millis();
|
||||
// Don't reset backoff on connection loss - broker might be down
|
||||
} else {
|
||||
_mqtt_client.loop();
|
||||
|
||||
@ -108,8 +104,7 @@ void MQTTBridge::loop() {
|
||||
break;
|
||||
|
||||
case MQTTState::ERROR:
|
||||
// Use backoff for error recovery too
|
||||
if (millis() - _last_connect_attempt > _current_backoff_ms) {
|
||||
if (millis() - _last_connect_attempt > 30000) {
|
||||
_state = MQTTState::DISCONNECTED;
|
||||
}
|
||||
break;
|
||||
@ -130,7 +125,7 @@ void MQTTBridge::end() {
|
||||
|
||||
_state = MQTTState::DISCONNECTED;
|
||||
_initialized = false;
|
||||
Serial.println("[MQTT] Stopped");
|
||||
Serial.println("[MQTTS] Stopped");
|
||||
}
|
||||
|
||||
void MQTTBridge::attemptConnection() {
|
||||
@ -139,8 +134,7 @@ void MQTTBridge::attemptConnection() {
|
||||
_state = MQTTState::CONNECTING;
|
||||
_last_connect_attempt = millis();
|
||||
|
||||
Serial.printf("[MQTT] Connecting to %s:%d (backoff=%lums)...\n",
|
||||
_config.broker, _config.port, _current_backoff_ms);
|
||||
Serial.printf("[MQTTS] Connecting to %s:%d...\n", _config.broker, _config.port);
|
||||
|
||||
String client_id = String(_config.client_id);
|
||||
if (client_id.length() == 0) {
|
||||
@ -163,41 +157,15 @@ void MQTTBridge::attemptConnection() {
|
||||
_state = MQTTState::CONNECTED;
|
||||
_connected_since = millis();
|
||||
_reconnect_count++;
|
||||
// Reset backoff on successful connection
|
||||
_current_backoff_ms = BACKOFF_MIN_MS;
|
||||
Serial.println("[MQTT] Connected!");
|
||||
Serial.println("[MQTTS] Connected!");
|
||||
|
||||
subscribeToCommands();
|
||||
publishStatus();
|
||||
_last_status_publish = millis();
|
||||
} else {
|
||||
int rc = _mqtt_client.state();
|
||||
const char* error_str = getMQTTErrorString(rc);
|
||||
Serial.printf("[MQTT] Connection failed: %s (code %d)\n", error_str, rc);
|
||||
Serial.printf("[MQTT] Broker: %s:%d, User: %s\n", _config.broker, _config.port,
|
||||
strlen(_config.user) > 0 ? _config.user : "(none)");
|
||||
Serial.printf("[MQTTS] Connection failed, rc=%d\n", rc);
|
||||
_state = MQTTState::ERROR;
|
||||
|
||||
// Exponential backoff: double the delay (up to max)
|
||||
_current_backoff_ms = min(_current_backoff_ms * BACKOFF_MULTIPLIER, BACKOFF_MAX_MS);
|
||||
Serial.printf("[MQTTS] Next retry in %lums\n", _current_backoff_ms);
|
||||
}
|
||||
}
|
||||
|
||||
const char* MQTTBridge::getMQTTErrorString(int rc) {
|
||||
// PubSubClient state() return codes
|
||||
switch (rc) {
|
||||
case -4: return "Connection timeout";
|
||||
case -3: return "Connection lost";
|
||||
case -2: return "Connect failed (network)";
|
||||
case -1: return "Disconnected cleanly";
|
||||
case 0: return "Connected";
|
||||
case 1: return "Bad protocol version";
|
||||
case 2: return "Client ID rejected";
|
||||
case 3: return "Server unavailable";
|
||||
case 4: return "Bad credentials (check username/password)";
|
||||
case 5: return "Not authorized";
|
||||
default: return "Unknown error";
|
||||
}
|
||||
}
|
||||
|
||||
@ -220,7 +188,7 @@ void MQTTBridge::subscribeToCommands() {
|
||||
char topic[100];
|
||||
snprintf(topic, sizeof(topic), "%s#", _topic_cmd_prefix);
|
||||
_mqtt_client.subscribe(topic);
|
||||
Serial.printf("[MQTT] Subscribed to: %s\n", topic);
|
||||
Serial.printf("[MQTTS] Subscribed to: %s\n", topic);
|
||||
}
|
||||
|
||||
void MQTTBridge::updateConfig(const MQTTConfig& config) {
|
||||
@ -365,7 +333,7 @@ void MQTTBridge::publishMessage(const char* topic, const char* payload, bool ret
|
||||
if (_mqtt_client.publish(topic, payload, retained)) {
|
||||
_messages_sent++;
|
||||
} else {
|
||||
Serial.printf("[MQTT] Publish failed to %s\n", topic);
|
||||
Serial.printf("[MQTTS] Publish failed to %s\n", topic);
|
||||
}
|
||||
}
|
||||
|
||||
@ -412,10 +380,10 @@ void MQTTBridge::handleMessage(char* topic, uint8_t* payload, unsigned int lengt
|
||||
|
||||
if (strncmp(topic, _topic_cmd_prefix, strlen(_topic_cmd_prefix)) == 0) {
|
||||
const char* cmd = topic + strlen(_topic_cmd_prefix);
|
||||
Serial.printf("[MQTT] Command received: %s\n", cmd);
|
||||
Serial.printf("[MQTTS] Command received: %s\n", cmd);
|
||||
|
||||
if (strcmp(cmd, "reboot") == 0) {
|
||||
Serial.println("[MQTT] Reboot requested");
|
||||
Serial.println("[MQTTS] Reboot requested");
|
||||
publishStatus();
|
||||
delay(100);
|
||||
ESP.restart();
|
||||
|
||||
@ -85,12 +85,6 @@ private:
|
||||
unsigned long _last_stats_publish;
|
||||
unsigned long _connected_since;
|
||||
|
||||
// Exponential backoff for reconnection
|
||||
static constexpr uint32_t BACKOFF_MIN_MS = 1000; // Start at 1 second
|
||||
static constexpr uint32_t BACKOFF_MAX_MS = 60000; // Max 60 seconds
|
||||
static constexpr uint32_t BACKOFF_MULTIPLIER = 2; // Double each attempt
|
||||
uint32_t _current_backoff_ms;
|
||||
|
||||
uint32_t _messages_sent;
|
||||
uint32_t _messages_received;
|
||||
uint32_t _reconnect_count;
|
||||
@ -117,9 +111,6 @@ private:
|
||||
void publishMessage(const char* topic, const char* payload, bool retained = false);
|
||||
void publishJson(const char* topic, JsonDocument& doc, bool retained = false);
|
||||
|
||||
// Error code translation for better diagnostics
|
||||
static const char* getMQTTErrorString(int rc);
|
||||
|
||||
static uint32_t fnv1a_hash(const uint8_t* data, size_t len);
|
||||
bool isDuplicate(const uint8_t* data, size_t len);
|
||||
|
||||
|
||||
@ -733,21 +733,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
|
||||
_prefs.adc_multiplier = 0.0f; // 0.0f means use default board multiplier
|
||||
}
|
||||
|
||||
MyMesh::~MyMesh() {
|
||||
// Clean up dynamically allocated resources
|
||||
#ifdef WITH_MQTT
|
||||
delete _web_config;
|
||||
_web_config = nullptr;
|
||||
delete _mqtt_bridge;
|
||||
_mqtt_bridge = nullptr;
|
||||
#endif
|
||||
|
||||
#ifdef WITH_ETHERNET
|
||||
delete _mqtt_bridge;
|
||||
_mqtt_bridge = nullptr;
|
||||
#endif
|
||||
}
|
||||
|
||||
void MyMesh::begin(FILESYSTEM *fs) {
|
||||
mesh::Mesh::begin();
|
||||
_fs = fs;
|
||||
|
||||
11
src/MyMesh.h
11
src/MyMesh.h
@ -125,21 +125,21 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
|
||||
|
||||
#ifdef WITH_MQTT
|
||||
WiFiManager _wifi_mgr;
|
||||
MQTTBridge* _mqtt_bridge = nullptr;
|
||||
WebConfig* _web_config = nullptr;
|
||||
MQTTBridge* _mqtt_bridge;
|
||||
WebConfig* _web_config;
|
||||
WiFiConfig _wifi_config;
|
||||
MQTTConfig _mqtt_config;
|
||||
unsigned long _last_mqtt_stats = 0;
|
||||
unsigned long _last_mqtt_stats;
|
||||
|
||||
void initMQTT();
|
||||
#endif
|
||||
|
||||
#ifdef WITH_ETHERNET
|
||||
EthernetManager _eth_mgr;
|
||||
MQTTBridge* _mqtt_bridge = nullptr;
|
||||
MQTTBridge* _mqtt_bridge;
|
||||
MQTTConfig _mqtt_config;
|
||||
EthernetConfig _eth_config;
|
||||
unsigned long _last_mqtt_stats = 0;
|
||||
unsigned long _last_mqtt_stats;
|
||||
|
||||
void initEthernet();
|
||||
#endif
|
||||
@ -196,7 +196,6 @@ protected:
|
||||
|
||||
public:
|
||||
MyMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables);
|
||||
~MyMesh(); // Clean up dynamically allocated resources
|
||||
|
||||
void begin(FILESYSTEM* fs);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user