more rename plugin to module

src/mesh/MeshPlugin.cpp

@@ -69,7 +69,7 @@ MeshPacket *MeshPlugin::allocErrorResponse(Routing_Error err, const MeshPacket *
 void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
 {
     // DEBUG_MSG("In call modules\n");
-    bool pluginFound = false;
+    bool moduleFound = false;
 
     // We now allow **encrypted** packets to pass through the modules
     bool isDecoded = mp.which_payloadVariant == MeshPacket_decoded_tag;
@@ -98,7 +98,7 @@ void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
         if (wantsPacket) {
             DEBUG_MSG("Module '%s' wantsPacket=%d\n", pi.name, wantsPacket);
 
-            pluginFound = true;
+            moduleFound = true;
 
             /// received channel (or NULL if not decoded)
             Channel *ch = isDecoded ? &channels.getByIndex(mp.channel) : NULL;
@@ -173,11 +173,11 @@ void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
             // SECURITY NOTE! I considered sending back a different error code if we didn't find the psk (i.e. !isDecoded)
             // but opted NOT TO.  Because it is not a good idea to let remote nodes 'probe' to find out which PSKs were "good" vs
             // bad.
-            routingPlugin->sendAckNak(Routing_Error_NO_RESPONSE, getFrom(&mp), mp.id, mp.channel);
+            routingModule->sendAckNak(Routing_Error_NO_RESPONSE, getFrom(&mp), mp.id, mp.channel);
         }
     }
 
-    if (!pluginFound)
+    if (!moduleFound)
         DEBUG_MSG("No modules interested in portnum=%d, src=%s\n",
                     mp.decoded.portnum,
                     (src == RX_SRC_LOCAL) ? "LOCAL":"REMOTE");
@@ -225,17 +225,17 @@ void setReplyTo(MeshPacket *p, const MeshPacket &to)
 std::vector<MeshPlugin *> MeshPlugin::GetMeshPluginsWithUIFrames()
 {
 
-    std::vector<MeshPlugin *> pluginsWithUIFrames;
+    std::vector<MeshPlugin *> modulesWithUIFrames;
     if (modules) {
         for (auto i = modules->begin(); i != modules->end(); ++i) {
             auto &pi = **i;
             if (pi.wantUIFrame()) {
                 DEBUG_MSG("Module wants a UI Frame\n");
-                pluginsWithUIFrames.push_back(&pi);
+                modulesWithUIFrames.push_back(&pi);
             }
         }
     }
-    return pluginsWithUIFrames;
+    return modulesWithUIFrames;
 }
 
 void MeshPlugin::observeUIEvents(
@@ -260,7 +260,7 @@ AdminMessageHandleResult MeshPlugin::handleAdminMessageForAllPlugins(const MeshP
     if (modules) {
         for (auto i = modules->begin(); i != modules->end(); ++i) {
             auto &pi = **i;
-            AdminMessageHandleResult h = pi.handleAdminMessageForPlugin(mp, request, response);
+            AdminMessageHandleResult h = pi.handleAdminMessageForModule(mp, request, response);
             if (h == AdminMessageHandleResult::HANDLED_WITH_RESPONSE)
             {
                 // In case we have a response it always has priority.

src/mesh/MeshPlugin.h

@@ -160,7 +160,7 @@ class MeshPlugin
    *   HANDLED if message was handled
    *   HANDLED_WITH_RESPONSE if a response is also prepared and to be sent.
    */
-    virtual AdminMessageHandleResult handleAdminMessageForPlugin(
+    virtual AdminMessageHandleResult handleAdminMessageForModule(
         const MeshPacket &mp, AdminMessage *request, AdminMessage *response) { return AdminMessageHandleResult::NOT_HANDLED; };
 
   private:

src/mesh/MeshService.cpp

@@ -115,10 +115,10 @@ void MeshService::reloadOwner()
     // DEBUG_MSG("reloadOwner()\n");
     // update our local data directly
     nodeDB.updateUser(nodeDB.getNodeNum(), owner);
-    assert(nodeInfoPlugin);
+    assert(nodeInfoModule);
     // update everyone else
-    if (nodeInfoPlugin)
-        nodeInfoPlugin->sendOurNodeInfo();
+    if (nodeInfoModule)
+        nodeInfoModule->sendOurNodeInfo();
     nodeDB.saveToDisk();
 }
 
@@ -175,14 +175,14 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
     assert(node);
 
     if (node->has_position) {
-        if (positionPlugin) {
+        if (positionModule) {
             DEBUG_MSG("Sending position ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
-            positionPlugin->sendOurPosition(dest, wantReplies);
+            positionModule->sendOurPosition(dest, wantReplies);
         }
     } else {
-        if (nodeInfoPlugin) {
+        if (nodeInfoModule) {
             DEBUG_MSG("Sending nodeinfo ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
-            nodeInfoPlugin->sendOurNodeInfo(dest, wantReplies);
+            nodeInfoModule->sendOurNodeInfo(dest, wantReplies);
         }
     }
 }

src/mesh/MeshService.h

@@ -91,7 +91,7 @@ class MeshService
     /// Handle a packet that just arrived from the radio.  This method does _ReliableRouternot_ free the provided packet.  If it
     /// needs to keep the packet around it makes a copy
     int handleFromRadio(const MeshPacket *p);
-    friend class RoutingPlugin;
+    friend class RoutingModule;
 };
 
 extern MeshService service;

src/mesh/Router.cpp

@@ -132,7 +132,7 @@ MeshPacket *Router::allocForSending()
  */
 void Router::sendAckNak(Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex)
 {
-    routingPlugin->sendAckNak(err, to, idFrom, chIndex);
+    routingModule->sendAckNak(err, to, idFrom, chIndex);
 }
 
 void Router::abortSendAndNak(Routing_Error err, MeshPacket *p)

src/mesh/Router.h

@@ -71,7 +71,7 @@ class Router : protected concurrency::OSThread
     void enqueueReceivedMessage(MeshPacket *p);
 
   protected:
-    friend class RoutingPlugin;
+    friend class RoutingModule;
 
     /**
      * Send a packet on a suitable interface.  This routine will
@@ -85,7 +85,7 @@ class Router : protected concurrency::OSThread
     /**
      * Should this incoming filter be dropped?
      *
-     * FIXME, move this into the new RoutingPlugin and do the filtering there using the regular module logic
+     * FIXME, move this into the new RoutingModule and do the filtering there using the regular module logic
      *
      * Called immedately on receiption, before any further processing.
      * @return true to abandon the packet