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_<venue>), 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 <john@phrozen.org>

diff --git a/package/network/services/unetd/Makefile b/package/network/services/unetd/Makefile
index 9598bcd0aeda642805bec6aa2d2b9d2b071bdad4..bcc34f138b9353874cb8930f6ae15f77fdf6a4a8 100644 (file)
--- 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 44d1c83e5db23871c5495eff241a3fb967acdefa..45f023e2036d42829adb15543745b4d5d49ad093 100644 (file)
--- 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,