Files
ZephCore/zephcore/adapters/datastore/ZephyrFsUtil.c
T
liquidraver 38f815a0a1 server roles, event loops, companion transports, storage and prefs.json
Server roles (slice 7)
- CommonCLI split into upstream's shape; region CLI moved into CommonCLI;
  ClientACL, RegionMap, TransportKeyStore and both server meshes in
  upstream shape over an Arduino compat shim (helpers/compat: Arduino.h,
  Stream/Print, Serial, SHA256, FILESYSTEM/File over Zephyr fs)
- room server processAck port; `get acl` prints as upstream
- room: default name Room-XXXX, display/input rotation, live radio UI refresh

Event loops (slice 7b)
- repeater and room server share server_main_common with a ServerRole
  descriptor; shared event bits in src/mesh_events.h
- room server deadline-driven (idle wakes 2.2/s -> 0.08/s); companion
  loop() runs on housekeeping (closes the lazy contact-flush gap)
- `get loop.wakes` in debug builds (CONFIG_ZEPHCORE_LOOP_WAKE_STATS)

Companion transports and WiFi (slice 8)
- upstream MultiSerialInterface: BLE, USB/UART and TCP are each a
  BaseSerialInterface, every connected transport gets every frame;
  CompanionSerial holds a lossless reply; shared frame_txq for BLE/TCP
- SerialCompanionTransport and LinuxTCPTransport replaced by
  TcpCompanionTransport; ZephyrBLE split (gatt layout, DFU)
- WiFi companion (upstream wifi.ssid/pwd/enabled CLI, TCP port 5000) on
  boards declaring `capabilities: wifi` in zephcore.yml: the PSRAM
  ESP32-S3 boards, plus Heltec V3 (140 contacts), Wireless Tracker (130)
  and both C6 boards (280); ESP32-S3 without PSRAM gets bounded WiFi
  buffers and a measured 72 KB heap; PSRAM boards' internal heap 72 KB
- TCP queues: own depth (ZEPHCORE_TCP_QUEUE_SIZE=8), RX waits instead
  of dropping
- RAM: companion ClientACL dropped; main/BT-TX/TCP stacks sized from
  measured peaks (-7 KB nRF companions, -9 KB ESP32 companions)
- ESP32 WiFi stopped working under ~200 frames/s unicast. Fixed by:
  patches/zephyr/0017 never block the WiFi task in the RX callback;
  patches/zephyr/0018 lock shared_multi_heap (heap corruption with the
  WiFi heap in PSRAM); patches/modules/hal_espressif/0001 backport of
  hal_espressif af97fb02df (PSRAM realloc)

Storage and prefs (slice 9)
- prefs are now prefs.json through upstream's ConfigSerializer (ported
  verbatim), with upstream's key names for shared fields and ZephCore's
  own under "zc"; on first boot the binary new_prefs / repeater prefs is
  migrated and kept, so a downgrade still boots with the old settings
- helpers/PrefsCodec: both legacy binary layouts (companion 272 B,
  server 311 B) as Zephyr-free codecs; sanitizeNodePrefs is the only
  validator
- fix: server prefs could be replaced by a truncated file when a write
  failed; identity, prefs and channel writes go through one checked
  atomic replace (ZephyrFsUtil)
- fix: a corrupt cad_auto byte turned adaptive CAD off instead of the
  default on
- fix: a deliberate 300 s GPS duty on a repeater was rewritten to 48 h
  on every boot (that migration now runs on legacy files only)
- one identity loader for all roles (IdentityFile); an unusable key
  file is always parked as .bad before regenerating
- server store no longer stamps repeater defaults on room server and
  observer; companion first-boot volume policy moved into the store
  (adoptVolume)
- ZephyrDataStore 1435 -> ~850 lines
2026-09-25 08:34:21 +02:00

131 lines
2.8 KiB
C

/*
* SPDX-License-Identifier: MIT
* ZephyrFsUtil - small filesystem helpers shared by every role's store.
*/
#include "ZephyrFsUtil.h"
#include <stdio.h>
#include <string.h>
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(zephcore_fs, CONFIG_ZEPHCORE_DATASTORE_LOG_LEVEL);
bool zephcore_fs_is_mounted(const char *mount_point)
{
/* fs_readmount() is a pure lookup. fs_statvfs() would log "mount point
* not found" at ERR for an absent /ext on every boot of a board without
* external flash, and before a deferred-init QSPI is mounted. */
int index = 0;
const char *name = NULL;
while (fs_readmount(&index, &name) == 0) {
if (name != NULL && strcmp(name, mount_point) == 0) {
return true;
}
}
return false;
}
bool zephcore_fs_exists(const char *path)
{
struct fs_dirent ent;
return fs_stat(path, &ent) == 0;
}
bool zephcore_fs_remove(const char *path)
{
if (!zephcore_fs_exists(path)) {
return true;
}
return fs_unlink(path) == 0;
}
bool zephcore_fs_read_file(const char *path, uint8_t *buf, size_t cap, size_t *out_len)
{
struct fs_file_t file;
fs_file_t_init(&file);
if (fs_open(&file, path, FS_O_READ) < 0) {
return false;
}
ssize_t n = fs_read(&file, buf, cap);
fs_close(&file);
if (n < 0) {
return false;
}
*out_len = (size_t)n;
return true;
}
bool zephcore_fs_atomic_write(const char *path, zephcore_fs_writer_t writer, void *ctx,
const char *tag)
{
char tmp_path[64];
int pl = snprintf(tmp_path, sizeof(tmp_path), "%s.tmp", path);
if (pl <= 0 || pl >= (int)sizeof(tmp_path)) {
LOG_ERR("%s: path too long", tag);
return false;
}
/* A temp left by an interrupted write */
zephcore_fs_remove(tmp_path);
struct fs_file_t file;
fs_file_t_init(&file);
int rc = fs_open(&file, tmp_path, FS_O_CREATE | FS_O_WRITE);
if (rc < 0) {
LOG_ERR("%s: open %s failed: %d", tag, tmp_path, rc);
return false;
}
bool write_ok = writer(&file, ctx);
int sync_rc = fs_sync(&file);
fs_close(&file);
if (!write_ok || sync_rc < 0) {
if (!write_ok) {
LOG_ERR("%s: write failed", tag);
}
if (sync_rc < 0) {
LOG_ERR("%s: sync failed: %d", tag, sync_rc);
}
fs_unlink(tmp_path);
return false;
}
rc = fs_rename(tmp_path, path);
if (rc < 0) {
LOG_ERR("%s: rename %s -> %s failed: %d", tag, tmp_path, path, rc);
fs_unlink(tmp_path);
return false;
}
return true;
}
struct replace_ctx {
const uint8_t *buf;
size_t len;
};
static bool replace_writer(struct fs_file_t *file, void *ctx)
{
const struct replace_ctx *c = ctx;
ssize_t n = fs_write(file, c->buf, c->len);
return n >= 0 && (size_t)n == c->len;
}
bool zephcore_fs_atomic_replace(const char *path, const uint8_t *buf, size_t len,
const char *tag)
{
struct replace_ctx c = { .buf = buf, .len = len };
return zephcore_fs_atomic_write(path, replace_writer, &c, tag);
}