From 0b2f93662a58741142fc6df99240fd763f239dd2 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Fri, 9 May 2025 20:43:07 +0800 Subject: [PATCH] update 2025-05-09 20:43:07 --- luci-app-tailscale/Makefile | 2 +- .../htdocs/luci-static/resources/view/tailscale/interface.js | 4 ++-- luci-app-tailscale/root/usr/sbin/tailscale_helper | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/luci-app-tailscale/Makefile b/luci-app-tailscale/Makefile index 8641a84d8..eb20a403b 100644 --- a/luci-app-tailscale/Makefile +++ b/luci-app-tailscale/Makefile @@ -8,7 +8,7 @@ LUCI_TITLE:=LuCI for Tailscale LUCI_DEPENDS:=+tailscale LUCI_PKGARCH:=all -PKG_VERSION:=1.2.5 +PKG_VERSION:=1.2.6 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js index 99d58b641..68098c241 100644 --- a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js +++ b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js @@ -30,9 +30,9 @@ return view.extend({ const addr_info = iface.addr_info || []; addr_info.forEach(addr => { - if (addr.family === 'inet') { + if (addr.family === 'inet' && !parsedInfo.ipv4) { parsedInfo.ipv4 = addr.local; - } else if (addr.family === 'inet6') { + } else if (addr.family === 'inet6' && !parsedInfo.ipv6) { parsedInfo.ipv6 = addr.local; } }); diff --git a/luci-app-tailscale/root/usr/sbin/tailscale_helper b/luci-app-tailscale/root/usr/sbin/tailscale_helper index f92fc4900..85b986c65 100755 --- a/luci-app-tailscale/root/usr/sbin/tailscale_helper +++ b/luci-app-tailscale/root/usr/sbin/tailscale_helper @@ -57,10 +57,10 @@ if [ -z "$(uci -q get network.tailscale)" ]; then uci add_list network.ts_lan.ports=$port || revert_exit "Failed to add port $port." done else - ts_ip=$(tailscale ip -4) [ -n "$(uci batch <<-EOF 2>&1 set network.tailscale.proto='static' - set network.tailscale.ipaddr=$ts_ip + set network.tailscale.ipaddr=$(tailscale ip -4) + add_list network.tailscale.ip6addr=$(tailscale ip -6) set network.tailscale.netmask='255.0.0.0' set network.tailscale.device=$ts0 EOF