Merge branch 'develop' into meshtasticd-notifications

Use libnotify for meshtasticd desktop notifications.

Add "HAS_LIBNOTIFY" macro to guard for builds where libnotify is expected.
This is not included in buildroot/openwrt builds. (no libnotify except when extra repos are added).

Install desktop icon in the correct location on Debian and Fedora packages.
Update dependencies in packaging and dockerfiles.

.devcontainer/Dockerfile

@@ -34,6 +34,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     libxcb-xkb-dev \
     libxkbcommon-dev \
     libinput-dev \
+    libnotify-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN pipx install platformio

.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 libuv1-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 libnotify-dev

Dockerfile

@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         python3-pip python3-grpc-tools \
         libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
         libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
-        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev libsdl2-dev \
+        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev libsdl2-dev libnotify-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && pip install --no-cache-dir -U platformio \
     && mkdir /tmp/firmware
@@ -55,7 +55,7 @@ USER root
 RUN apt-get update && apt-get --no-install-recommends -y install \
         libc-bin libc6 libgpiod3 libyaml-cpp0.8 libi2c0 libuv1t64 libusb-1.0-0-dev \
         liborcania2.3 libulfius2.7t64 libssl3t64 \
-        libx11-6 libinput10 libxkbcommon-x11-0 libsdl2-2.0-0 \
+        libx11-6 libinput10 libxkbcommon-x11-0 libsdl2-2.0-0 libnotify4 \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \

Dockerfile.test

@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         g++ git ca-certificates pkg-config \
         libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
         libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
-        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev libsdl2-dev \
+        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev libsdl2-dev libnotify-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && pip install --no-cache-dir platformio==6.1.19 \
         && useradd --create-home --shell /usr/sbin/nologin meshtastic

alpine.Dockerfile

@@ -18,7 +18,7 @@ RUN apk --no-cache add \
         py3-pip py3-grpcio-tools \
         libgpiod-dev yaml-cpp-dev bluez-dev \
         libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
-        libx11-dev libinput-dev libxkbcommon-dev sqlite-dev sdl2-dev \
+        libx11-dev libinput-dev libxkbcommon-dev sqlite-dev sdl2-dev libnotify-dev \
     && rm -rf /var/cache/apk/* \
     && pip install --no-cache-dir -U platformio \
     && mkdir /tmp/firmware
@@ -49,7 +49,7 @@ USER root
 
 RUN apk --no-cache add \
         shadow libstdc++ libbsd libgpiod yaml-cpp libusb \
-        i2c-tools libuv libx11 libinput libxkbcommon sdl2 \
+        i2c-tools libuv libx11 libinput libxkbcommon sdl2 libnotify \
     && rm -rf /var/cache/apk/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \

debian/control

@@ -27,7 +27,8 @@ Build-Depends: debhelper-compat (= 13),
                libinput-dev,
                libxkbcommon-x11-dev,
                libsqlite3-dev,
-               libsdl2-dev
+               libsdl2-dev,
+               libnotify-dev
 Standards-Version: 4.6.2
 Homepage: https://github.com/meshtastic/firmware
 Rules-Requires-Root: no

debian/meshtasticd.install

@@ -7,3 +7,5 @@ bin/meshtasticd.service            lib/systemd/system
 bin/meshtasticd-start.sh           usr/bin
 
 web/*                              usr/share/meshtasticd/web
+
+bin/org.meshtastic.meshtasticd.svg usr/share/icons/hicolor/scalable/apps

meshtasticd.spec.rpkg

@@ -50,6 +50,7 @@ BuildRequires: pkgconfig(x11)
 BuildRequires: pkgconfig(libinput)
 BuildRequires: pkgconfig(xkbcommon-x11)
 BuildRequires: pkgconfig(sdl2)
+BuildRequires: pkgconfig(libnotify)
 
 # libbsd is needed on older Fedora/RHEL to provide 'strlcpy'
 %if 0%{?fedora} >= 39 || 0%{?rhel} >= 10
@@ -112,6 +113,10 @@ cp -r web/* %{buildroot}%{_datadir}/meshtasticd/web
 # Install default SSL storage directory (for web)
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/ssl
 
+# Install desktop icon
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
+install -m 0644 bin/org.meshtastic.meshtasticd.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.meshtastic.meshtasticd.svg
+
 %pre
 # create spi group (for udev rules)
 getent group spi > /dev/null || groupadd -r spi
@@ -171,6 +176,7 @@ fi
 %dir %{_datadir}/meshtasticd/web
 %{_datadir}/meshtasticd/web/*
 %dir %{_sysconfdir}/meshtasticd/ssl
+%{_datadir}/icons/hicolor/scalable/apps/org.meshtastic.meshtasticd.svg
 
 %changelog
 %autochangelog

src/concurrency/Lock.cpp

@@ -1,7 +1,6 @@
 #include "Lock.h"
 #include "configuration.h"
 #include <cassert>
-#include <logging.h>
 
 namespace concurrency
 {
@@ -34,33 +33,13 @@ void Lock::unlock()
     }
 }
 #else
-Lock::Lock()
-{
-    pthread_mutex_init(&mutex, NULL);
-}
+Lock::Lock() {}
 
-void Lock::lock()
-{
-    if (locked) {
-        LOG_INFO("Attempt to lock an already locked Lock!");
-    }
-    pthread_mutex_lock(&mutex);
-    locked = true;
+Lock::~Lock() {}
 
-    if (console)
-        LOG_WARN("Lock");
-}
+void Lock::lock() {}
 
-void Lock::unlock()
-{
-    pthread_mutex_unlock(&mutex);
-    locked = false;
-}
-
-Lock::~Lock()
-{
-    pthread_mutex_destroy(&mutex);
-}
+void Lock::unlock() {}
 #endif
 
 } // namespace concurrency

src/concurrency/Lock.h

@@ -30,9 +30,6 @@ class Lock
   private:
 #ifdef HAS_FREE_RTOS
     SemaphoreHandle_t handle;
-#else
-    pthread_mutex_t mutex;
-    bool locked = false;
 #endif
 };
 

src/mesh/NodeDB.cpp

@@ -1109,6 +1109,10 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs;
 #endif
 #endif
+#if ARCH_PORTDUINO
+    moduleConfig.external_notification.enabled = true;
+    moduleConfig.external_notification.alert_message = true;
+#endif
 #ifdef NANO_G2_ULTRA
     moduleConfig.external_notification.enabled = true;
     moduleConfig.external_notification.alert_message = true;

src/mesh/NodeDB.h

@@ -132,7 +132,7 @@ inline bool shouldDropPacketForPreHop(const meshtastic_MeshPacket &p)
     if (isFromUs(&p)) {
         return false; // local-originated packets should never be dropped by pre-hop drop policy
     }
-    return classifyHopStart(p) == HopStartStatus::INVALID;
+    return classifyHopStart(p) != HopStartStatus::VALID;
 #endif
 }
 

src/mesh/RadioLibInterface.h

@@ -210,8 +210,6 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
     /** Attempt to find a packet in the TxQueue. Returns true if the packet was found. */
     virtual bool findInTxQueue(NodeNum from, PacketId id) override;
 
-    uint8_t packetsInTxQueue() { return txQueue.getMaxLen() - txQueue.getFree(); }
-
     /**
      * Update the noise floor measurement by sampling RSSI from a slow path.
      * This should not be called from radio interrupt or TX/RX critical paths.

src/modules/DMShell.cpp

@@ -1,804 +0,0 @@
-#include "DMShell.h"
-
-#if defined(ARCH_PORTDUINO)
-
-#include "Channels.h"
-#include "MeshService.h"
-#include "NodeDB.h"
-#include "Throttle.h"
-#include "configuration.h"
-#include "mesh/generated/meshtastic/mesh.pb.h"
-#include "mesh/mesh-pb-constants.h"
-#include "pb_decode.h"
-#include "pb_encode.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <pty.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-DMShellModule *dmShellModule;
-
-namespace
-{
-constexpr uint16_t PTY_COLS_DEFAULT = 120;
-constexpr uint16_t PTY_ROWS_DEFAULT = 40;
-constexpr size_t MAX_MESSAGE_SIZE = 200;
-
-// --- Half-duplex turn-taking ("talking stick") protocol, carried in RemoteShell.flags ---
-// On a 2-party LoRa link, Meshtastic's CSMA-CA breaks down when both ends transmit at once
-// (synchronized same-slot collisions that CAD can't prevent). These flags let exactly one
-// side transmit at a time, eliminating those collisions. The client is the master/idle-owner.
-constexpr uint32_t TURN_FLAG_GRANT = 0x01; // I am handing you the turn; you may transmit now
-constexpr uint32_t TURN_FLAG_MORE = 0x02;  // I yielded under a budget but still have data queued
-constexpr uint32_t TURN_FLAG_RTS = 0x04;   // I have output but no turn; please grant me one
-constexpr size_t TURN_BUDGET_FRAMES = 8;   // max output frames per granted turn before yielding (bounds interrupt latency)
-constexpr uint32_t RTS_RETRY_MS = 250;     // min interval between request-to-send frames
-// After being granted the turn we keep it for a short "linger" window, continuing to drain shell
-// output as it appears, instead of yielding the instant the PTY drains. This lets a command's
-// output (and the next prompt) ride the same turn as the keystroke that triggered it, avoiding a
-// full RTS->grant round-trip per command. The turn still ends promptly once the PTY is idle this
-// long, or once TURN_BUDGET_FRAMES is hit (so the client can interject, e.g. Ctrl-C).
-constexpr uint32_t TURN_LINGER_MS = 120;
-} // namespace
-
-DMShellModule::DMShellModule()
-    : SinglePortModule("DMShellModule", meshtastic_PortNum_REMOTE_SHELL_APP), concurrency::OSThread("DMShell", 100)
-{
-    LOG_WARN("DMShell enabled on Portduino: remote shell access is dangerous and intended for trusted debugging only");
-}
-
-ProcessMessage DMShellModule::handleReceived(const meshtastic_MeshPacket &mp)
-{
-    meshtastic_RemoteShell frame = meshtastic_RemoteShell_init_zero;
-    if (!mp.pki_encrypted) {
-        LOG_WARN("DMShell: ignoring packet without PKI from 0x%x", mp.from);
-        return ProcessMessage::STOP;
-    }
-
-    if (!parseFrame(mp, frame)) {
-        LOG_WARN("DMShell: ignoring malformed frame");
-        return ProcessMessage::STOP;
-    }
-
-    if (frame.op == meshtastic_RemoteShell_OpCode_ACK) {
-        if (session.active && frame.session_id == session.sessionId && getFrom(&mp) == session.peer) {
-            LOG_WARN("DMShell: Received ack from 0x%x 0x%x", getFrom(&mp), session.peer);
-            applyTurnFlags(frame);
-            if (frame.last_rx_seq > 0) {
-                resendFramesFrom(frame.last_rx_seq + 1);
-            }
-            // A standalone grant (client re-granting for MORE, replying to our RTS, or a heartbeat
-            // poll) is our cue to flush any pending shell output during this turn.
-            serviceTurn();
-        }
-        return ProcessMessage::CONTINUE;
-    }
-
-    if (frame.op >= 64) {
-        LOG_WARN("DMShell: ignoring frame with op code %d, seq %d", frame.op, frame.seq);
-        return ProcessMessage::CONTINUE;
-    }
-
-    if (!isAuthorizedPacket(mp)) {
-        LOG_WARN("DMShell: unauthorized sender 0x%x, %u", mp.from, frame.op);
-        myReply = allocErrorResponse(meshtastic_Routing_Error_NOT_AUTHORIZED, &mp);
-        return ProcessMessage::STOP;
-    }
-
-    if (frame.op == meshtastic_RemoteShell_OpCode_OPEN) {
-        LOG_WARN("DMShell: received OPEN from 0x%x sessionId=0x%x", mp.from, frame.session_id);
-        if (!openSession(mp, frame)) {
-            sendError("open_failed", getFrom(&mp));
-        }
-        return ProcessMessage::STOP;
-    }
-
-    if (!session.active || frame.session_id != session.sessionId || getFrom(&mp) != session.peer) {
-        if (!session.active) {
-            LOG_WARN("DMShell: no active session, rejecting op %d from 0x%x", frame.op, mp.from);
-        } else {
-            LOG_WARN("DMShell: session ID mismatch (got 0x%x expected 0x%x) or peer mismatch (got 0x%x expected 0x%x), rejecting "
-                     "op %d",
-                     frame.session_id, session.sessionId, mp.from, session.peer, frame.op);
-        }
-        sendError("invalid_session", getFrom(&mp));
-        return ProcessMessage::STOP;
-    }
-
-    // Honor channel-access flags before ordering checks: a GRANT transfers the turn regardless of
-    // whether this frame's payload is in order.
-    applyTurnFlags(frame);
-
-    if (!shouldProcessIncomingFrame(frame)) {
-        // We won't process the payload (gap/duplicate), but we may now hold the turn, so flush
-        // output and/or hand it back rather than stalling the link.
-        serviceTurn();
-        return ProcessMessage::STOP;
-    }
-
-    session.lastActivityMs = millis();
-
-    switch (frame.op) {
-    case meshtastic_RemoteShell_OpCode_INPUT:
-        if (!writeSessionInput(frame)) {
-            sendError("input_write_failed");
-        } else if (!session.turnManaged) {
-            // Legacy peer (no turn-taking): echo immediately as before. In managed mode the
-            // serviceTurn() call at the end of handleReceived drains the echo and yields the turn.
-            uint8_t outBuf[MAX_MESSAGE_SIZE];
-            const ssize_t bytesRead = read(session.masterFd, outBuf, sizeof(outBuf));
-            if (bytesRead > 0) {
-                LOG_WARN("DMShell: read %zd bytes from PTY", bytesRead);
-                meshtastic_RemoteShell frame = {
-                    .op = meshtastic_RemoteShell_OpCode_OUTPUT,
-                    .session_id = session.sessionId,
-                    .seq = session.nextTxSeq++,
-                    .ack_seq = session.lastAckedRxSeq,
-                    .cols = 0,
-                    .rows = 0,
-                    .flags = 0,
-                };
-                assert(bytesRead <= sizeof(frame.payload.bytes));
-                memcpy(frame.payload.bytes, outBuf, bytesRead);
-                frame.payload.size = bytesRead;
-                sendFrameToPeer(session.peer, frame, true);
-                session.lastActivityMs = millis();
-            }
-        }
-        break;
-    case meshtastic_RemoteShell_OpCode_RESIZE:
-        if (frame.rows > 0 && frame.cols > 0) {
-            struct winsize ws = {};
-            ws.ws_row = frame.rows;
-            ws.ws_col = frame.cols;
-            if (session.masterFd >= 0) {
-                ioctl(session.masterFd, TIOCSWINSZ, &ws);
-            }
-        }
-        break;
-    case meshtastic_RemoteShell_OpCode_PING: {
-        uint32_t peerLastRxSeq = frame.ack_seq;
-        if (frame.last_rx_seq > 0) {
-            peerLastRxSeq = frame.last_rx_seq;
-        }
-
-        const uint32_t nextMissingForPeer = peerLastRxSeq + 1;
-        if (nextMissingForPeer > 0 && nextMissingForPeer < session.nextTxSeq) {
-            resendFramesFrom(nextMissingForPeer);
-        }
-
-        meshtastic_RemoteShell frame = {
-            .op = meshtastic_RemoteShell_OpCode_PONG,
-            .session_id = session.sessionId,
-            .seq = session.nextTxSeq++,
-            .ack_seq = session.lastAckedRxSeq,
-            .cols = 0,
-            .rows = 0,
-            .flags = 0,
-            .last_tx_seq = session.nextTxSeq > 0 ? session.nextTxSeq - 1 : 0,
-            .last_rx_seq = session.lastAckedRxSeq,
-        };
-        frame.payload.size = 0;
-        sendFrameToPeer(session.peer, frame, true);
-        break;
-    }
-    case meshtastic_RemoteShell_OpCode_CLOSE:
-        closeSession("peer_close", true);
-        break;
-    default:
-        sendError("unsupported_op");
-        break;
-    }
-
-    // If the peer granted us the turn, flush pending shell output and hand the turn back.
-    serviceTurn();
-
-    return ProcessMessage::STOP;
-}
-
-int32_t DMShellModule::runOnce()
-{
-    processPendingChildReap();
-
-    if (!session.active) {
-        return 100;
-    }
-
-    reapChildIfExited();
-    if (!session.active) {
-        return 100;
-    }
-
-    if (Throttle::isWithinTimespanMs(session.lastActivityMs, SESSION_IDLE_TIMEOUT_MS) == false) {
-        closeSession("idle_timeout", true);
-        return 100;
-    }
-
-    if (RadioLibInterface::instance->packetsInTxQueue() > 1) {
-        return 50;
-    }
-
-    if (session.turnManaged) {
-        if (session.hasToken) {
-            // We hold the turn: flush output and hand it back.
-            serviceTurn();
-        } else if (ptyHasOutput() && !Throttle::isWithinTimespanMs(session.lastRtsMs, RTS_RETRY_MS)) {
-            // Unsolicited shell output but no turn: ask the client to grant us one.
-            sendRts();
-            session.lastRtsMs = millis();
-        }
-        return 50;
-    }
-
-    // Legacy free-send path (peer is not using turn-taking).
-    uint8_t outBuf[MAX_MESSAGE_SIZE];
-    while (session.masterFd >= 0) {
-        const ssize_t bytesRead = read(session.masterFd, outBuf, sizeof(outBuf));
-        if (bytesRead > 0) {
-            LOG_WARN("DMShell: read %zd bytes from PTY", bytesRead);
-
-            meshtastic_RemoteShell frame = {
-                .op = meshtastic_RemoteShell_OpCode_OUTPUT,
-                .session_id = session.sessionId,
-                .seq = session.nextTxSeq++,
-                .ack_seq = session.lastAckedRxSeq,
-                .cols = 0,
-                .rows = 0,
-                .flags = 0,
-            };
-            assert(bytesRead <= sizeof(frame.payload.bytes));
-            memcpy(frame.payload.bytes, outBuf, bytesRead);
-            frame.payload.size = bytesRead;
-            sendFrameToPeer(session.peer, frame, true);
-
-            session.lastActivityMs = millis();
-            // continue;
-            // do we want to ack every data message, and only send the next on ack?
-            // would require some retry logic. Maybe re-use the wantAck bit
-            return 50;
-        }
-
-        if (bytesRead == 0) {
-            closeSession("pty_eof", true);
-            break;
-        }
-
-        if (errno == EAGAIN || errno == EWOULDBLOCK) {
-            break;
-        }
-
-        LOG_WARN("DMShell: PTY read error errno=%d", errno);
-        closeSession("pty_read_error", true);
-        break;
-    }
-
-    return 100;
-}
-
-bool DMShellModule::parseFrame(const meshtastic_MeshPacket &mp, meshtastic_RemoteShell &outFrame)
-{
-    if (mp.which_payload_variant != meshtastic_MeshPacket_decoded_tag) {
-        return false;
-    }
-
-    if (pb_decode_from_bytes(mp.decoded.payload.bytes, mp.decoded.payload.size, meshtastic_RemoteShell_fields, &outFrame)) {
-        LOG_INFO("Received a DMShell message");
-    } else {
-        LOG_ERROR("Error decoding DMShell message!");
-        return false;
-    }
-
-    return true;
-}
-
-bool DMShellModule::isAuthorizedPacket(const meshtastic_MeshPacket &mp) const
-{
-    if (mp.from == 0) {
-        return !config.security.is_managed;
-    }
-
-    const meshtastic_Channel *ch = &channels.getByIndex(mp.channel);
-    if (strcasecmp(ch->settings.name, Channels::adminChannel) == 0) {
-        return config.security.admin_channel_enabled;
-    }
-
-    if (mp.pki_encrypted) {
-        for (uint8_t i = 0; i < 3; ++i) {
-            if (config.security.admin_key[i].size == 32 &&
-                memcmp(mp.public_key.bytes, config.security.admin_key[i].bytes, 32) == 0) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-bool DMShellModule::openSession(const meshtastic_MeshPacket &mp, const meshtastic_RemoteShell &frame)
-{
-    if (session.active) {
-        closeSession("preempted", false);
-    }
-
-    int masterFd = -1;
-    struct winsize ws = {};
-    if (frame.rows > 0) {
-        ws.ws_row = frame.rows;
-    } else {
-        ws.ws_row = PTY_ROWS_DEFAULT;
-    }
-    if (frame.cols > 0) {
-        ws.ws_col = frame.cols;
-    } else {
-        ws.ws_col = PTY_COLS_DEFAULT;
-    }
-    const pid_t childPid = forkpty(&masterFd, nullptr, nullptr, &ws);
-    if (childPid < 0) {
-        LOG_ERROR("DMShell: forkpty failed errno=%d", errno);
-        return false;
-    }
-
-    if (childPid == 0) {
-        const char *shell = getenv("SHELL");
-        if (!shell || !*shell) {
-            shell = "/bin/sh";
-        }
-        execl(shell, shell, "-i", static_cast<char *>(nullptr));
-        _exit(127);
-    }
-
-    const int flags = fcntl(masterFd, F_GETFL, 0);
-    if (flags >= 0) {
-        fcntl(masterFd, F_SETFL, flags | O_NONBLOCK);
-    }
-
-    session.active = true;
-    session.sessionId = (frame.session_id != 0) ? frame.session_id : static_cast<uint32_t>(random(1, 0x7fffffff));
-    session.peer = getFrom(&mp);
-    session.channel = mp.channel;
-    session.masterFd = masterFd;
-    session.childPid = childPid;
-    session.nextTxSeq = 1;
-    session.lastAckedRxSeq = frame.seq;
-    session.nextExpectedRxSeq = frame.seq + 1;
-    session.highestSeenRxSeq = frame.seq;
-    session.lastActivityMs = millis();
-    session.turnManaged = true;
-    session.hasToken = false;
-    session.lastRtsMs = 0;
-
-    // Honor any GRANT the client put on OPEN (opts this session into turn-taking).
-    applyTurnFlags(frame);
-
-    meshtastic_RemoteShell newFrame = {
-        .op = meshtastic_RemoteShell_OpCode_OPEN_OK,
-        .session_id = session.sessionId,
-        .seq = session.nextTxSeq++,
-        .ack_seq = frame.seq,
-        .cols = ws.ws_col,
-        .rows = ws.ws_row,
-        .flags = session.turnManaged ? TURN_FLAG_GRANT : 0u,
-    };
-    newFrame.payload.size = 0;
-    sendFrameToPeer(session.peer, newFrame, true);
-    if (session.turnManaged) {
-        // OPEN_OK handed the turn back to the client; it is now the idle-owner.
-        session.hasToken = false;
-    }
-
-    LOG_INFO("DMShell: opened session=0x%x peer=0x%x pid=%d", session.sessionId, session.peer, session.childPid);
-    return true;
-}
-
-bool DMShellModule::writeSessionInput(const meshtastic_RemoteShell &frame)
-{
-    if (session.masterFd < 0) {
-        return false;
-    }
-    if (frame.payload.size == 0) {
-        return true;
-    }
-
-    const ssize_t bytesWritten = write(session.masterFd, frame.payload.bytes, frame.payload.size);
-    return bytesWritten >= 0;
-}
-
-void DMShellModule::closeSession(const char *reason, bool notifyPeer)
-{
-    if (!session.active) {
-        return;
-    }
-
-    if (notifyPeer) {
-        const size_t reasonLen = strnlen(reason, 256);
-        meshtastic_RemoteShell frame = {
-            .op = meshtastic_RemoteShell_OpCode_CLOSED,
-            .session_id = session.sessionId,
-            .seq = session.nextTxSeq++,
-            .ack_seq = session.lastAckedRxSeq,
-            .cols = 0,
-            .rows = 0,
-            .flags = 0,
-        };
-        assert(reasonLen <= sizeof(frame.payload.bytes));
-        memcpy(frame.payload.bytes, reason, reasonLen);
-        frame.payload.size = reasonLen;
-        sendFrameToPeer(session.peer, frame, true);
-    }
-
-    if (session.masterFd >= 0) {
-        close(session.masterFd);
-        session.masterFd = -1;
-    }
-
-    if (session.childPid > 0) {
-        // Run this to avoid forgetting a child
-        processPendingChildReap();
-
-        if (kill(session.childPid, SIGTERM) < 0 && errno != ESRCH) {
-            LOG_WARN("DMShell: failed to send SIGTERM to pid=%d errno=%d", session.childPid, errno);
-        }
-
-        pendingChildPid = session.childPid;
-        session.childPid = -1;
-    }
-
-    LOG_INFO("DMShell: closed session=0x%x reason=%s", session.sessionId, reason);
-    session = DMShellSession{};
-}
-
-void DMShellModule::reapChildIfExited()
-{
-    if (!session.active || session.childPid <= 0) {
-        return;
-    }
-
-    int status = 0;
-    const pid_t result = waitpid(session.childPid, &status, WNOHANG);
-    if (result == session.childPid) {
-        closeSession("shell_exited", true);
-    }
-}
-
-void DMShellModule::processPendingChildReap()
-{
-    if (pendingChildPid <= 0) {
-        return;
-    }
-
-    int status = 0;
-    const pid_t result = waitpid(pendingChildPid, &status, WNOHANG);
-
-    if (result == pendingChildPid || (result < 0 && errno == ECHILD)) {
-        pendingChildPid = -1;
-        return;
-    }
-
-    if (result < 0) {
-        LOG_WARN("DMShell: waitpid failed for pid=%d errno=%d", pendingChildPid, errno);
-        pendingChildPid = -1;
-        return;
-    }
-
-    if (pendingChildPid > 0) {
-        if (kill(pendingChildPid, SIGKILL) < 0 && errno != ESRCH) {
-            LOG_WARN("DMShell: failed to send SIGKILL to pid=%d errno=%d", pendingChildPid, errno);
-        }
-        pendingChildPid = -1;
-    }
-}
-
-void DMShellModule::rememberSentFrame(meshtastic_RemoteShell frame)
-{
-    if (frame.seq == 0 || frame.op == meshtastic_RemoteShell_OpCode_ACK) {
-        return;
-    }
-
-    auto &entry = session.txHistory[session.txHistoryNext];
-    entry.valid = true;
-    entry.op = frame.op;
-    entry.sessionId = frame.session_id;
-    entry.seq = frame.seq;
-    entry.ackSeq = frame.ack_seq;
-    entry.cols = frame.cols;
-    entry.rows = frame.rows;
-    entry.flags = frame.flags;
-    entry.payloadLen = frame.payload.size;
-    if (frame.payload.size > 0) {
-        memcpy(entry.payload, frame.payload.bytes, frame.payload.size);
-    }
-
-    session.txHistoryNext = (session.txHistoryNext + 1) % session.txHistory.size();
-}
-
-void DMShellModule::resendFramesFrom(uint32_t startSeq)
-{
-    if (startSeq == 0) {
-        return;
-    }
-
-    DMShellSession::SentFrame *match = nullptr;
-    for (auto &entry : session.txHistory) {
-        if (!entry.valid || entry.seq != startSeq) {
-            continue;
-        }
-        match = &entry;
-        break;
-    }
-
-    if (!match) {
-        LOG_WARN("DMShell: replay request for seq=%u not found in history", startSeq);
-        return;
-    }
-
-    LOG_INFO("DMShell: replaying frame seq=%u op=%d", match->seq, match->op);
-    meshtastic_RemoteShell frame = {
-        .op = match->op,
-        .session_id = match->sessionId,
-        .seq = match->seq,
-        .ack_seq = match->ackSeq,
-        .cols = match->cols,
-        .rows = match->rows,
-        .flags = match->flags,
-    };
-    assert(match->payloadLen <= sizeof(frame.payload.bytes));
-    memcpy(frame.payload.bytes, match->payload, match->payloadLen);
-    frame.payload.size = match->payloadLen;
-    sendFrameToPeer(session.peer, frame, false);
-}
-
-void DMShellModule::sendAck(uint32_t replayFromSeq)
-{
-    if (replayFromSeq > 0) {
-        LOG_WARN("DMShell: requesting replay from seq=%u", replayFromSeq);
-    }
-    meshtastic_RemoteShell frame = {
-        .op = meshtastic_RemoteShell_OpCode_ACK,
-        .session_id = session.sessionId,
-        .seq = 0,
-        .ack_seq = session.lastAckedRxSeq,
-        .cols = 0,
-        .rows = 0,
-        .flags = 0,
-        .last_rx_seq = replayFromSeq - 1,
-    };
-    frame.payload.size = 0;
-    sendFrameToPeer(session.peer, frame, false);
-}
-
-bool DMShellModule::shouldProcessIncomingFrame(const meshtastic_RemoteShell &frame)
-{
-    if (frame.seq == 0) {
-        return true;
-    }
-
-    if (frame.seq < session.nextExpectedRxSeq) {
-        if (session.highestSeenRxSeq >= session.nextExpectedRxSeq) {
-            sendAck(session.nextExpectedRxSeq);
-        } else {
-            sendAck();
-        }
-        return false;
-    }
-
-    if (frame.seq > session.nextExpectedRxSeq) {
-        if (frame.seq > session.highestSeenRxSeq) {
-            session.highestSeenRxSeq = frame.seq;
-        }
-        sendAck(session.nextExpectedRxSeq);
-        return false;
-    }
-
-    session.lastAckedRxSeq = frame.seq;
-    session.nextExpectedRxSeq = frame.seq + 1;
-    if (frame.seq > session.highestSeenRxSeq) {
-        session.highestSeenRxSeq = frame.seq;
-    }
-    if (session.highestSeenRxSeq >= session.nextExpectedRxSeq) {
-        sendAck(session.nextExpectedRxSeq);
-    } else {
-        session.highestSeenRxSeq = 0;
-    }
-    return true;
-}
-
-void DMShellModule::sendFrameToPeer(NodeNum peer, meshtastic_RemoteShell frame, bool remember)
-{
-    meshtastic_MeshPacket *packet = allocDataPacket();
-    if (!packet) {
-        return;
-    }
-    LOG_WARN("DMShell: building packet op=%u session=0x%x seq=%u payloadLen=%zu", frame.op, frame.session_id, frame.seq,
-             frame.payload.size);
-    const size_t encoded = pb_encode_to_bytes(packet->decoded.payload.bytes, sizeof(packet->decoded.payload.bytes),
-                                              meshtastic_RemoteShell_fields, &frame);
-    if (encoded == 0) {
-        return;
-    }
-    packet->decoded.payload.size = encoded;
-
-    if (remember) {
-        rememberSentFrame(frame);
-    }
-
-    packet->to = peer;
-    packet->hop_limit = 0;
-    packet->hop_start = 0;
-    packet->channel = 0;
-    packet->want_ack = false;
-    packet->pki_encrypted = true;
-    packet->priority = meshtastic_MeshPacket_Priority_RELIABLE;
-    service->sendToMesh(packet);
-}
-
-void DMShellModule::applyTurnFlags(const meshtastic_RemoteShell &frame)
-{
-    if (frame.flags & (TURN_FLAG_GRANT | TURN_FLAG_MORE | TURN_FLAG_RTS)) {
-        session.turnManaged = true; // peer speaks turn-taking; enable gating for this session
-    }
-    if (frame.flags & TURN_FLAG_GRANT) {
-        if (!session.hasToken) {
-            // Fresh turn: start the linger window and reset the per-turn budget.
-            session.turnDeadlineMs = millis() + TURN_LINGER_MS;
-            session.turnFramesSent = 0;
-        }
-        session.hasToken = true;
-    }
-}
-
-bool DMShellModule::ptyHasOutput()
-{
-    if (session.masterFd < 0) {
-        return false;
-    }
-    struct pollfd pfd = {};
-    pfd.fd = session.masterFd;
-    pfd.events = POLLIN;
-    return poll(&pfd, 1, 0) > 0 && (pfd.revents & POLLIN);
-}
-
-void DMShellModule::sendOutputFrame(const uint8_t *data, size_t len, uint32_t extraFlags)
-{
-    meshtastic_RemoteShell frame = {
-        .op = meshtastic_RemoteShell_OpCode_OUTPUT,
-        .session_id = session.sessionId,
-        .seq = session.nextTxSeq++,
-        .ack_seq = session.lastAckedRxSeq,
-        .cols = 0,
-        .rows = 0,
-        .flags = extraFlags,
-    };
-    assert(len <= sizeof(frame.payload.bytes));
-    memcpy(frame.payload.bytes, data, len);
-    frame.payload.size = len;
-    sendFrameToPeer(session.peer, frame, true);
-}
-
-void DMShellModule::sendTurnGrant(bool more)
-{
-    meshtastic_RemoteShell frame = {
-        .op = meshtastic_RemoteShell_OpCode_ACK,
-        .session_id = session.sessionId,
-        .seq = 0,
-        .ack_seq = session.lastAckedRxSeq,
-        .cols = 0,
-        .rows = 0,
-        .flags = TURN_FLAG_GRANT | (more ? TURN_FLAG_MORE : 0u),
-        .last_rx_seq = 0,
-    };
-    frame.payload.size = 0;
-    sendFrameToPeer(session.peer, frame, false);
-}
-
-void DMShellModule::sendRts()
-{
-    meshtastic_RemoteShell frame = {
-        .op = meshtastic_RemoteShell_OpCode_ACK,
-        .session_id = session.sessionId,
-        .seq = 0,
-        .ack_seq = session.lastAckedRxSeq,
-        .cols = 0,
-        .rows = 0,
-        .flags = TURN_FLAG_RTS,
-        .last_rx_seq = 0,
-    };
-    frame.payload.size = 0;
-    sendFrameToPeer(session.peer, frame, false);
-}
-
-// Called (every tick) while we hold the turn. Drains available shell output and sends it
-// immediately, then decides whether to keep the turn (linger, to catch output that is about to
-// appear) or hand it back. The turn is yielded once the per-turn budget is hit (so the client can
-// interject, e.g. Ctrl-C) or once the PTY has been idle past the linger window. Output frames go
-// out as soon as they are read (no extra delay); the grant is a trailing ACK.
-void DMShellModule::serviceTurn()
-{
-    if (!session.active || !session.turnManaged || !session.hasToken) {
-        return;
-    }
-
-    uint8_t buf[MAX_MESSAGE_SIZE];
-    bool eof = false;
-    bool readError = false;
-
-    // Drain whatever is available right now, up to the remaining per-turn budget.
-    while (session.turnFramesSent < TURN_BUDGET_FRAMES && session.masterFd >= 0) {
-        const ssize_t n = read(session.masterFd, buf, sizeof(buf));
-        if (n > 0) {
-            sendOutputFrame(buf, (size_t)n, 0u);
-            session.turnFramesSent++;
-            session.lastActivityMs = millis();
-            session.turnDeadlineMs = millis() + TURN_LINGER_MS; // extend the linger while output flows
-        } else if (n == 0) {
-            eof = true;
-            break;
-        } else {
-            if (errno != EAGAIN && errno != EWOULDBLOCK) {
-                readError = true;
-            }
-            break;
-        }
-    }
-
-    if (eof || readError) {
-        session.hasToken = false;
-        sendTurnGrant(false);
-        if (eof) {
-            closeSession("pty_eof", true);
-        } else {
-            LOG_WARN("DMShell: PTY read error errno=%d", errno);
-            closeSession("pty_read_error", true);
-        }
-        return;
-    }
-
-    const bool morePending = ptyHasOutput();
-
-    if (session.turnFramesSent >= TURN_BUDGET_FRAMES) {
-        // Hit the per-turn budget: yield so the client gets a chance to interject (e.g. Ctrl-C).
-        session.hasToken = false;
-        sendTurnGrant(morePending);
-        return;
-    }
-
-    if (!morePending && (int32_t)(millis() - session.turnDeadlineMs) >= 0) {
-        // PTY has been idle past the linger window: hand the turn back.
-        session.hasToken = false;
-        sendTurnGrant(false);
-        return;
-    }
-
-    // Otherwise keep holding the turn: there is more to drain next pass, or we are lingering for
-    // output that may be about to appear. runOnce re-enters serviceTurn on the next tick.
-}
-
-void DMShellModule::sendError(const char *message, NodeNum peer)
-{
-    const size_t len = strnlen(message, MAX_MESSAGE_SIZE);
-    meshtastic_RemoteShell frame = {
-        .op = meshtastic_RemoteShell_OpCode_ERROR,
-        .session_id = session.sessionId,
-        .seq = session.nextTxSeq++,
-        .ack_seq = session.lastAckedRxSeq,
-        .cols = 0,
-        .rows = 0,
-        .flags = 0,
-    };
-    if (message && len > 0) {
-        assert(len <= sizeof(frame.payload.bytes));
-        memcpy(frame.payload.bytes, message, len);
-        frame.payload.size = len;
-    }
-    if (peer == 0) {
-        peer = session.peer;
-    }
-    sendFrameToPeer(peer, frame, true);
-}
-#endif

src/modules/DMShell.h

@@ -1,91 +0,0 @@
-#pragma once
-
-#include "MeshModule.h"
-#include "Router.h"
-#include "SinglePortModule.h"
-#include "concurrency/OSThread.h"
-#include "configuration.h"
-#include "mesh/generated/meshtastic/mesh.pb.h"
-#include <Arduino.h>
-#include <array>
-#include <functional>
-
-#if defined(ARCH_PORTDUINO)
-
-struct DMShellSession {
-    bool active = false;
-    uint32_t sessionId = 0;
-    NodeNum peer = 0;
-    uint8_t channel = 0;
-    int masterFd = -1;
-    int childPid = -1;
-    uint32_t nextTxSeq = 1;
-    uint32_t lastAckedRxSeq = 0;
-    uint32_t nextExpectedRxSeq = 1;
-    uint32_t highestSeenRxSeq = 0;
-    uint32_t lastActivityMs = 0;
-    // --- Half-duplex turn-taking ("talking stick") state ---
-    bool turnManaged = false;    // becomes true once the peer uses turn-taking flags; enables gating
-    bool hasToken = false;       // do we currently hold the right to transmit?
-    uint32_t lastRtsMs = 0;      // last time we asked the client for a turn (rate-limit)
-    uint32_t turnDeadlineMs = 0; // while holding the turn, keep it until this time (extended on output)
-    uint32_t turnFramesSent = 0; // output frames sent in the current held turn (vs TURN_BUDGET_FRAMES)
-    struct SentFrame {
-        bool valid = false;
-        meshtastic_RemoteShell_OpCode op = meshtastic_RemoteShell_OpCode_ERROR;
-        uint32_t sessionId = 0;
-        uint32_t seq = 0;
-        uint32_t ackSeq = 0;
-        uint32_t cols = 0;
-        uint32_t rows = 0;
-        uint32_t flags = 0;
-        uint8_t payload[meshtastic_Constants_DATA_PAYLOAD_LEN] = {0};
-        size_t payloadLen = 0;
-    };
-    std::array<SentFrame, 50> txHistory = {};
-    size_t txHistoryNext = 0;
-};
-
-class DMShellModule : private concurrency::OSThread, public SinglePortModule
-{
-
-  public:
-    DMShellModule();
-
-  protected:
-    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
-    virtual int32_t runOnce() override;
-
-  private:
-    static constexpr uint32_t SESSION_IDLE_TIMEOUT_MS = 5 * 60 * 1000;
-
-    DMShellSession session;
-    pid_t pendingChildPid = -1;
-
-    bool parseFrame(const meshtastic_MeshPacket &mp, meshtastic_RemoteShell &outFrame);
-    bool isAuthorizedPacket(const meshtastic_MeshPacket &mp) const;
-    bool openSession(const meshtastic_MeshPacket &mp, const meshtastic_RemoteShell &frame);
-    bool shouldProcessIncomingFrame(const meshtastic_RemoteShell &frame);
-    bool writeSessionInput(const meshtastic_RemoteShell &frame);
-    void closeSession(const char *reason, bool notifyPeer);
-    void reapChildIfExited();
-    void processPendingChildReap();
-
-    void rememberSentFrame(meshtastic_RemoteShell frame);
-    void resendFramesFrom(uint32_t startSeq);
-    void sendAck(uint32_t replayFromSeq = 0);
-    void sendFrameToPeer(NodeNum peer, meshtastic_RemoteShell frame, bool remember = true);
-    void sendError(const char *message, NodeNum peer = 0);
-
-    // --- Turn-taking helpers ---
-    void applyTurnFlags(const meshtastic_RemoteShell &frame);
-    bool ptyHasOutput();
-    void serviceTurn();
-    void sendOutputFrame(const uint8_t *data, size_t len, uint32_t extraFlags);
-    void sendTurnGrant(bool more);
-    void sendRts();
-};
-
-extern DMShellModule *dmShellModule;
-
-#endif

src/modules/ExternalNotificationModule.cpp

@@ -24,6 +24,10 @@
 #include "mesh/generated/meshtastic/rtttl.pb.h"
 #include <Arduino.h>
 
+#if HAS_LIBNOTIFY
+#include <libnotify/notify.h>
+#endif
+
 #if defined(HAS_RGB_LED)
 #include "AmbientLightingThread.h"
 uint8_t red = 0;
@@ -418,6 +422,9 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
             if (genericShouldAlert) {
                 LOG_INFO("externalNotificationModule - Generic alert");
                 setExternalState(0, true);
+#if HAS_LIBNOTIFY
+                portduinoNotify(mp);
+#endif
             }
 
             if (vibraShouldAlert) {
@@ -531,3 +538,40 @@ int ExternalNotificationModule::handleInputEvent(const InputEvent *event)
     }
     return 0;
 }
+
+#if HAS_LIBNOTIFY
+void ExternalNotificationModule::portduinoNotify(const meshtastic_MeshPacket &mp)
+{
+    std::string senderName;
+    const meshtastic_NodeInfoLite *sender = nodeDB->getMeshNode(mp.from);
+    if (sender && sender->has_user) {
+        if (sender->user.long_name[0] != '\0') {
+            senderName = sender->user.long_name;
+        } else {
+            senderName = sender->user.short_name;
+        }
+    } else {
+        senderName = std::to_string(mp.from);
+    }
+    std::string notificationSummary = "From: " + senderName;
+    std::string notificationBody = std::string((char *)mp.decoded.payload.bytes, mp.decoded.payload.size);
+
+    if (!notify_is_initted()) {
+        if (!notify_init("Meshtasticd")) {
+            LOG_WARN("Failed to initialize libnotify");
+            return;
+        }
+    }
+    NotifyNotification *notification =
+        notify_notification_new(notificationSummary.c_str(), notificationBody.c_str(), "org.meshtastic.meshtasticd");
+    if (notification) {
+        GError *error = nullptr;
+        if (!notify_notification_show(notification, &error)) {
+            LOG_WARN("Failed to show notification: %s", error ? error->message : "unknown error");
+            if (error)
+                g_error_free(error);
+        }
+        g_object_unref(G_OBJECT(notification));
+    }
+}
+#endif

src/modules/ExternalNotificationModule.h

@@ -94,6 +94,10 @@ class ExternalNotificationModule : public SinglePortModule, private concurrency:
     virtual AdminMessageHandleResult handleAdminMessageForModule(const meshtastic_MeshPacket &mp,
                                                                  meshtastic_AdminMessage *request,
                                                                  meshtastic_AdminMessage *response) override;
+
+#if HAS_LIBNOTIFY
+    void portduinoNotify(const meshtastic_MeshPacket &mp);
+#endif
 };
 
 extern ExternalNotificationModule *externalNotificationModule;

src/modules/Modules.cpp

@@ -49,7 +49,6 @@
 #include "modules/WaypointModule.h"
 #endif
 #if ARCH_PORTDUINO
-#include "modules/DMShell.h"
 #include "modules/Telemetry/HostMetrics.h"
 #if !MESHTASTIC_EXCLUDE_STOREFORWARD
 #include "modules/StoreForwardModule.h"
@@ -196,7 +195,6 @@ void setupModules()
 #endif
 #if ARCH_PORTDUINO
     new HostMetricsModule();
-    dmShellModule = new DMShellModule();
 #endif
 #if HAS_TELEMETRY
     new DeviceTelemetryModule();

test/test_meshpacket_serializer/ports/test_dmshell.cpp

@@ -1,97 +0,0 @@
-#include "../test_helpers.h"
-#include "mesh/mesh-pb-constants.h"
-
-namespace
-{
-struct BytesDecodeState {
-    uint8_t *buffer;
-    size_t capacity;
-    size_t length;
-};
-
-struct BytesEncodeState {
-    const uint8_t *buffer;
-    size_t length;
-};
-
-bool decodeBytesField(pb_istream_t *stream, const pb_field_iter_t *field, void **arg)
-{
-    (void)field;
-    auto *state = static_cast<BytesDecodeState *>(*arg);
-    if (!state) {
-        return false;
-    }
-
-    const size_t fieldLen = stream->bytes_left;
-    if (fieldLen > state->capacity) {
-        return false;
-    }
-
-    if (!pb_read(stream, state->buffer, fieldLen)) {
-        return false;
-    }
-
-    state->length = fieldLen;
-    return true;
-}
-
-bool encodeBytesField(pb_ostream_t *stream, const pb_field_iter_t *field, void *const *arg)
-{
-    auto *state = static_cast<const BytesEncodeState *>(*arg);
-    if (!state || !state->buffer || state->length == 0) {
-        return true;
-    }
-
-    if (!pb_encode_tag_for_field(stream, field)) {
-        return false;
-    }
-
-    return pb_encode_string(stream, state->buffer, state->length);
-}
-
-void assert_dmshell_roundtrip(meshtastic_RemoteShell_OpCode op, uint32_t sessionId, uint32_t seq, const uint8_t *payload,
-                              size_t payloadLen, uint32_t cols = 0, uint32_t rows = 0)
-{
-    meshtastic_RemoteShell tx = meshtastic_RemoteShell_init_zero;
-    tx.op = op;
-    tx.session_id = sessionId;
-    tx.seq = seq;
-    tx.cols = cols;
-    tx.rows = rows;
-
-    uint8_t encoded[meshtastic_Constants_DATA_PAYLOAD_LEN] = {0};
-    size_t encodedLen = pb_encode_to_bytes(encoded, sizeof(encoded), meshtastic_RemoteShell_fields, &tx);
-    TEST_ASSERT_GREATER_THAN_UINT32(0, encodedLen);
-
-    meshtastic_RemoteShell rx = meshtastic_RemoteShell_init_zero;
-
-    TEST_ASSERT_TRUE(pb_decode_from_bytes(encoded, encodedLen, meshtastic_RemoteShell_fields, &rx));
-    TEST_ASSERT_EQUAL(op, rx.op);
-    TEST_ASSERT_EQUAL_UINT32(sessionId, rx.session_id);
-    TEST_ASSERT_EQUAL_UINT32(seq, rx.seq);
-    TEST_ASSERT_EQUAL_UINT32(cols, rx.cols);
-    TEST_ASSERT_EQUAL_UINT32(rows, rx.rows);
-}
-} // namespace
-
-void test_dmshell_open_roundtrip()
-{
-    assert_dmshell_roundtrip(meshtastic_RemoteShell_OpCode_OPEN, 0x101, 1, nullptr, 0, 120, 40);
-}
-
-void test_dmshell_input_roundtrip()
-{
-    const uint8_t payload[] = {'l', 's', '\n'};
-    assert_dmshell_roundtrip(meshtastic_RemoteShell_OpCode_INPUT, 0x202, 2, payload, sizeof(payload));
-}
-
-void test_dmshell_resize_roundtrip()
-{
-    assert_dmshell_roundtrip(meshtastic_RemoteShell_OpCode_RESIZE, 0x303, 3, nullptr, 0, 180, 55);
-}
-
-void test_dmshell_close_roundtrip()
-{
-    const uint8_t reason[] = {'b', 'y', 'e'};
-    assert_dmshell_roundtrip(meshtastic_RemoteShell_OpCode_CLOSE, 0x404, 4, reason, sizeof(reason));
-}

test/test_meshpacket_serializer/test_serializer.cpp

@@ -19,10 +19,6 @@ void test_telemetry_environment_metrics_complete_coverage();
 void test_telemetry_environment_metrics_unset_fields();
 void test_encrypted_packet_serialization();
 void test_empty_encrypted_packet();
-void test_dmshell_open_roundtrip();
-void test_dmshell_input_roundtrip();
-void test_dmshell_resize_roundtrip();
-void test_dmshell_close_roundtrip();
 
 void setup()
 {
@@ -56,12 +52,6 @@ void setup()
     RUN_TEST(test_encrypted_packet_serialization);
     RUN_TEST(test_empty_encrypted_packet);
 
-    // DMShell protobuf transport tests
-    RUN_TEST(test_dmshell_open_roundtrip);
-    RUN_TEST(test_dmshell_input_roundtrip);
-    RUN_TEST(test_dmshell_resize_roundtrip);
-    RUN_TEST(test_dmshell_close_roundtrip);
-
     UNITY_END();
 }
 

variants/native/portduino/platformio.ini

@@ -2,6 +2,8 @@
 extends = portduino_base
 build_flags = ${portduino_base.build_flags} -I variants/native/portduino
   -I /usr/include
+  !pkg-config --cflags --libs libnotify
+  -D HAS_LIBNOTIFY=1
 board = cross_platform
 board_level = extra
 lib_deps = 
@@ -27,7 +29,8 @@ build_type = release
 lib_deps =
   ${native_base.lib_deps}
   ${device-ui_base.lib_deps}
-build_flags = ${native_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunction-sections -fdata-sections -Wl,--gc-sections
+build_flags = ${native_base.build_flags}
+  -Os -lX11 -linput -lxkbcommon -ffunction-sections -fdata-sections -Wl,--gc-sections
   -D RAM_SIZE=16384
   -D USE_X11=1
   -D HAS_TFT=1
@@ -55,7 +58,8 @@ build_type = release
 lib_deps =
   ${native_base.lib_deps}
   ${device-ui_base.lib_deps}
-build_flags = ${native_base.build_flags} -Os -ffunction-sections -fdata-sections -Wl,--gc-sections
+build_flags = ${native_base.build_flags}
+  -Os -ffunction-sections -fdata-sections -Wl,--gc-sections
   -D RAM_SIZE=8192
   -D USE_FRAMEBUFFER=1
   -D LV_COLOR_DEPTH=32
@@ -84,7 +88,8 @@ build_type = debug
 lib_deps =
   ${native_base.lib_deps}
   ${device-ui_base.lib_deps}
-build_flags = ${native_base.build_flags} -O0 -fsanitize=address -lX11 -linput -lxkbcommon
+build_flags = ${native_base.build_flags}
+  -O0 -fsanitize=address -lX11 -linput -lxkbcommon
   -D DEBUG_HEAP
   -D RAM_SIZE=16384
   -D USE_X11=1
@@ -112,7 +117,9 @@ build_src_filter = ${env:native-tft.build_src_filter}
 
 [env:coverage]
 extends = env:native
-build_flags = -lgcov --coverage -fprofile-abs-path -fsanitize=address ${env:native.build_flags}
+build_flags =
+  -lgcov --coverage -fprofile-abs-path -fsanitize=address
+  ${env:native.build_flags}
 ; https://docs.platformio.org/en/latest/projectconf/sections/env/options/test/test_testing_command.html
 test_testing_command =
   ${platformio.build_dir}/${this.__env__}/meshtasticd