From 5526366fea3861b400f46740e39c0d15ef94e6f8 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 25 May 2026 11:35:10 +0200 Subject: [PATCH] unetd: cli: convey network name from inviter to joiner The unet CLI's join handler used the joiner's --network value as the local network name, so an unspecified --network fell back to the literal 'unet'. The inviter typically uses a different name (e.g. ucoord_), so the two sides ended up keyed differently and any upper layer subscribing to the network-named unetmsg channel never saw each other. The inviter now passes enroll_info={ network } to enroll_start so the inviter's network name rides along in enroll_meta. The joiner prefers data.enroll_meta?.network when present, falling back to its own --network value for backwards compatibility with older inviters. Signed-off-by: John Crispin --- package/network/services/unetd/Makefile | 1 + package/network/services/unetd/files/unet.uc | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/network/services/unetd/Makefile b/package/network/services/unetd/Makefile index 9598bcd0ae..bcc34f138b 100644 --- a/package/network/services/unetd/Makefile +++ b/package/network/services/unetd/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unetd +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/unetd.git PKG_SOURCE_DATE:=2026-05-22 diff --git a/package/network/services/unetd/files/unet.uc b/package/network/services/unetd/files/unet.uc index 44d1c83e5d..45f023e203 100644 --- a/package/network/services/unetd/files/unet.uc +++ b/package/network/services/unetd/files/unet.uc @@ -586,6 +586,7 @@ function network_invite(ctx, argv, named) let req = { network, timeout: named.timeout, + enroll_info: { network }, }; if (named["access-key"]) { @@ -606,12 +607,13 @@ function network_invite(ctx, argv, named) function network_join_peer_update(model, ctx, msg) { let joinreq = ctx.data.enroll; - let name = joinreq.name; let data = network_handle_enroll_update(model, ctx, msg); if (!data) return; + let name = data.enroll_meta?.network ?? joinreq.name; + let iface = { proto: "unet", metric: joinreq.metric,