DSR WIP

mesh.proto

@@ -165,6 +165,16 @@ message RouteDiscovery {
   repeated int32 route = 2;
 }
 
+enum RouteError {
+  NONE = 0;
+
+  // Our node doesn't have a route to the requested destination anymore.
+  NO_ROUTE = 1;
+
+  // We received a nak while trying to forward on your behalf
+  GOT_NAK = 2;
+}
+
 // The payload portion fo a packet, this is the actual bytes that are sent
 // inside a radio packet (because from/to are broken out by the comms library)
 message SubPacket {
@@ -179,12 +189,17 @@ message SubPacket {
     /**
     A route request going from the requester
     */
-    RouteDiscovery request = 6;
+    RouteDiscovery route_request = 6;
 
     /**
     A route reply
     */
-    RouteDiscovery reply = 7;
+    RouteDiscovery route_reply = 7;
+
+    /**
+    A failure in a routed message
+    */
+    RouteError route_error = 13;
   }
 
   /// Not normally used, but for testing a sender can request that recipient
@@ -221,6 +236,14 @@ message SubPacket {
   to if they are doing multihop routing.
   */
   uint32 dest = 9;
+
+  /**
+  The address of the original sender for this message.
+
+  This field should _only_ be populated for reliable multihop packets (to keep
+  packets small).
+  */
+  uint32 source = 12;
 }
 
 // A full packet sent/received over the mesh