From 9e8860d1888332b3fd8588e3aaf9f3867ced3415 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sat, 23 Mar 2024 12:29:05 -0500
Subject: [PATCH 1/2] Crash fix and remove hard-coded path from PiWebServer
 (#3478)

* Remove hard-coded path from PiWebServer

* Bump portduino to pick up crash fix

* Remove PiWebServer non-ASCII debug output

* Trunk formatting
---
 arch/portduino/portduino.ini       |  2 +-
 src/mesh/raspihttp/PiWebServer.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 368fb5d0e..ef8711f8a 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -1,6 +1,6 @@
 ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#a28dd5a9ccd5c48a9bede46037855ff83915d74b
+platform = https://github.com/meshtastic/platform-native.git#1b8a32c60ab7495026033858d53c737f7d1cb34a
 framework = arduino
 
 build_src_filter = 
diff --git a/src/mesh/raspihttp/PiWebServer.cpp b/src/mesh/raspihttp/PiWebServer.cpp
index 41f6727a4..bffd6c340 100644
--- a/src/mesh/raspihttp/PiWebServer.cpp
+++ b/src/mesh/raspihttp/PiWebServer.cpp
@@ -244,7 +244,7 @@ int handleAPIv1ToRadio(const struct _u_request *req, struct _u_response *res, vo
 
     // FIXME* Problem with portdunio loosing mountpoint maybe because of running in a real sep. thread
 
-    portduinoVFS->mountpoint("/home/marc/.portduino/default");
+    portduinoVFS->mountpoint(configWeb.rootPath);
 
     LOG_DEBUG("Received %d bytes from PUT request\n", s);
     webAPI.handleToRadio(buffer, s);
@@ -279,8 +279,8 @@ int handleAPIv1FromRadio(const struct _u_request *req, struct _u_response *res,
             const char *tmpa = (const char *)txBuf;
             ulfius_set_string_body_response(res, 200, tmpa);
             // LOG_DEBUG("\n----webAPI response all:----\n");
-            LOG_DEBUG(tmpa);
-            LOG_DEBUG("\n");
+            // LOG_DEBUG(tmpa);
+            // LOG_DEBUG("\n");
         }
         // Otherwise, just return one protobuf
     } else {
@@ -288,8 +288,8 @@ int handleAPIv1FromRadio(const struct _u_request *req, struct _u_response *res,
         const char *tmpa = (const char *)txBuf;
         ulfius_set_binary_body_response(res, 200, tmpa, len);
         // LOG_DEBUG("\n----webAPI response:\n");
-        LOG_DEBUG(tmpa);
-        LOG_DEBUG("\n");
+        // LOG_DEBUG(tmpa);
+        // LOG_DEBUG("\n");
     }
 
     // LOG_DEBUG("end radio->web\n", len);
@@ -508,7 +508,7 @@ PiWebServerThread::PiWebServerThread()
             LOG_INFO("Web Server framework started on port: %i \n", webservport);
             LOG_INFO("Web Server root %s\n", (char *)webrootpath.c_str());
         } else {
-            LOG_ERROR("Error starting Web Server framework\n");
+            LOG_ERROR("Error starting Web Server framework, error number: %d\n", retssl);
         }
     }
 }

From 4cce4c7c93a5c44cb7de5ce509f63a1db0587dbf Mon Sep 17 00:00:00 2001
From: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Date: Sat, 23 Mar 2024 18:38:29 +0100
Subject: [PATCH 2/2] Set unused header bytes to zero for future use (#3479)

---
 src/mesh/RadioInterface.cpp | 2 ++
 src/mesh/RadioInterface.h   | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 859e7bea4..3aac9dfce 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -564,6 +564,8 @@ size_t RadioInterface::beginSending(meshtastic_MeshPacket *p)
     h->to = p->to;
     h->id = p->id;
     h->channel = p->channel;
+    h->next_hop = 0;   // *** For future use ***
+    h->relay_node = 0; // *** For future use ***
     if (p->hop_limit > HOP_MAX) {
         LOG_WARN("hop limit %d is too high, setting to %d\n", p->hop_limit, HOP_RELIABLE);
         p->hop_limit = HOP_RELIABLE;
diff --git a/src/mesh/RadioInterface.h b/src/mesh/RadioInterface.h
index ee4726d74..b965328e4 100644
--- a/src/mesh/RadioInterface.h
+++ b/src/mesh/RadioInterface.h
@@ -34,6 +34,12 @@ typedef struct {
 
     /** The channel hash - used as a hint for the decoder to limit which channels we consider */
     uint8_t channel;
+
+    // ***For future use*** Last byte of the NodeNum of the next-hop for this packet
+    uint8_t next_hop;
+
+    // ***For future use*** Last byte of the NodeNum of the node that will relay/relayed this packet
+    uint8_t relay_node;
 } PacketHeader;
 
 /**