fix: gate module replies by request port (#11094)

src/modules/SerialModule.cpp

@@ -109,7 +109,7 @@ bool SerialModule::isValidConfig(const meshtastic_ModuleConfig_SerialConfig &con
     return true;
 }
 
-SerialModuleRadio::SerialModuleRadio() : MeshModule("SerialModuleRadio")
+SerialModuleRadio::SerialModuleRadio() : SinglePortModule("SerialModuleRadio", meshtastic_PortNum_SERIAL_APP)
 {
     switch (moduleConfig.serial.mode) {
     case meshtastic_ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG:
@@ -330,18 +330,6 @@ void SerialModule::sendTelemetry(meshtastic_Telemetry m)
     service->sendToMesh(p, RX_SRC_LOCAL, true);
 }
 
-/**
- * Allocates a new mesh packet for use as a reply to a received packet.
- *
- * @return A pointer to the newly allocated mesh packet.
- */
-meshtastic_MeshPacket *SerialModuleRadio::allocReply()
-{
-    auto reply = allocDataPacket(); // Allocate a packet for sending
-
-    return reply;
-}
-
 /**
  * Sends a payload to a specified destination node.
  *
@@ -351,7 +339,7 @@ meshtastic_MeshPacket *SerialModuleRadio::allocReply()
 void SerialModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
 {
     const meshtastic_Channel *ch = (boundChannel != NULL) ? &channels.getByName(boundChannel) : NULL;
-    meshtastic_MeshPacket *p = allocReply();
+    meshtastic_MeshPacket *p = allocDataPacket();
     if (!p)
         return;
     p->to = dest;

src/modules/SerialModule.h

@@ -40,7 +40,7 @@ extern SerialModule *serialModule;
  * Radio interface for SerialModule
  *
  */
-class SerialModuleRadio : public MeshModule
+class SerialModuleRadio : public SinglePortModule
 {
     uint32_t lastRxID = 0;
     char outbuf[90] = "";
@@ -54,31 +54,14 @@ class SerialModuleRadio : public MeshModule
     void sendPayload(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);
 
   protected:
-    virtual meshtastic_MeshPacket *allocReply() override;
-
     /** Called to handle a particular incoming message
 
     @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for
     it
     */
     virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
-
-    meshtastic_PortNum ourPortNum;
-
-    virtual bool wantPacket(const meshtastic_MeshPacket *p) override { return p->decoded.portnum == ourPortNum; }
-
-    meshtastic_MeshPacket *allocDataPacket()
-    {
-        // Update our local node info with our position (even if we don't decide to update anyone else)
-        meshtastic_MeshPacket *p = router->allocForSending();
-        if (!p)
-            return nullptr;
-        p->decoded.portnum = ourPortNum;
-
-        return p;
-    }
 };
 
 extern SerialModuleRadio *serialModuleRadio;
 
-#endif
+#endif