* SimpleMeshTables: ACKs now handled separately

* Dispatcher: logging methods now with 'len' param

src/helpers/SimpleMeshTables.h

@@ -7,16 +7,21 @@
 #endif
 
 #define MAX_PACKET_HASHES  128
+#define MAX_PACKET_ACKS     64
 
 class SimpleMeshTables : public mesh::MeshTables {
   uint8_t _hashes[MAX_PACKET_HASHES*MAX_HASH_SIZE];
   int _next_idx;
+  uint32_t _acks[MAX_PACKET_ACKS];
+  int _next_ack_idx;
   uint32_t _direct_dups, _flood_dups;
 
 public:
   SimpleMeshTables() { 
     memset(_hashes, 0, sizeof(_hashes));
     _next_idx = 0;
+    memset(_acks, 0, sizeof(_acks));
+    _next_ack_idx = 0;
     _direct_dups = _flood_dups = 0;
   }
 
@@ -24,14 +29,37 @@ public:
   void restoreFrom(File f) {
     f.read(_hashes, sizeof(_hashes));
     f.read((uint8_t *) &_next_idx, sizeof(_next_idx));
+    f.read((uint8_t *) &_acks[0], sizeof(_acks));
+    f.read((uint8_t *) &_next_ack_idx, sizeof(_next_ack_idx));
   }
   void saveTo(File f) {
     f.write(_hashes, sizeof(_hashes));
     f.write((const uint8_t *) &_next_idx, sizeof(_next_idx));
+    f.write((const uint8_t *) &_acks[0], sizeof(_acks));
+    f.write((const uint8_t *) &_next_ack_idx, sizeof(_next_ack_idx));
   }
 #endif
 
   bool hasSeen(const mesh::Packet* packet) override {
+    if (packet->getPayloadType() == PAYLOAD_TYPE_ACK) {
+      uint32_t ack;
+      memcpy(&ack, packet->payload, 4);
+      for (int i = 0; i < MAX_PACKET_ACKS; i++) {
+        if (ack == _acks[i]) { 
+          if (packet->isRouteDirect()) {
+            _direct_dups++;   // keep some stats
+          } else {
+            _flood_dups++;
+          }
+          return true;
+        }
+      }
+  
+      _acks[_next_ack_idx] = ack;
+      _next_ack_idx = (_next_ack_idx + 1) % MAX_PACKET_ACKS;  // cyclic table  
+      return false;
+    }
+
     uint8_t hash[MAX_HASH_SIZE];
     packet->calculatePacketHash(hash);
 
@@ -49,7 +77,6 @@ public:
 
     memcpy(&_hashes[_next_idx*MAX_HASH_SIZE], hash, MAX_HASH_SIZE);
     _next_idx = (_next_idx + 1) % MAX_PACKET_HASHES;  // cyclic table
-
     return false;
   }