From db5a67229e7dd8db825ba14779542dc9b6727b11 Mon Sep 17 00:00:00 2001
From: Patrick Balsiger <frupii@gmail.com>
Date: Sun, 16 Sep 2018 17:09:36 +0200
Subject: [PATCH] check message validity

---
 src/base/MeshSprocket.h       | 14 ++++++++++----
 src/plugins/MeshManPlugin.cpp |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/base/MeshSprocket.h b/src/base/MeshSprocket.h
index fa6c55a..3021b45 100644
--- a/src/base/MeshSprocket.h
+++ b/src/base/MeshSprocket.h
@@ -35,13 +35,19 @@ class MeshSprocket : public Sprocket {
             //Serial.printf("MeshSprocket onMessage: received from %u msg=%s\n", from, msg.c_str());
             SprocketMessage sMsg;
             sMsg.fromJsonString(msg);
-            sMsg.from = from;
-            publish(sMsg.topic, sMsg.payload);
+            if(sMsg.valid){
+                sMsg.from = from;
+                publish(sMsg.topic, sMsg.payload);
+            }
         };
 
         void dispatch( uint32_t from, String &msg ) {
-            Sprocket::dispatch(from, msg);
-            onMessage(from, msg);
+           SprocketMessage sMsg;
+            sMsg.fromJsonString(msg);
+            if(sMsg.valid){
+                sMsg.from = from;
+                publish(sMsg.topic, sMsg.payload);
+            }
         }
 
         void loop() {
diff --git a/src/plugins/MeshManPlugin.cpp b/src/plugins/MeshManPlugin.cpp
index d9dc8a2..324907f 100644
--- a/src/plugins/MeshManPlugin.cpp
+++ b/src/plugins/MeshManPlugin.cpp
@@ -31,7 +31,7 @@ class MeshManPlugin : public Plugin {
             subscribe("mesh/heartbeat", std::bind(&MeshManPlugin::gotHeartbeat, this, std::placeholders::_1));
         }
         void gotHeartbeat(String msg){
-            Serial.println(String("Got heartbeat: ") + msg);
+            Serial.println(String("MeshManPlugin / Heartbeat: ") + msg);
         }
         void getMeshConnections(AsyncWebServerRequest *request) {
             request->send(200, "text/plain", net->mesh.subConnectionJson());