Merge branch 'dev' into trace

# Conflicts:
#	src/Dispatcher.cpp
#	src/Mesh.cpp
#	src/helpers/BaseChatMesh.cpp

src/Mesh.h

@@ -8,6 +8,10 @@ namespace mesh {
  * An abstraction of the device's Realtime Clock.
 */
 class RTCClock {
+  uint32_t last_unique;
+protected:
+  RTCClock() { last_unique = 0; }
+
 public:
   /**
    * \returns  the current time. in UNIX epoch seconds.
@@ -18,6 +22,14 @@ public:
    * \param time  current time in UNIX epoch seconds.
   */
   virtual void setCurrentTime(uint32_t time) = 0;
+
+  uint32_t getCurrentTimeUnique() {
+    uint32_t t = getCurrentTime();
+    if (t <= last_unique) {
+      return ++last_unique;
+    }
+    return last_unique = t;
+  }
 };
 
 class GroupChannel {
@@ -46,6 +58,8 @@ class Mesh : public Dispatcher {
 protected:
   DispatcherAction onRecvPacket(Packet* pkt) override;
 
+  virtual uint32_t getCADFailRetryDelay() const override;
+
   /**
    * \brief  Decide what to do with received packet, ie. discard, forward, or hold
    */
@@ -62,6 +76,11 @@ protected:
    */
   virtual uint32_t getRetransmitDelay(const Packet* packet);
 
+  /**
+   * \returns  number of milliseconds delay to apply to retransmitting the given packet, for DIRECT mode.
+   */
+  virtual uint32_t getDirectRetransmitDelay(const Packet* packet);
+
   /**
    * \brief  Perform search of local DB of peers/contacts.
    * \returns  Number of peers with matching hash
@@ -123,6 +142,11 @@ protected:
   */
   virtual void onPathRecv(Packet* packet, Identity& sender, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) { }
 
+  /**
+   * \brief  A packet with PAYLOAD_TYPE_RAW_CUSTOM has been received.
+  */
+  virtual void onRawDataRecv(Packet* packet) { }
+
   /**
    * \brief  Perform search of local DB of matching GroupChannels.
    * \param  channels  OUT - store matching channels in this array, up to max_matches
@@ -149,6 +173,8 @@ protected:
   {
   }
 
+  MeshTables* getTables() const { return _tables; }
+
 public:
   void begin();
   void loop();
@@ -165,6 +191,7 @@ public:
   Packet* createAck(uint32_t ack_crc);
   Packet* createPathReturn(const uint8_t* dest_hash, const uint8_t* secret, const uint8_t* path, uint8_t path_len, uint8_t extra_type, const uint8_t*extra, size_t extra_len);
   Packet* createPathReturn(const Identity& dest, const uint8_t* secret, const uint8_t* path, uint8_t path_len, uint8_t extra_type, const uint8_t*extra, size_t extra_len);
+  Packet* createRawData(const uint8_t* data, size_t len);
 
   /**
    * \brief  send a locally-generated Packet with flood routing