Merge branch 'master' into ota-wifi

* Added bounds checking to memcpy and use memory-safe strlcpy for reading serial data in processWXSerial() function.

* Fixed linting with trunk

.devcontainer/Dockerfile

@@ -29,6 +29,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     gpg \
     gnupg2 \
     libusb-1.0-0-dev \
+    libuv1-dev \
     libi2c-dev \
     libxcb-xkb-dev \
     libxkbcommon-dev \

.github/actions/setup-native/action.yml

@@ -11,4 +11,4 @@ runs:
     - name: Install libs needed for native build
       shell: bash
       run: |
-        sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
+        sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev libuv1-dev

Dockerfile

@@ -13,7 +13,7 @@ ENV TZ=Etc/UTC
 ENV PIP_ROOT_USER_ACTION=ignore
 RUN apt-get update && apt-get install --no-install-recommends -y \
         wget g++ zip git ca-certificates \
-        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev \
+        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
         libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && pip install --no-cache-dir -U platformio \
@@ -38,7 +38,7 @@ ENV TZ=Etc/UTC
 USER root
 
 RUN apt-get update && apt-get --no-install-recommends -y install \
-        libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libulfius2.7 libusb-1.0-0-dev liborcania2.3 libssl3 \
+        libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libuv1 libusb-1.0-0-dev liborcania2.3 libulfius2.7 libssl3 \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \

alpine.Dockerfile

@@ -9,7 +9,7 @@ FROM python:3.13-alpine3.21 AS builder
 ENV PIP_ROOT_USER_ACTION=ignore
 RUN apk --no-cache add \
         bash g++ libstdc++-dev linux-headers zip git ca-certificates libgpiod-dev yaml-cpp-dev bluez-dev \
-        libusb-dev i2c-tools-dev openssl-dev pkgconf argp-standalone \
+        libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
     && rm -rf /var/cache/apk/* \
     && pip install --no-cache-dir -U platformio \
     && mkdir /tmp/firmware
@@ -32,7 +32,7 @@ FROM alpine:3.21
 USER root
 
 RUN apk --no-cache add \
-        libstdc++ libgpiod yaml-cpp libusb i2c-tools \
+        libstdc++ libgpiod yaml-cpp libusb i2c-tools libuv \
     && rm -rf /var/cache/apk/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \

arch/portduino/portduino.ini

@@ -1,6 +1,6 @@
 ; The Portduino based 'native' environment. Currently supported on Linux targets with real LoRa hardware (or simulated).
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#562d189828f09fbf4c4093b3c0104bae9d8e9ff9
+platform = https://github.com/meshtastic/platform-native.git#df71ed0040e9aad767a002829330965b78fc452a
 framework = arduino
 
 build_src_filter = 
@@ -34,10 +34,12 @@ build_flags =
   -Isrc/platform/portduino
   -DRADIOLIB_EEPROM_UNSUPPORTED
   -DPORTDUINO_LINUX_HARDWARE
+  -DHAS_UDP_MULTICAST
   -lpthread
   -lstdc++fs
   -lbluetooth
   -lgpiod
   -lyaml-cpp
   -li2c
+  -luv
   -std=c++17

debian/control

@@ -17,6 +17,7 @@ Build-Depends: debhelper-compat (= 13),
                libbluetooth-dev,
                libusb-1.0-0-dev,
                libi2c-dev,
+               libuv1-dev,
                openssl,
                libssl-dev,
                libulfius-dev,

meshtasticd.spec.rpkg

@@ -36,6 +36,7 @@ BuildRequires: pkgconfig(libgpiod)
 BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(libusb-1.0)
 BuildRequires: libi2c-devel
+BuildRequires: pkgconfig(libuv)
 # Web components:
 BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(liborcania)

src/main.cpp

@@ -822,6 +822,11 @@ void setup()
 #ifdef HAS_UDP_MULTICAST
     LOG_DEBUG("Start multicast thread");
     udpThread = new UdpMulticastThread();
+#ifdef ARCH_PORTDUINO
+    // FIXME: portduino does not ever call onNetworkConnected so call it here because I don't know what happen if I call
+    // onNetworkConnected there
+    udpThread->start();
+#endif
 #endif
     service = new MeshService();
     service->init();

src/mesh/udp/UdpMulticastThread.h

@@ -22,8 +22,13 @@ class UdpMulticastThread : public concurrency::OSThread
 
     void start()
     {
-        if (udp.listenMulticast(udpIpAddress, UDP_MULTICAST_DEFAUL_PORT)) {
+        if (udp.listenMulticast(udpIpAddress, UDP_MULTICAST_DEFAUL_PORT, 64)) {
+#if !defined(ARCH_PORTDUINO)
+            // FIXME(PORTDUINO): arduino lacks IPAddress::toString()
             LOG_DEBUG("UDP Listening on IP: %s", WiFi.localIP().toString().c_str());
+#else
+            LOG_DEBUG("UDP Listening");
+#endif
             udp.onPacket([this](AsyncUDPPacket packet) { onReceive(packet); });
         } else {
             LOG_DEBUG("Failed to listen on UDP");
@@ -33,7 +38,10 @@ class UdpMulticastThread : public concurrency::OSThread
     void onReceive(AsyncUDPPacket packet)
     {
         size_t packetLength = packet.length();
+#ifndef ARCH_PORTDUINO
+        // FIXME(PORTDUINO): arduino lacks IPAddress::toString()
         LOG_DEBUG("UDP broadcast from: %s, len=%u", packet.remoteIP().toString().c_str(), packetLength);
+#endif
         meshtastic_MeshPacket mp;
         LOG_DEBUG("Decoding MeshPacket from UDP len=%u", packetLength);
         bool isPacketDecoded = pb_decode_from_bytes(packet.data(), packetLength, &meshtastic_MeshPacket_msg, &mp);
@@ -48,9 +56,14 @@ class UdpMulticastThread : public concurrency::OSThread
 
     bool onSend(const meshtastic_MeshPacket *mp)
     {
-        if (!mp || WiFi.status() != WL_CONNECTED) {
+        if (!mp || !udp) {
             return false;
         }
+#if !defined(ARCH_PORTDUINO)
+        if (WiFi.status() != WL_CONNECTED) {
+            return false;
+        }
+#endif
         LOG_DEBUG("Broadcasting packet over UDP (id=%u)", mp->id);
         uint8_t buffer[meshtastic_MeshPacket_size];
         size_t encodedLength = pb_encode_to_bytes(buffer, sizeof(buffer), &meshtastic_MeshPacket_msg, mp);
@@ -70,4 +83,4 @@ class UdpMulticastThread : public concurrency::OSThread
     IPAddress udpIpAddress;
     AsyncUDP udp;
 };
-#endif // ARCH_ESP32
+#endif // HAS_UDP_MULTICAST

src/modules/SerialModule.cpp

@@ -468,6 +468,7 @@ void SerialModule::processWXSerial()
                     // Extract the current line
                     char line[meshtastic_Constants_DATA_PAYLOAD_LEN];
                     memset(line, '\0', sizeof(line));
+                    if (lineEnd - lineStart < sizeof(line) - 1) {
                         memcpy(line, &serialBytes[lineStart], lineEnd - lineStart);
                         if (strstr(line, "Wind") != NULL) // we have a wind line
                         {
@@ -479,14 +480,14 @@ void SerialModule::processWXSerial()
 
                             if (windDirPos != NULL) {
                                 // Extract data after "=" for WindDir
-                            strcpy(windDir, windDirPos + 15); // Add 15 to skip "WindDir = "
+                                strlcpy(windDir, windDirPos + 15, sizeof(windDir)); // Add 15 to skip "WindDir = "
                                 double radians = GeoCoord::toRadians(strtof(windDir, nullptr));
                                 dir_sum_sin += sin(radians);
                                 dir_sum_cos += cos(radians);
                                 dirCount++;
                             } else if (windSpeedPos != NULL) {
                                 // Extract data after "=" for WindSpeed
-                            strcpy(windVel, windSpeedPos + 15); // Add 15 to skip "WindSpeed = "
+                                strlcpy(windVel, windSpeedPos + 15, sizeof(windVel)); // Add 15 to skip "WindSpeed = "
                                 float newv = strtof(windVel, nullptr);
                                 velSum += newv;
                                 velCount++;
@@ -494,7 +495,7 @@ void SerialModule::processWXSerial()
                                     lull = newv;
 
                             } else if (windGustPos != NULL) {
-                            strcpy(windGust, windGustPos + 15); // Add 15 to skip "WindSpeed = "
+                                strlcpy(windGust, windGustPos + 15, sizeof(windGust)); // Add 15 to skip "WindSpeed = "
                                 float newg = strtof(windGust, nullptr);
                                 if (newg > gust)
                                     gust = newg;
@@ -504,21 +505,21 @@ void SerialModule::processWXSerial()
                         } else if (strstr(line, "BatVoltage") != NULL) { // we have a battVoltage line
                             char *batVoltagePos = strstr(line, "BatVoltage     = ");
                             if (batVoltagePos != NULL) {
-                            strcpy(batVoltage, batVoltagePos + 17); // 18 for ws 80, 17 for ws85
+                                strlcpy(batVoltage, batVoltagePos + 17, sizeof(batVoltage)); // 18 for ws 80, 17 for ws85
                                 batVoltageF = strtof(batVoltage, nullptr);
                                 break; // last possible data we want so break
                             }
                         } else if (strstr(line, "CapVoltage") != NULL) { // we have a cappVoltage line
                             char *capVoltagePos = strstr(line, "CapVoltage     = ");
                             if (capVoltagePos != NULL) {
-                            strcpy(capVoltage, capVoltagePos + 17); // 18 for ws 80, 17 for ws85
+                                strlcpy(capVoltage, capVoltagePos + 17, sizeof(capVoltage)); // 18 for ws 80, 17 for ws85
                                 capVoltageF = strtof(capVoltage, nullptr);
                             }
                             // GXTS04Temp   = 24.4
                         } else if (strstr(line, "GXTS04Temp") != NULL) { // we have a temperature line
                             char *tempPos = strstr(line, "GXTS04Temp   = ");
                             if (tempPos != NULL) {
-                            strcpy(temperature, tempPos + 15); // 15 spaces for ws85
+                                strlcpy(temperature, tempPos + 15, sizeof(temperature)); // 15 spaces for ws85
                                 temperatureF = strtof(temperature, nullptr);
                             }
 
@@ -526,7 +527,7 @@ void SerialModule::processWXSerial()
                             // LOG_INFO(line);
                             char *pos = strstr(line, "RainIntSum     = ");
                             if (pos != NULL) {
-                            strcpy(rainStr, pos + 17); // 17 spaces for ws85
+                                strlcpy(rainStr, pos + 17, sizeof(rainStr)); // 17 spaces for ws85
                                 rainSum = int(strtof(rainStr, nullptr));
                             }
 
@@ -535,7 +536,7 @@ void SerialModule::processWXSerial()
                                 // LOG_INFO(line);
                                 char *pos = strstr(line, "Rain           = ");
                                 if (pos != NULL) {
-                                strcpy(rainStr, pos + 17); // 17 spaces for ws85
+                                    strlcpy(rainStr, pos + 17, sizeof(rainStr)); // 17 spaces for ws85
                                     rain = strtof(rainStr, nullptr);
                                 }
                             }
@@ -545,6 +546,7 @@ void SerialModule::processWXSerial()
                         lineStart = lineEnd + 1;
                     }
                 }
+            }
             break;
             // clear the input buffer
             while (Serial2.available() > 0) {

src/platform/esp32/WiFiOTA.cpp

@@ -55,32 +55,38 @@ void saveConfig(meshtastic_Config_NetworkConfig *network)
     prefs.end();
 }
 
+const esp_partition_t *getAppPartition()
+{
+    return esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, NULL);
+}
+
+bool getAppDesc(const esp_partition_t *part, esp_app_desc_t *app_desc)
+{
+    if (esp_ota_get_partition_description(part, app_desc) != ESP_OK)
+        return false;
+    if (strcmp(app_desc->project_name, appProjectName) != 0)
+        return false;
+    return true;
+}
+
 bool trySwitchToOTA()
 {
+    const esp_partition_t *part = getAppPartition();
     esp_app_desc_t app_desc;
-    const esp_partition_t *part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, NULL);
-    if (!part)
+    if (!getAppDesc(part, &app_desc))
         return false;
-    if (ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc)) != ESP_OK)
-        return false;
-    if (strcmp(app_desc.project_name, appProjectName) != 0)
-        return false;
-    if (ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_set_boot_partition(part)) != ESP_OK)
+    if (esp_ota_set_boot_partition(part) != ESP_OK)
         return false;
     return true;
 }
 
 String getVersion()
 {
-    String version;
+    const esp_partition_t *part = getAppPartition();
     esp_app_desc_t app_desc;
-    const esp_partition_t *part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, NULL);
-    if (!part)
-        return version;
-    if (ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc)) != ESP_OK)
-        return version;
-    version = app_desc.version;
-    return version;
+    if (!getAppDesc(part, &app_desc))
+        return String();
+    return String(app_desc.version);
 }
 
 } // namespace WiFiOTA

variants/rpipico2w/platformio.ini

@@ -23,6 +23,7 @@ build_flags = ${rp2350_base.build_flags}
   -DHAS_WIFI=1
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m33"
   -fexceptions  # for exception handling in MQTT
+  -DHAS_UDP_MULTICAST=1
 build_src_filter = ${rp2350_base.build_src_filter} +<mesh/wifi/>
 lib_deps =
   ${rp2350_base.lib_deps}

variants/rpipicow/platformio.ini

@@ -10,6 +10,7 @@ build_flags = ${rp2040_base.build_flags}
   -DHW_SPI1_DEVICE
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
   -fexceptions  # for exception handling in MQTT
+  -DHAS_UDP_MULTICAST=1
 build_src_filter = ${rp2040_base.build_src_filter} +<mesh/wifi/>
 lib_deps =
   ${rp2040_base.lib_deps}