Merge pull request #73 from meshtastic/master

pulling 1.2 into my fork

src/plugins/AdminPlugin.cpp

@@ -0,0 +1,119 @@
+#include "AdminPlugin.h"
+#include "Channels.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "Router.h"
+#include "configuration.h"
+#include "main.h"
+
+AdminPlugin *adminPlugin;
+
+void AdminPlugin::handleGetChannel(const MeshPacket &req, uint32_t channelIndex) {
+        if (req.decoded.want_response) {
+        // We create the reply here
+        AdminMessage r = AdminMessage_init_default;
+        r.get_channel_response = channels.getByIndex(channelIndex);
+        r.which_variant = AdminMessage_get_channel_response_tag;
+        reply = allocDataProtobuf(r);
+    }
+}
+
+void AdminPlugin::handleGetRadio(const MeshPacket &req)
+{
+    if (req.decoded.want_response) {
+        // We create the reply here
+        AdminMessage r = AdminMessage_init_default;
+        r.get_radio_response = devicestate.radio;
+        r.which_variant = AdminMessage_get_radio_response_tag;
+        reply = allocDataProtobuf(r);
+    }
+}
+
+bool AdminPlugin::handleReceivedProtobuf(const MeshPacket &mp, const AdminMessage *r)
+{
+    assert(r);
+    switch (r->which_variant) {
+    case AdminMessage_set_owner_tag:
+        DEBUG_MSG("Client is setting owner\n");
+        handleSetOwner(r->set_owner);
+        break;
+
+    case AdminMessage_set_radio_tag:
+        DEBUG_MSG("Client is setting radio\n");
+        handleSetRadio(r->set_radio);
+        break;
+
+    case AdminMessage_set_channel_tag:
+        DEBUG_MSG("Client is setting channel\n");
+        handleSetChannel(r->set_channel);
+        break;
+
+    case AdminMessage_get_channel_request_tag:
+        DEBUG_MSG("Client is getting channel %d\n", r->get_channel_request - 1);
+        handleGetChannel(mp, r->get_channel_request - 1);
+        break;
+
+    case AdminMessage_get_radio_request_tag:
+        DEBUG_MSG("Client is getting radio\n");
+        handleGetRadio(mp);
+        break;
+
+    default:
+        break;
+    }
+    return false; // Let others look at this message also if they want
+}
+
+void AdminPlugin::handleSetOwner(const User &o)
+{
+    int changed = 0;
+
+    if (*o.long_name) {
+        changed |= strcmp(owner.long_name, o.long_name);
+        strcpy(owner.long_name, o.long_name);
+    }
+    if (*o.short_name) {
+        changed |= strcmp(owner.short_name, o.short_name);
+        strcpy(owner.short_name, o.short_name);
+    }
+    if (*o.id) {
+        changed |= strcmp(owner.id, o.id);
+        strcpy(owner.id, o.id);
+    }
+
+    if (changed) // If nothing really changed, don't broadcast on the network or write to flash
+        service.reloadOwner();
+}
+
+void AdminPlugin::handleSetChannel(const Channel &cc)
+{
+    channels.setChannel(cc);
+
+    bool didReset = service.reloadConfig();
+    /* FIXME - do we need this still?
+    if (didReset) {
+        state = STATE_SEND_MY_INFO; // Squirt a completely new set of configs to the client
+    } */
+}
+
+void AdminPlugin::handleSetRadio(const RadioConfig &r)
+{
+    radioConfig = r;
+
+    bool didReset = service.reloadConfig();
+    /* FIXME - do we need this still?  if (didReset) {
+        state = STATE_SEND_MY_INFO; // Squirt a completely new set of configs to the client
+    } */
+}
+
+MeshPacket *AdminPlugin::allocReply()
+{
+    auto r = reply;
+    reply = NULL; // Only use each reply once
+    return r;
+}
+
+AdminPlugin::AdminPlugin() : ProtobufPlugin("Admin", PortNum_ADMIN_APP, AdminMessage_fields)
+{
+    // FIXME, restrict to the admin channel for rx
+}

src/plugins/AdminPlugin.h

@@ -0,0 +1,37 @@
+#pragma once
+#include "ProtobufPlugin.h"
+
+/**
+ * Routing plugin for router control messages
+ */
+class AdminPlugin : public ProtobufPlugin<AdminMessage>
+{
+  MeshPacket *reply = NULL;
+  
+  public:
+    /** Constructor
+     * name is for debugging output
+     */
+    AdminPlugin();
+
+  protected:
+    /** Called to handle a particular incoming message
+
+    @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
+    */
+    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const AdminMessage *p);
+
+    /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
+     * so that subclasses can (optionally) send a response back to the original sender.  */
+    virtual MeshPacket *allocReply();
+
+  private:
+    void handleSetOwner(const User &o);
+    void handleSetChannel(const Channel &cc);
+    void handleSetRadio(const RadioConfig &r);
+
+    void handleGetChannel(const MeshPacket &req, uint32_t channelIndex);
+    void handleGetRadio(const MeshPacket &req);
+};
+
+extern AdminPlugin *adminPlugin;

src/plugins/ExternalNotificationPlugin.cpp

@@ -145,7 +145,7 @@ bool ExternalNotificationPluginRadio::handleReceived(const MeshPacket &mp)
 
     if (radioConfig.preferences.ext_notification_plugin_enabled) {
 
-        auto &p = mp.decoded.data;
+        auto &p = mp.decoded;
 
         if (mp.from != nodeDB.getNodeNum()) {
 

src/plugins/NodeInfoPlugin.cpp

@@ -8,10 +8,9 @@
 
 NodeInfoPlugin *nodeInfoPlugin;
 
-bool NodeInfoPlugin::handleReceivedProtobuf(const MeshPacket &mp, const User &p)
+bool NodeInfoPlugin::handleReceivedProtobuf(const MeshPacket &mp, const User *pptr)
 {
-    // FIXME - we currently update NodeInfo data in the DB only if the message was a broadcast or destined to us
-    // it would be better to update even if the message was destined to others.
+    auto p = *pptr;
 
     nodeDB.updateUser(mp.from, p);
 
@@ -52,6 +51,7 @@ MeshPacket *NodeInfoPlugin::allocReply()
 NodeInfoPlugin::NodeInfoPlugin()
     : ProtobufPlugin("nodeinfo", PortNum_NODEINFO_APP, User_fields), concurrency::OSThread("NodeInfoPlugin")
 {
+    isPromiscuous = true; // We always want to update our nodedb, even if we are sniffing on others
     setIntervalFromNow(30 *
                        1000); // Send our initial owner announcement 30 seconds after we start (to give network time to setup)
 }

src/plugins/NodeInfoPlugin.h

@@ -26,7 +26,7 @@ class NodeInfoPlugin : public ProtobufPlugin<User>, private concurrency::OSThrea
 
     @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
     */
-    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const User &p);
+    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const User *p);
 
     /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
      * so that subclasses can (optionally) send a response back to the original sender.  */

src/plugins/Plugins.cpp

@@ -3,8 +3,11 @@
 #include "plugins/PositionPlugin.h"
 #include "plugins/RemoteHardwarePlugin.h"
 #include "plugins/ReplyPlugin.h"
+#include "plugins/TextMessagePlugin.h" 
+#include "plugins/SerialPlugin.h"
 #include "plugins/TextMessagePlugin.h"
-
+#include "plugins/RoutingPlugin.h"
+#include "plugins/AdminPlugin.h"
 #ifndef NO_ESP32
 #include "plugins/SerialPlugin.h"
 #include "plugins/esp32/EnvironmentalMeasurementPlugin.h"
@@ -17,6 +20,8 @@
  */
 void setupPlugins()
 {
+    routingPlugin = new RoutingPlugin();
+    adminPlugin = new AdminPlugin();
     nodeInfoPlugin = new NodeInfoPlugin();
     positionPlugin = new PositionPlugin();
     textMessagePlugin = new TextMessagePlugin();

src/plugins/PositionPlugin.cpp

@@ -10,15 +10,15 @@ PositionPlugin *positionPlugin;
 PositionPlugin::PositionPlugin()
     : ProtobufPlugin("position", PortNum_POSITION_APP, Position_fields), concurrency::OSThread("PositionPlugin")
 {
+    isPromiscuous = true; // We always want to update our nodedb, even if we are sniffing on others
     setIntervalFromNow(60 *
                        1000); // Send our initial position 60 seconds after we start (to give GPS time to setup)
 
 }
 
-bool PositionPlugin::handleReceivedProtobuf(const MeshPacket &mp, const Position &p)
+bool PositionPlugin::handleReceivedProtobuf(const MeshPacket &mp, const Position *pptr)
 {
-    // FIXME - we currently update position data in the DB only if the message was a broadcast or destined to us
-    // it would be better to update even if the message was destined to others.
+    auto p = *pptr;
 
     if (p.time) {
         struct timeval tv;

src/plugins/PositionPlugin.h

@@ -33,7 +33,7 @@ class PositionPlugin : public ProtobufPlugin<Position>, private concurrency::OST
 
     @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
     */
-    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const Position &p);
+    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const Position *p);
 
     /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
      * so that subclasses can (optionally) send a response back to the original sender.  */

src/plugins/RemoteHardwarePlugin.cpp

@@ -47,8 +47,9 @@ RemoteHardwarePlugin::RemoteHardwarePlugin()
 {
 }
 
-bool RemoteHardwarePlugin::handleReceivedProtobuf(const MeshPacket &req, const HardwareMessage &p)
+bool RemoteHardwarePlugin::handleReceivedProtobuf(const MeshPacket &req, const HardwareMessage *pptr)
 {
+    auto p = *pptr;
     DEBUG_MSG("Received RemoteHardware typ=%d\n", p.typ);
 
     switch (p.typ) {

src/plugins/RemoteHardwarePlugin.h

@@ -27,7 +27,7 @@ class RemoteHardwarePlugin : public ProtobufPlugin<HardwareMessage>, private con
 
     @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
     */
-    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const HardwareMessage &p);
+    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const HardwareMessage *p);
 
     /**
      * Periodically read the gpios we have been asked to WATCH, if they have changed,

src/plugins/ReplyPlugin.cpp

@@ -9,7 +9,7 @@ MeshPacket *ReplyPlugin::allocReply()
 {
     assert(currentRequest); // should always be !NULL
     auto req = *currentRequest;
-    auto &p = req.decoded.data;
+    auto &p = req.decoded;
     // The incoming message is in p.payload
     DEBUG_MSG("Received message from=0x%0x, id=%d, msg=%.*s\n", req.from, req.id, p.payload.size, p.payload.bytes);
 
@@ -17,8 +17,8 @@ MeshPacket *ReplyPlugin::allocReply()
 
     const char *replyStr = "Message Received";
     auto reply = allocDataPacket();                      // Allocate a packet for sending
-    reply->decoded.data.payload.size = strlen(replyStr); // You must specify how many bytes are in the reply
-    memcpy(reply->decoded.data.payload.bytes, replyStr, reply->decoded.data.payload.size);
+    reply->decoded.payload.size = strlen(replyStr); // You must specify how many bytes are in the reply
+    memcpy(reply->decoded.payload.bytes, replyStr, reply->decoded.payload.size);
 
     return reply;
 }

src/plugins/RoutingPlugin.cpp

@@ -0,0 +1,60 @@
+#include "RoutingPlugin.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "Router.h"
+#include "configuration.h"
+#include "main.h"
+
+RoutingPlugin *routingPlugin;
+
+bool RoutingPlugin::handleReceivedProtobuf(const MeshPacket &mp, const Routing *r)
+{
+    DEBUG_MSG("Routing sniffing", &mp);
+    router->sniffReceived(&mp, r);
+
+    // FIXME - move this to a non promsicious PhoneAPI plugin?
+    if (mp.to == NODENUM_BROADCAST || mp.to == nodeDB.getNodeNum()) {
+        printPacket("Delivering rx packet", &mp);
+        service.handleFromRadio(&mp);
+    }
+        
+    return false; // Let others look at this message also if they want
+}
+
+
+MeshPacket *RoutingPlugin::allocReply()
+{
+    assert(currentRequest);
+
+    // We only consider making replies if the request was a legit routing packet (not just something we were sniffing)
+    if(currentRequest->decoded.portnum == PortNum_ROUTING_APP) {
+        assert(0); // 1.2 refactoring fixme, Not sure if anything needs this yet?
+        // return allocDataProtobuf(u);
+    }
+    return NULL;
+}
+
+void RoutingPlugin::sendAckNak(Routing_Error err, NodeNum to, PacketId idFrom)
+{
+    Routing c = Routing_init_default;
+    
+    c.error_reason = err;
+
+    auto p = allocDataProtobuf(c);
+    p->priority = MeshPacket_Priority_ACK;
+
+    p->hop_limit = 0; // Assume just immediate neighbors for now
+    p->to = to;
+    p->decoded.request_id = idFrom;
+    DEBUG_MSG("Sending an err=%d,to=0x%x,idFrom=0x%x,id=0x%x\n", err, to, idFrom, p->id);
+
+    router->sendLocal(p); // we sometimes send directly to the local node
+}
+
+RoutingPlugin::RoutingPlugin()
+    : ProtobufPlugin("routing", PortNum_ROUTING_APP, Routing_fields)
+{
+    isPromiscuous = true;
+}
+
+

src/plugins/RoutingPlugin.h

@@ -0,0 +1,34 @@
+#pragma once
+#include "ProtobufPlugin.h"
+
+/**
+ * Routing plugin for router control messages
+ */
+class RoutingPlugin : public ProtobufPlugin<Routing>
+{
+  public:
+    /** Constructor
+     * name is for debugging output
+     */
+    RoutingPlugin();
+
+  protected:
+    friend class Router;
+
+    /** Called to handle a particular incoming message
+
+    @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
+    */
+    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const Routing *p);
+
+    /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
+     * so that subclasses can (optionally) send a response back to the original sender.  */
+    virtual MeshPacket *allocReply(); 
+
+    /// Override wantPacket to say we want to see all packets, not just those for our port number
+    virtual bool wantPacket(const MeshPacket *p) { return true; }
+
+    void sendAckNak(Routing_Error err, NodeNum to, PacketId idFrom);
+};
+
+extern RoutingPlugin *routingPlugin;

src/plugins/SerialPlugin.cpp

@@ -144,8 +144,8 @@ void SerialPluginRadio::sendPayload(NodeNum dest, bool wantReplies)
 
     p->want_ack = SERIALPLUGIN_ACK;
 
-    p->decoded.data.payload.size = strlen(serialStringChar); // You must specify how many bytes are in the reply
-    memcpy(p->decoded.data.payload.bytes, serialStringChar, p->decoded.data.payload.size);
+    p->decoded.payload.size = strlen(serialStringChar); // You must specify how many bytes are in the reply
+    memcpy(p->decoded.payload.bytes, serialStringChar, p->decoded.payload.size);
 
     service.sendToMesh(p);
 }
@@ -156,7 +156,7 @@ bool SerialPluginRadio::handleReceived(const MeshPacket &mp)
 
     if (radioConfig.preferences.serialplugin_enabled) {
 
-        auto &p = mp.decoded.data;
+        auto &p = mp.decoded;
         // DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
         //          nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
 

src/plugins/TextMessagePlugin.cpp

@@ -7,7 +7,7 @@ TextMessagePlugin *textMessagePlugin;
 
 bool TextMessagePlugin::handleReceived(const MeshPacket &mp)
 {
-    auto &p = mp.decoded.data;
+    auto &p = mp.decoded;
     DEBUG_MSG("Received text msg from=0x%0x, id=%d, msg=%.*s\n", mp.from, mp.id, p.payload.size, p.payload.bytes);
 
     // We only store/display messages destined for us.

src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp

@@ -149,8 +149,10 @@ String GetSenderName(const MeshPacket &mp) {
     return sender;
 }
 
-bool EnvironmentalMeasurementPluginRadio::handleReceivedProtobuf(const MeshPacket &mp, const EnvironmentalMeasurement &p)
+bool EnvironmentalMeasurementPluginRadio::handleReceivedProtobuf(const MeshPacket &mp, const EnvironmentalMeasurement *pptr)
 {
+    const EnvironmentalMeasurement &p = *pptr;
+    
     if (!(radioConfig.preferences.environmental_measurement_plugin_measurement_enabled || radioConfig.preferences.environmental_measurement_plugin_screen_enabled)){
         // If this plugin is not enabled in any capacity, don't handle the packet, and allow other plugins to consume 
          return false;

src/plugins/esp32/EnvironmentalMeasurementPlugin.h

@@ -47,7 +47,7 @@ class EnvironmentalMeasurementPluginRadio : public ProtobufPlugin<EnvironmentalM
 
     @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
     */
-    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const EnvironmentalMeasurement &p);
+    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const EnvironmentalMeasurement *p);
 
     virtual bool wantUIFrame();
 

src/plugins/esp32/RangeTestPlugin.cpp

@@ -114,8 +114,8 @@ void RangeTestPluginRadio::sendPayload(NodeNum dest, bool wantReplies)
     static char heartbeatString[20];
     snprintf(heartbeatString, sizeof(heartbeatString), "seq %d", packetSequence);
 
-    p->decoded.data.payload.size = strlen(heartbeatString); // You must specify how many bytes are in the reply
-    memcpy(p->decoded.data.payload.bytes, heartbeatString, p->decoded.data.payload.size);
+    p->decoded.payload.size = strlen(heartbeatString); // You must specify how many bytes are in the reply
+    memcpy(p->decoded.payload.bytes, heartbeatString, p->decoded.payload.size);
 
     service.sendToMesh(p);
 
@@ -129,7 +129,7 @@ bool RangeTestPluginRadio::handleReceived(const MeshPacket &mp)
 
     if (radioConfig.preferences.range_test_plugin_enabled) {
 
-        auto &p = mp.decoded.data;
+        auto &p = mp.decoded;
         // DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
         //          nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
 
@@ -207,7 +207,7 @@ float RangeTestPluginRadio::latLongToMeter(double lat_a, double lng_a, double la
 
 bool RangeTestPluginRadio::appendFile(const MeshPacket &mp)
 {
-    auto &p = mp.decoded.data;
+    auto &p = mp.decoded;
 
     NodeInfo *n = nodeDB.getNode(mp.from);
     /*

src/plugins/esp32/StoreForwardPlugin.cpp

@@ -190,7 +190,7 @@ void StoreForwardPlugin::historyAdd(const MeshPacket *mp)
     auto &p = mp;
 
     static uint8_t bytes[MAX_RHPACKETLEN];
-    size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), SubPacket_fields, &p->decoded);
+    size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), Data_fields, &p->decoded);
     assert(numbytes <= MAX_RHPACKETLEN);
 
     DEBUG_MSG("MP numbytes %u\n", numbytes);
@@ -271,37 +271,37 @@ bool StoreForwardPluginRadio::handleReceived(const MeshPacket &mp)
             uint32_t sawTime = storeForwardPlugin->sawNode(mp.from & 0xffffffff);
             DEBUG_MSG("We last saw this node (%u), %u sec ago\n", mp.from & 0xffffffff, (millis() - sawTime) / 1000);
 
-            if (mp.decoded.data.portnum == PortNum_UNKNOWN_APP) {
+            if (mp.decoded.portnum == PortNum_UNKNOWN_APP) {
                 DEBUG_MSG("Packet came from - PortNum_UNKNOWN_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_TEXT_MESSAGE_APP) {
+            } else if (mp.decoded.portnum == PortNum_TEXT_MESSAGE_APP) {
                 DEBUG_MSG("Packet came from - PortNum_TEXT_MESSAGE_APP\n");
 
                 storeForwardPlugin->historyAdd(&mp);
 
-            } else if (mp.decoded.data.portnum == PortNum_REMOTE_HARDWARE_APP) {
+            } else if (mp.decoded.portnum == PortNum_REMOTE_HARDWARE_APP) {
                 DEBUG_MSG("Packet came from - PortNum_REMOTE_HARDWARE_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_POSITION_APP) {
+            } else if (mp.decoded.portnum == PortNum_POSITION_APP) {
                 DEBUG_MSG("Packet came from - PortNum_POSITION_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_NODEINFO_APP) {
+            } else if (mp.decoded.portnum == PortNum_NODEINFO_APP) {
                 DEBUG_MSG("Packet came from - PortNum_NODEINFO_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_REPLY_APP) {
+            } else if (mp.decoded.portnum == PortNum_REPLY_APP) {
                 DEBUG_MSG("Packet came from - PortNum_REPLY_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_IP_TUNNEL_APP) {
+            } else if (mp.decoded.portnum == PortNum_IP_TUNNEL_APP) {
                 DEBUG_MSG("Packet came from - PortNum_IP_TUNNEL_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_SERIAL_APP) {
+            } else if (mp.decoded.portnum == PortNum_SERIAL_APP) {
                 DEBUG_MSG("Packet came from - PortNum_SERIAL_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_STORE_FORWARD_APP) {
+            } else if (mp.decoded.portnum == PortNum_STORE_FORWARD_APP) {
                 DEBUG_MSG("Packet came from - PortNum_STORE_FORWARD_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_RANGE_TEST_APP) {
+            } else if (mp.decoded.portnum == PortNum_RANGE_TEST_APP) {
                 DEBUG_MSG("Packet came from - PortNum_RANGE_TEST_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_PRIVATE_APP) {
+            } else if (mp.decoded.portnum == PortNum_PRIVATE_APP) {
                 DEBUG_MSG("Packet came from - PortNum_PRIVATE_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_RANGE_TEST_APP) {
+            } else if (mp.decoded.portnum == PortNum_RANGE_TEST_APP) {
                 DEBUG_MSG("Packet came from - PortNum_RANGE_TEST_APP\n");
-            } else if (mp.decoded.data.portnum == PortNum_ATAK_FORWARDER) {
+            } else if (mp.decoded.portnum == PortNum_ATAK_FORWARDER) {
                 DEBUG_MSG("Packet came from - PortNum_ATAK_FORWARDER\n");
             } else {
-                DEBUG_MSG("Packet came from an unknown port %u\n", mp.decoded.data.portnum);
+                DEBUG_MSG("Packet came from an unknown port %u\n", mp.decoded.portnum);
             }
 
             if ((millis() - sawTime) > STOREFORWARD_SEND_HISTORY_SHORT) {