and some more...

Author: Shadowtrance

Documentation/espnow-v2.md

@@ -43,7 +43,7 @@ I [EspNowService] ESP-NOW version: 2.0
 
 ### Larger Messages
 
-- Message size increased from **127 to 1416 characters**
+- Message size increased from **127 to 1417 characters**
 - Variable-length packet transmission (only sends actual message length)
 - Backwards compatible: messages < 197 chars still work with v1.0 devices
 
@@ -69,7 +69,7 @@ Offset  Size   Field
 | `Tactility/Private/Tactility/app/chat/ChatProtocol.h` | `MESSAGE_SIZE` = 1417, added header constants |
 | `Tactility/Source/app/chat/ChatProtocol.cpp` | Variable-length serialize/deserialize |
 | `Tactility/Source/app/chat/ChatApp.cpp` | Send actual packet size |
-| `Tactility/Source/app/chat/ChatView.cpp` | Input field max length = 1416 |
+| `Tactility/Source/app/chat/ChatView.cpp` | Input field max length = 1417 |
 | `Documentation/chat.md` | Updated protocol documentation |
 
 ## Compatibility

Tactility/Include/Tactility/service/espnow/EspNow.h

@@ -61,7 +61,7 @@ void unsubscribeReceiver(ReceiverSubscription subscription);
 /** Get the ESP-NOW protocol version (1 for v1.0, 2 for v2.0). Returns 0 if service not running. */
 uint32_t getVersion();
 
-/** Get the maximum data length for current ESP-NOW version (250 for v1.0, 1470 for v2.0). */
+/** Get the maximum data length for current ESP-NOW version (250 for v1.0, 1470 for v2.0). Returns 0 if service not running. */
 size_t getMaxDataLength();
 
 }

Tactility/Source/app/chat/ChatApp.cpp

@@ -122,7 +122,8 @@ void ChatApp::sendMessage(const std::string& text) {
 void ChatApp::applySettings(const std::string& nickname, const std::string& keyHex) {
     bool needRestart = false;
 
-    settings.nickname = nickname;
+    // Trim nickname to protocol limit
+    settings.nickname = nickname.substr(0, SENDER_NAME_SIZE - 1);
 
     // Parse hex key
     if (keyHex.size() == ESP_NOW_KEY_LEN * 2) {
@@ -133,7 +134,9 @@ void ChatApp::applySettings(const std::string& nickname, const std::string& keyH
                 char hex[3] = { keyHex[i * 2], keyHex[i * 2 + 1], 0 };
                 newKey[i] = static_cast<uint8_t>(strtoul(hex, nullptr, 16));
             }
-            if (!std::equal(newKey, newKey + ESP_NOW_KEY_LEN, settings.encryptionKey.begin())) {
+            // Restart if key changed OR if encryption is being enabled
+            bool wasEnabled = settings.hasEncryptionKey;
+            if (!wasEnabled || !std::equal(newKey, newKey + ESP_NOW_KEY_LEN, settings.encryptionKey.begin())) {
                 std::copy(newKey, newKey + ESP_NOW_KEY_LEN, settings.encryptionKey.begin());
                 needRestart = true;
             }
@@ -151,7 +154,7 @@ void ChatApp::applySettings(const std::string& nickname, const std::string& keyH
         LOGGER.warn("Key must be exactly {} hex characters, got {}", ESP_NOW_KEY_LEN * 2, keyHex.size());
     }
 
-    state.setLocalNickname(nickname);
+    state.setLocalNickname(settings.nickname);
     saveSettings(settings);
 
     if (needRestart) {
@@ -161,8 +164,9 @@ void ChatApp::applySettings(const std::string& nickname, const std::string& keyH
 }
 
 void ChatApp::switchChannel(const std::string& chatChannel) {
-    state.setCurrentChannel(chatChannel);
-    settings.chatChannel = chatChannel;
+    const auto trimmedChannel = chatChannel.substr(0, TARGET_SIZE - 1);
+    state.setCurrentChannel(trimmedChannel);
+    settings.chatChannel = trimmedChannel;
     saveSettings(settings);
 
     {

Tactility/Source/app/chat/ChatProtocol.cpp

@@ -54,7 +54,7 @@ bool deserializeMessage(const uint8_t* data, int length, ParsedMessage& out) {
     // Calculate actual message length from packet size and ensure null termination
     size_t msgLen = length - MESSAGE_HEADER_SIZE;
     if (msgLen > 0 && msgLen < MESSAGE_SIZE) {
-        msg.message[msgLen] = '\0';  // Ensure null at end of received data
+        msg.message[msgLen] = '\0';  // Handle malformed packets missing null terminator
     }
     msg.message[MESSAGE_SIZE - 1] = '\0';  // Safety: ensure buffer is always terminated
 

Tactility/Source/app/chat/ChatSettings.cpp

@@ -16,7 +16,6 @@
 #include <iomanip>
 #include <map>
 #include <sstream>
-#include <string>
 #include <unistd.h>
 
 namespace tt::app::chat {
@@ -63,7 +62,7 @@ static bool readHex(const std::string& input, uint8_t* buffer, size_t length) {
 
 static bool encryptKey(const uint8_t key[ESP_NOW_KEY_LEN], std::string& hexOutput) {
     uint8_t iv[16];
-    crypt::getIv(IV_SEED, sizeof(IV_SEED) - 1, iv);
+    crypt::getIv(IV_SEED, std::strlen(IV_SEED), iv);
 
     uint8_t encrypted[ESP_NOW_KEY_LEN];
     if (crypt::encrypt(iv, key, encrypted, ESP_NOW_KEY_LEN) != 0) {
@@ -86,7 +85,7 @@ static bool decryptKey(const std::string& hexInput, uint8_t key[ESP_NOW_KEY_LEN]
     }
 
     uint8_t iv[16];
-    crypt::getIv(IV_SEED, sizeof(IV_SEED) - 1, iv);
+    crypt::getIv(IV_SEED, std::strlen(IV_SEED), iv);
 
     if (crypt::decrypt(iv, encrypted, key, ESP_NOW_KEY_LEN) != 0) {
         LOGGER.error("Failed to decrypt key");

Tactility/Source/service/espnow/EspNowService.cpp

@@ -74,16 +74,17 @@ void EspNowService::enableFromDispatcher(const EspNowConfig& config) {
         return;
     }
 
-//#if CONFIG_ESPNOW_ENABLE_POWER_SAVE
-//    ESP_ERROR_CHECK( esp_now_set_wake_window(CONFIG_ESPNOW_WAKE_WINDOW) );
-//    ESP_ERROR_CHECK( esp_wifi_connectionless_module_set_wake_interval(CONFIG_ESPNOW_WAKE_INTERVAL) );
-//#endif
+    //#if CONFIG_ESPNOW_ENABLE_POWER_SAVE
+    //    ESP_ERROR_CHECK( esp_now_set_wake_window(CONFIG_ESPNOW_WAKE_WINDOW) );
+    //    ESP_ERROR_CHECK( esp_wifi_connectionless_module_set_wake_interval(CONFIG_ESPNOW_WAKE_INTERVAL) );
+    //#endif
 
     if (esp_now_set_pmk(config.masterKey) != ESP_OK) {
         LOGGER.error("esp_now_set_pmk() failed");
         return;
     }
 
+    espnowVersion = 0;
     if (esp_now_get_version(&espnowVersion) == ESP_OK) {
         LOGGER.info("ESP-NOW version: {}.0", espnowVersion);
     } else {