🎁 Sync 2026-08-05 20:25:34

luci-app-fchomo/root/etc/uci-defaults/99_luci-app-fchomo-migration_node

@@ -163,6 +163,14 @@ migrate() {
 		config_list_foreach "$1" masque_dns add_list "$CONF" "$1" endpoint_dns
 		uci_remove "$CONF" "$1" masque_dns
 	fi
+
+	# zerotier_ipstack -> ipstack
+	if isDefined "$1" zerotier_ipstack; then
+		local zerotier_ipstack
+		config_get zerotier_ipstack "$1" zerotier_ipstack ""
+		uci_remove "$CONF" "$1" zerotier_ipstack
+		uci_set "$CONF" "$1" ipstack "$zerotier_ipstack"
+	fi
 }
 
 config_foreach migrate node

luci-app-fchomo/root/usr/share/fchomo/generate_client.uc

@@ -652,10 +652,6 @@ uci.foreach(uciconf, ucinode, (cfg) => {
 				return orbits;
 			})[0]
 		}),
-		"ip-stack": cfg.zerotier_ipstack ? {
-			mode: cfg.zerotier_ipstack,
-			"congestion-controller": replace(cfg.congestion_controller, 'new_reno', 'reno')
-		} : null,
 
 		/* WireGuard */
 		"pre-shared-key": cfg.wireguard_pre_shared_key,
@@ -680,10 +676,14 @@ uci.foreach(uciconf, ucinode, (cfg) => {
 		"host-key": cfg.ssh_host_key,
 
 		/* Extra fields */
+		"ip-stack": cfg.ipstack ? {
+			mode: cfg.ipstack,
+			"congestion-controller": replace(cfg.congestion_controller, 'new_reno', 'reno')
+		} : null,
 		"udp-over-stream": strToBool(cfg.shadowquic_udp_over_stream || cfg.tuic_udp_over_stream),
 		"heartbeat-interval": strToInt(cfg.tuic_heartbeat) || null,
 		"keep-alive-interval": strToInt(cfg.shadowquic_heartbeat) || null,
-		"congestion-controller": cfg.type in ['zerotier'] ? null : cfg.congestion_controller,
+		"congestion-controller": cfg.type in ['zerotier', 'wireguard', 'masque', 'openvpn'] ? null : cfg.congestion_controller,
 		"bbr-profile": cfg.bbr_profile,
 		"max-open-streams": strToInt(cfg.max_open_streams) || null,