Update PhoneAPI.cpp to reduce chattiness

src/mesh/PhoneAPI.cpp

@@ -512,11 +512,6 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
             // LOG_INFO("nodeinfo: num=0x%x, lastseen=%u, id=%s, name=%s", nodeInfoForPhone.num, nodeInfoForPhone.last_heard,
             // nodeInfoForPhone.user.id, nodeInfoForPhone.user.long_name);
 
-            // Occasional progress logging. (readIndex==2 will be true for the first non-us node)
-            if (readIndex == 2 || readIndex % 20 == 0) {
-                LOG_DEBUG("nodeinfo: %d/%d", readIndex, nodeDB->getNumMeshNodes());
-            }
-
             fromRadioScratch.which_payload_variant = meshtastic_FromRadio_node_info_tag;
             fromRadioScratch.node_info = infoToSend;
             prefetchNodeInfos();
@@ -647,9 +642,11 @@ void PhoneAPI::releaseQueueStatusPhonePacket()
 void PhoneAPI::prefetchNodeInfos()
 {
     bool added = false;
+    bool wasEmpty = false;
     // Keep the queue topped up so BLE reads stay responsive even if DB fetches take a moment.
     {
         concurrency::LockGuard guard(&nodeInfoMutex);
+        wasEmpty = nodeInfoQueue.empty();
         while (nodeInfoQueue.size() < kNodePrefetchDepth) {
             auto nextNode = nodeDB->readNextMeshNode(readIndex);
             if (!nextNode)
@@ -663,11 +660,15 @@ void PhoneAPI::prefetchNodeInfos()
             info.via_mqtt = isUs ? false : info.via_mqtt;
             info.is_favorite = info.is_favorite || isUs;
             nodeInfoQueue.push_back(info);
+            // Log progress here (at fetch time) so readIndex is accurate and each value logs only once.
+            if (readIndex == 2 || readIndex % 20 == 0) {
+                LOG_DEBUG("nodeinfo: %d/%d", readIndex, nodeDB->getNumMeshNodes());
+            }
             added = true;
         }
     }
 
-    if (added)
+    if (added && wasEmpty)
         onNowHasData(0);
 }
 

src/mesh/raspihttp/PiWebServer.cpp

@@ -1,34 +1,22 @@
 /*
-Adds a WebServer and WebService callbacks to meshtastic via the Portduino/native target (Linux and
-macOS). The WebServer & Webservices run in a real host thread beside the Portduino threading
-emulation. It replaces the complete ESP32 Webserver libs including generation of SSL certificates,
-because those libs use ESP-specific details that can't be emulated.
+Adds a WebServer and WebService callbacks to meshtastic as Linux Version. The WebServer & Webservices
+runs in a real linux thread beside the portdunio threading emulation. It replaces the complete ESP32
+Webserver libs including generation of SSL certifcicates,  because the use ESP specific details in
+the lib that can't be emulated.
 
 The WebServices adapt to the two major phoneapi functions "handleAPIv1FromRadio,handleAPIv1ToRadio"
-The WebServer just adds basic support to deliver WebContent, so it can be used to
-deliver the WebGui defined by the WebClient Project.
+The WebServer just adds basaic support to deliver WebContent, so it can be used to
+deliver the WebGui definded by the WebClient Project.
 
 Steps to get it running:
-
-Linux (apt):
-1.) Add these libs to the compile and target machine:
+1.) Add these Linux Libs to the compile and target machine:
 
     sudo apt update && \
-        apt -y install openssl libssl-dev libsdl2-dev \
+        apt -y install openssl libssl-dev libopenssl libsdl2-dev \
                      libulfius-dev liborcania-dev
 
-macOS (Homebrew):
-1.) Install prerequisites via Homebrew:
-
-    brew install ulfius openssl@3
-
-    The PlatformIO env (native-macos) picks up compiler/linker flags via
-    `pkg-config`. In particular, OpenSSL needs `pkg-config --cflags --libs openssl@3`
-    so both the Homebrew include path and linker flags are provided; ulfius and its
-    dependencies (liborcania, libyder) are also resolved via `pkg-config`.
-
 2.) Configure the root directory of the web Content in the config.yaml file.
-    The following tags should be included and set at your needs
+    The followinng tags should be included and set at your needs
 
     Example entry in the config.yaml
     Webserver:
@@ -46,10 +34,7 @@ Author: Marc Philipp Hammermann
 mail:   marchammermann@googlemail.com
 
 */
-// Mirrors the guard in PiWebServer.h — see comment there. macOS Homebrew
-// provides ulfius + deps; Linux pulls them via apt. Either way, this
-// translation unit only compiles when the headers are present.
-#ifdef ARCH_PORTDUINO
+#ifdef PORTDUINO_LINUX_HARDWARE
 #if __has_include(<ulfius.h>)
 #include "PiWebServer.h"
 #include "NodeDB.h"

src/mesh/raspihttp/PiWebServer.h

@@ -1,9 +1,5 @@
 #pragma once
-// Portduino webserver is built whenever the ulfius headers are reachable,
-// not only on Linux. macOS users can `brew install ulfius` to enable it;
-// without ulfius the entire body is skipped and main.cpp's matching
-// __has_include guard avoids referencing the type.
-#ifdef ARCH_PORTDUINO
+#ifdef PORTDUINO_LINUX_HARDWARE
 #if __has_include(<ulfius.h>)
 #include "PhoneAPI.h"
 #include "ulfius-cfg.h"

src/platform/portduino/PortduinoGlue.cpp

@@ -33,16 +33,6 @@
 #include <cxxabi.h>
 #endif
 
-#ifdef __APPLE__
-// Used by getMacAddr()'s macOS fallback to read the en0 link-layer address.
-// `getifaddrs()` is the BSD-portable way; `<net/if_dl.h>` provides the
-// `sockaddr_dl` cast and the `LLADDR()` macro that points at the 6-byte MAC.
-#include <cstring> // strcmp, memcpy
-#include <ifaddrs.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#endif
-
 #include "platform/portduino/USBHal.h"
 
 portduino_config_struct portduino_config;
@@ -166,35 +156,9 @@ void getMacAddr(uint8_t *dmac)
         dmac[3] = di.bdaddr.b[2];
         dmac[4] = di.bdaddr.b[1];
         dmac[5] = di.bdaddr.b[0];
-#elif defined(__APPLE__)
-        // No BlueZ on macOS, but we can fall back to the host's primary
-        // network interface MAC. `en0` is Wi-Fi on every shipping Mac
-        // (Ethernet, when present, is en1 or higher), which gives the user
-        // the same kind of stable, host-derived identifier that the BlueZ
-        // path provides on Linux. If en0 isn't found or has no MAC, dmac is
-        // left untouched and the caller's "Blank MAC Address not allowed!"
-        // check will still fire — preserving existing behavior for users
-        // who deliberately rely on --hwid or YAML override.
-        struct ifaddrs *ifap = nullptr;
-        if (getifaddrs(&ifap) == 0) {
-            for (struct ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) {
-                if (p->ifa_addr == nullptr || p->ifa_addr->sa_family != AF_LINK) {
-                    continue;
-                }
-                if (strcmp(p->ifa_name, "en0") != 0) {
-                    continue;
-                }
-                auto *sdl = reinterpret_cast<struct sockaddr_dl *>(p->ifa_addr);
-                if (sdl->sdl_alen == 6) {
-                    memcpy(dmac, LLADDR(sdl), 6);
-                    break;
-                }
-            }
-            freeifaddrs(ifap);
-        }
 #else
-        // No platform-specific MAC source; leave dmac at its default. Caller
-        // can override via the --hwid CLI flag or the YAML config.
+        // No BlueZ on non-Linux hosts (e.g. macOS). Leave dmac at its default;
+        // the caller can override via the --hwid CLI flag or the YAML config.
         (void)dmac;
 #endif
     }

variants/native/portduino/platformio.ini

@@ -125,8 +125,6 @@ test_testing_command =
 ;
 ; Prerequisites (Homebrew):
 ;   brew install platformio yaml-cpp libuv openssl@3 libusb argp-standalone pkg-config
-;   # Optional: enable the HTTP API (PiWebServer) on macOS:
-;   brew install ulfius
 ;
 ; The macOS-side patches now live upstream:
 ;   * meshtastic/platform-native — `String.h`-shadow shim, `-Wno-enum-constexpr-conversion`,
@@ -193,16 +191,7 @@ build_flags = ${portduino_base.build_flags_common}
   ; style screen-driver hooks scattered through sensor sources.
   -DHAS_SCREEN=0
   -DMESHTASTIC_EXCLUDE_SCREEN=1
-  ; openssl@3 is the keg-only Homebrew formula; --cflags is required so the
-  ; compiler finds <openssl/*.h> in the Homebrew prefix (not just the linker).
-  !pkg-config --cflags --libs openssl@3 --silence-errors || :
-  ; PiWebServer (src/mesh/raspihttp/PiWebServer.cpp) auto-engages when ulfius
-  ; headers are reachable via `#if __has_include(<ulfius.h>)`. The `|| :`
-  ; tail keeps the build green when the user hasn't run `brew install ulfius`
-  ; — they just don't get the HTTP API in that case.
-  !pkg-config --cflags --libs libulfius --silence-errors || :
-  !pkg-config --cflags --libs liborcania --silence-errors || :
-  !pkg-config --cflags --libs libyder --silence-errors || :
+  !pkg-config --libs openssl --silence-errors || :
 ; src/input/Linux*.{cpp,h} drive evdev (`<linux/input.h>`) which doesn't exist
 ; on macOS. graphics/Panel_sdl.* and graphics/TFTDisplay.cpp pull LovyanGFX
 ; (which we lib_ignore on macOS for the <malloc.h> issue). Neither is needed
@@ -217,28 +206,3 @@ build_src_filter = ${native_base.build_src_filter}
 lib_ignore =
   ${portduino_base.lib_ignore}
   LovyanGFX
-
-; ---------------------------------------------------------------------------
-; Same as [env:native-macos] but built with AddressSanitizer for catching
-; use-after-free, leaks, and OOB access during local development. Headless
-; (no SDL/X11/libinput) so it stays cheap to build. Mirrors the shape of
-; [env:native-tft-debug] but without the TFT/X11 dependencies.
-;
-;   pio run -e native-macos-debug
-;   .pio/build/native-macos-debug/meshtasticd -s
-;
-; ASan runtime tuning (set in the shell before launching):
-;   ASAN_OPTIONS=detect_leaks=1:halt_on_error=0:abort_on_error=1
-;   MallocStackLogging=1   # macOS: nicer stack traces in malloc reports
-; ---------------------------------------------------------------------------
-[env:native-macos-debug]
-extends = native_base
-build_type = debug
-build_unflags = ${env:native-macos.build_unflags}
-build_flags = ${env:native-macos.build_flags}
-  -O0
-  -g
-  -fsanitize=address
-  -fno-omit-frame-pointer
-build_src_filter = ${env:native-macos.build_src_filter}
-lib_ignore = ${env:native-macos.lib_ignore}