re-add namespacing in protobufs. Let's see what i missed. Portduino likely ...

Checking in generated on purpose.

src/mesh/Router.h

@@ -16,7 +16,7 @@ class Router : protected concurrency::OSThread
   private:
     /// Packets which have just arrived from the radio, ready to be processed by this service and possibly
     /// forwarded to the phone.
-    PointerQueue<MeshPacket> fromRadioQueue;
+    PointerQueue<meshtastic_MeshPacket> fromRadioQueue;
 
   protected:
     RadioInterface *iface = NULL;
@@ -45,7 +45,7 @@ class Router : protected concurrency::OSThread
      *
      * NOTE: This method will free the provided packet (even if we return an error code)
      */
-    ErrorCode sendLocal(MeshPacket *p, RxSource src = RX_SRC_RADIO);
+    ErrorCode sendLocal(meshtastic_MeshPacket *p, RxSource src = RX_SRC_RADIO);
 
     /** Attempt to cancel a previously sent packet.  Returns true if a packet was found we could cancel */
     bool cancelSending(NodeNum from, PacketId id);
@@ -53,10 +53,10 @@ class Router : protected concurrency::OSThread
     /** Allocate and return a meshpacket which defaults as send to broadcast from the current node.
      * The returned packet is guaranteed to have a unique packet ID already assigned
      */
-    MeshPacket *allocForSending();
+    meshtastic_MeshPacket *allocForSending();
 
     /** Return Underlying interface's TX queue status */
-    QueueStatus getQueueStatus();
+    meshtastic_QueueStatus getQueueStatus();
 
     /**
      * @return our local nodenum */
@@ -71,7 +71,7 @@ class Router : protected concurrency::OSThread
      * RadioInterface calls this to queue up packets that have been received from the radio.  The router is now responsible for
      * freeing the packet
      */
-    void enqueueReceivedMessage(MeshPacket *p);
+    void enqueueReceivedMessage(meshtastic_MeshPacket *p);
 
   protected:
     friend class RoutingModule;
@@ -83,7 +83,7 @@ class Router : protected concurrency::OSThread
      *
      * NOTE: This method will free the provided packet (even if we return an error code)
      */
-    virtual ErrorCode send(MeshPacket *p);
+    virtual ErrorCode send(meshtastic_MeshPacket *p);
 
     /**
      * Should this incoming filter be dropped?
@@ -93,18 +93,18 @@ class Router : protected concurrency::OSThread
      * Called immedately on receiption, before any further processing.
      * @return true to abandon the packet
      */
-    virtual bool shouldFilterReceived(const MeshPacket *p) { return false; }
+    virtual bool shouldFilterReceived(const meshtastic_MeshPacket *p) { return false; }
 
     /**
      * Every (non duplicate) packet this node receives will be passed through this method.  This allows subclasses to
      * update routing tables etc... based on what we overhear (even for messages not destined to our node)
      */
-    virtual void sniffReceived(const MeshPacket *p, const Routing *c);
+    virtual void sniffReceived(const meshtastic_MeshPacket *p, const meshtastic_Routing *c);
 
     /**
      * Send an ack or a nak packet back towards whoever sent idFrom
      */
-    void sendAckNak(Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex);
+    void sendAckNak(meshtastic_Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex);
 
   private:
     /**
@@ -115,7 +115,7 @@ class Router : protected concurrency::OSThread
      * Note: this packet will never be called for messages sent/generated by this node.
      * Note: this method will free the provided packet.
      */
-    void perhapsHandleReceived(MeshPacket *p);
+    void perhapsHandleReceived(meshtastic_MeshPacket *p);
 
     /**
      * Called from perhapsHandleReceived() - allows subclass message delivery behavior.
@@ -125,10 +125,10 @@ class Router : protected concurrency::OSThread
      * Note: this packet will never be called for messages sent/generated by this node.
      * Note: this method will free the provided packet.
      */
-    void handleReceived(MeshPacket *p, RxSource src = RX_SRC_RADIO);
+    void handleReceived(meshtastic_MeshPacket *p, RxSource src = RX_SRC_RADIO);
 
     /** Frees the provided packet, and generates a NAK indicating the speicifed error while sending */
-    void abortSendAndNak(Routing_Error err, MeshPacket *p);
+    void abortSendAndNak(meshtastic_Routing_Error err, meshtastic_MeshPacket *p);
 };
 
 /** FIXME - move this into a mesh packet class
@@ -136,11 +136,11 @@ class Router : protected concurrency::OSThread
  *
  * @return true for success, false for corrupt packet.
  */
-bool perhapsDecode(MeshPacket *p);
+bool perhapsDecode(meshtastic_MeshPacket *p);
 
 /** Return 0 for success or a Routing_Errror code for failure
  */
-Routing_Error perhapsEncode(MeshPacket *p);
+meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p);
 
 extern Router *router;