admin ops

src/plugins/AdminPlugin.cpp

@@ -0,0 +1,93 @@
+#include "AdminPlugin.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "Router.h"
+#include "configuration.h"
+#include "main.h"
+#include "Channels.h"
+
+AdminPlugin *adminPlugin;
+
+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;
+    }
+    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()
+{
+    assert(0); // 1.2 refactoring fixme, Not sure if anything needs this yet?
+    // return allocDataProtobuf(u);
+    return NULL;
+}
+
+AdminPlugin::AdminPlugin()
+    : ProtobufPlugin("Admin", PortNum_ADMIN_APP, AdminMessage_fields)
+{ 
+    // FIXME, restrict to the admin channel for rx
+}
+
+
+

src/plugins/AdminPlugin.h

@@ -0,0 +1,32 @@
+#pragma once
+#include "ProtobufPlugin.h"
+
+/**
+ * Routing plugin for router control messages
+ */
+class AdminPlugin : public ProtobufPlugin<AdminMessage>
+{
+  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);
+};
+
+extern AdminPlugin *adminPlugin;

src/plugins/Plugins.cpp

@@ -8,6 +8,7 @@
 #include "plugins/StoreForwardPlugin.h"
 #include "plugins/TextMessagePlugin.h"
 #include "plugins/RoutingPlugin.h"
+#include "plugins/AdminPlugin.h"
 
 /**
  * Create plugin instances here.  If you are adding a new plugin, you must 'new' it here (or somewhere else)
@@ -15,6 +16,7 @@
 void setupPlugins()
 {
     routingPlugin = new RoutingPlugin();
+    adminPlugin = new AdminPlugin();
     nodeInfoPlugin = new NodeInfoPlugin();
     positionPlugin = new PositionPlugin();
     textMessagePlugin = new TextMessagePlugin();

src/plugins/RoutingPlugin.cpp

@@ -1,7 +1,6 @@
 #include "RoutingPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "RTC.h"
 #include "Router.h"
 #include "configuration.h"
 #include "main.h"
@@ -53,7 +52,7 @@ void RoutingPlugin::sendAckNak(Routing_Error err, NodeNum to, PacketId idFrom)
 }
 
 RoutingPlugin::RoutingPlugin()
-    : ProtobufPlugin("routing", PortNum_ROUTING_APP, User_fields)
+    : ProtobufPlugin("routing", PortNum_ROUTING_APP, Routing_fields)
 {
     isPromiscuous = true;
 }