update 2026-09-20 06:03:34

luci-app-wizard/root/etc/init.d/wizard

@@ -16,9 +16,14 @@ add_wizard() {
 
 	config_get wan_proto "$cfg" wan_proto
 
-	device=$(uci get network.wan.device 2>/dev/null)
+	device=$(uci -q get network.wan.device || uci -q get wizard.default.old_network_device)
 	case "${wan_proto}" in
 		dhcp)
+			uci -q del_list network.@device[0].ports="$device"
+			uci -q del network.lan.gateway
+			uci -q del dhcp.lan.ignore
+			uci -q del network.lan.dns
+			uci -q del firewall.@zone[0].masq
 			uci delete network.wan
 			uci set network.wan=interface
 			uci set network.wan.device="$device"
@@ -28,6 +33,11 @@ add_wizard() {
 			config_get wan_pppoe_user "$cfg" wan_pppoe_user
 			config_get wan_pppoe_pass "$cfg" wan_pppoe_pass
 			[[ "${wan_pppoe_user} != $(uci -q get network.wan.username)" || "${wan_pppoe_pass} != $(uci -q get network.wan.password)" ]] && {
+				uci -q del_list network.@device[0].ports="$device"
+				uci -q del network.lan.gateway
+				uci -q del dhcp.lan.ignore
+				uci -q del network.lan.dns
+				uci -q del firewall.@zone[0].masq
 				uci delete network.wan
 				uci set network.wan=interface
 				uci set network.wan.proto='pppoe'
@@ -40,6 +50,18 @@ add_wizard() {
 				}
 			}
 		;;
+		siderouter)
+			[ "$dhcp" == "0" ] && dhcp="1"
+			if [[ "${lan_gateway}" != "$(uci -q get network.lan.gateway)" || "${dhcp}" != "$(uci -q get dhcp.lan.ignore)" ]]; then
+			uci -q set network.lan.gateway="${lan_gateway}"
+			[ -n "$lan_dns" ] || lan_dns='223.5.5.5'
+			[ -n "$dhcp" ] && uci -q set dhcp.lan.ignore="1" || uci -q del dhcp.lan.ignore
+			uci -q set firewall.@zone[0].masq='1'
+			WAN=$(uci -q get network.wan.device)
+			uci -q add_list network.@device[0].ports="$WAN"
+			uci -q add_list network.@device[0].ports="$WAN"
+			uci -q set wizard.default.old_network_device="$WAN"
+		;;
 	esac
 
 	config_get lan_ipaddr "$cfg" lan_ipaddr
@@ -47,8 +69,6 @@ add_wizard() {
 		uci set network.lan.ipaddr="${lan_ipaddr}"
 	}
 
-	config_get siderouter "$cfg" siderouter
-	config_get old_siderouter "$cfg" old_siderouter
 	config_get lan_gateway "$cfg" lan_gateway
 	config_get dhcp "$cfg" dhcp
 	config_get lan_dns "$cfg" lan_dns
@@ -56,28 +76,6 @@ add_wizard() {
 	config_get old_ipv6 "$cfg" old_ipv6
 	config_get autoupgrade_pkg "$cfg" autoupgrade_pkg
 	
-	[ "$dhcp" == "0" ] && dhcp="1"
-	if [[ "${lan_gateway}" != "$(uci -q get network.lan.gateway)" || "${dhcp}" != "$(uci -q get dhcp.lan.ignore)" ]]; then
-	if [ "${siderouter}" == "1" ]; then
-		uci -q set network.lan.gateway="${lan_gateway}"
-		[ -n "$lan_dns" ] || lan_dns='223.5.5.5'
-		[ -n "$dhcp" ] && uci -q set dhcp.lan.ignore="1" || uci -q del dhcp.lan.ignore
-		uci -q set firewall.@zone[0].masq='1'
-		WAN=$(uci -q get network.wan.device)
-		uci add_list network.@device[0].ports="$WAN" 2>/dev/null
-		uci -q delete network.wan
-		uci -q delete network.wan6
-	elif [ "${siderouter}" == "0" ]; then
-		uci -q del network.lan.gateway
-		uci -q del dhcp.lan.ignore
-		uci -q del network.lan.dns
-		uci -q del firewall.@zone[0].masq
-		uci -q set network.wan.device='eth1'
-		uci -q set network.wan.proto='dhcp'
-		
-	fi
-	fi
-	
 	[ -n "$lan_dns" ] && {
 		[ "$(uci -q get dhcp.@dnsmasq[0].noresolv)" == 1 ] && {
 		uci -q del dhcp.@dnsmasq[0].noresolv
@@ -218,7 +216,7 @@ process_shortcut() {
 	local shortcut to_url comments lanaddr
 	local cfg="$1"
 	lanaddr="$(uci get network.lan.ipaddr)"
-	[ -n $lanaddr ] && lanaddr="$(echo "$lanaddr" | sed -e "s/\/2\+//")"
+	[ -n $lanaddr ] && lanaddr="$(echo "$lanaddr"| cut -d/ -f1)"
 
     config_get shortcut "$cfg" shortcut
     config_get to_url "$cfg" to_url

v2raya/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=2.4.23
+PKG_VERSION:=2.4.25
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=59185d73b786a13c279e56128876fdf61955f34e1c985833bb1159621d6a03a9
+PKG_HASH:=c687dea82b0763e47d683b583cf9a4b7c5d4a45c08ba60a4ea70c90e63dffa27
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
 PKG_LICENSE:=AGPL-3.0-only
@@ -60,7 +60,7 @@ define Download/v2raya-web
 	URL:=https://github.com/v2rayA/v2rayA/releases/download/v$(PKG_VERSION)/
 	URL_FILE:=web.tar.gz
 	FILE:=$(WEB_FILE)
-	HASH:=2c3f52b9c81913c770cead83bca3dc6341a261c5ffbe4024a4ac8303634f18d4
+	HASH:=d0b1b0536f71a7085eaee7ba8c5805f107fafebe05da537e5ab7cf7f216818b1
 endef
 
 define Build/Prepare