- Make connectionQueue(), latestTransmissionOutcomes() and latestTransmissionSuccessful() methods static in order to match the underlying data storage.

- Make it possible to transfer elements directly between connectionQueues.

- Add defaultBSSID value.

- Fix bug where encrypted Espnow-connections expired 1 ms too late.

- Add MutexTracker::captureBan() functionality and use it in the espnowReceiveCallbackWrapper method to ensure a consistent mutex environment there.

- Rename acceptRequest to acceptRequests since several requests can be accepted, not just one.

- Reorganize EspnowMeshBackend.cpp.

- Split sendEspnowResponses() method into sendEspnowResponses() and sendPeerRequestConfirmations().

- Add sendStoredEspnowMessages() method to provide the same functionality as the previous version of sendEspnowResponses().

- Add logic for handling peerRequestConfirmations received at the same time as a peer request is being made, to avoid lockups when there are simultaneous cyclic peer requests.

- Add logic for handling simultaneous reciprocal peer requests.

- Include MAC addresses in HMAC calculations for peer requests and use HMAC for all unencrypted peer request messages, to make sure we receive valid MAC combinations.

- Add asserts to ensure ESP-NOW encryption integrity during code changes.

- Add estimatedMaxDuration argument to performEspnowMaintainance and related methods.

- Add methods to EncryptedConnectionData for setting peer MAC.

- Remove createEncryptionRequestMessage function from JsonTranslator since it is not used, to increase clarity.

- Add encryptedConnectionsSoftLimit() and related functionality.

- Add mutex to protect connectionQueue usage during attemptTransmission.

- Add _ongoingPeerRequestMac variable.

- Add reservedEncryptedConnections() method.

- Add TransmissionOutcomesUpdateHook() callback.

- Add constConnectionQueue() method to allow connectionQueue usage while connectionQueue mutex is active.

- Rearrange attemptAutoEncryptingTransmission argument order to increase efficiency.

- Add functionality for serializing the unencrypted ESP-NOW connection.

- Add some constness.

- Improve comments.

- Improve documentation.

- Update keywords.txt.

Author: aerlon

libraries/ESP8266WiFiMesh/keywords.txt

@@ -12,9 +12,6 @@ ESP8266WiFiMesh	KEYWORD3
 # Datatypes (KEYWORD1)
 #######################################
 
-ESP8266WiFiMesh	KEYWORD1
-NetworkInfo	KEYWORD1
-TransmissionResult	KEYWORD1
 transmission_status_t	KEYWORD1
 
 #######################################
@@ -41,7 +38,7 @@ getSSID	KEYWORD2
 setMessage	KEYWORD2
 getMessage	KEYWORD2
 attemptTransmission	KEYWORD2
-acceptRequest	KEYWORD2
+acceptRequests	KEYWORD2
 setStaticIP	KEYWORD2
 getStaticIP	KEYWORD2
 disableStaticIP->KEYWORD2

libraries/ESP8266WiFiMesh/src/EncryptedConnectionData.cpp

@@ -89,6 +89,11 @@ uint8_t *EncryptedConnectionData::getPeerApMac(uint8_t *resultArray) const
   return resultArray;
 }
 
+void EncryptedConnectionData::setPeerApMac(const uint8_t *peerApMac)
+{
+  std::copy_n(peerApMac, 6, _peerApMac);
+}
+
 bool EncryptedConnectionData::connectedTo(const uint8_t *peerMac) const
 {
   if(macEqual(peerMac, _peerStaMac) || macEqual(peerMac, _peerApMac))
@@ -146,10 +151,10 @@ bool EncryptedConnectionData::desync() const { return _desync; }
 
 String EncryptedConnectionData::serialize() const
 {
-  // Returns: {"connectionState":{"duration":"123","password":"abc","ownSessionKey":"1A2","peerSessionKey":"3B4","peerStaMac":"F2","peerApMac":"E3"}}
+  // Returns: {"connectionState":{"duration":"123","password":"abc","ownSK":"1A2","peerSK":"3B4","peerStaMac":"F2","peerApMac":"E3"}}
 
   return 
-  "{\"connectionState\":{"
+  JsonTranslator::jsonConnectionState
   + (temporary() ? JsonTranslator::jsonDuration + "\"" + String(temporary()->remainingDuration()) + "\"," : "")
   + JsonTranslator::jsonDesync + "\"" + String(desync()) + "\"," 
   + JsonTranslator::jsonOwnSessionKey + "\"" + uint64ToString(getOwnSessionKey()) + "\"," 

libraries/ESP8266WiFiMesh/src/EncryptedConnectionData.h

@@ -55,7 +55,9 @@ class EncryptedConnectionData {
 
   // @param resultArray At least size 6.
   uint8_t *getPeerStaMac(uint8_t *resultArray) const;
+  void setPeerStaMac(const uint8_t *peerStaMac) = delete; // A method for setPeerStaMac would sometimes require interacting with the ESP-NOW API to change encrypted connections, so it is not implemented.
   uint8_t *getPeerApMac(uint8_t *resultArray) const;
+  void setPeerApMac(const uint8_t *peerApMac);
 
   bool connectedTo(const uint8_t *peerMac) const;