diff --git a/ddns-scripts/Makefile b/ddns-scripts/Makefile index 607152a1c..9ffc3d2f3 100644 --- a/ddns-scripts/Makefile +++ b/ddns-scripts/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts PKG_VERSION:=2.8.2 -PKG_RELEASE:=42 +PKG_RELEASE:=43 PKG_LICENSE:=GPL-2.0 diff --git a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh index 17475448b..f952396e0 100644 --- a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh +++ b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh @@ -547,9 +547,12 @@ verify_host_port() { return 2 } # extract IP address - if [ -n "$BIND_HOST" -o -n "$KNOT_HOST" ]; then # use BIND host or Knot host if installed + if [ -n "$BIND_HOST" ]; then # use BIND host if installed __IPV4="$(awk -F "address " '/has address/ {print $2; exit}' "$DATFILE")" __IPV6="$(awk -F "address " '/has IPv6/ {print $2; exit}' "$DATFILE")" + elif [ -n "$KNOT_HOST" ]; then # use Knot host if installed + __IPV4="$(awk -F "address " '/has IPv4/ {print $2; exit}' "$DATFILE")" + __IPV6="$(awk -F "address " '/has IPv6/ {print $2; exit}' "$DATFILE")" elif [ -n "$DRILL" ]; then # use drill if installed __IPV4="$(awk '/^'"$__HOST"'/ {print $5}' "$DATFILE" | grep -m 1 -o "$IPV4_REGEX")" __IPV6="$(awk '/^'"$__HOST"'/ {print $5}' "$DATFILE" | grep -m 1 -o "$IPV6_REGEX")" diff --git a/homeproxy/root/etc/config/homeproxy b/homeproxy/root/etc/config/homeproxy index 97db63f87..595df9500 100644 --- a/homeproxy/root/etc/config/homeproxy +++ b/homeproxy/root/etc/config/homeproxy @@ -27,14 +27,20 @@ config homeproxy 'config' config homeproxy 'control' option lan_proxy_mode 'disabled' + list wan_proxy_ipv4_ips '91.105.192.0/23' list wan_proxy_ipv4_ips '91.108.4.0/22' list wan_proxy_ipv4_ips '91.108.8.0/22' + list wan_proxy_ipv4_ips '91.108.16.0/22' list wan_proxy_ipv4_ips '91.108.12.0/22' + list wan_proxy_ipv4_ips '91.108.20.0/22' list wan_proxy_ipv4_ips '91.108.56.0/22' - list wan_proxy_ipv4_ips '95.161.64.0/20' - list wan_proxy_ipv4_ips '149.154.160.0/22' - list wan_proxy_ipv4_ips '149.154.164.0/22' - list wan_proxy_ipv4_ips '149.154.172.0/22' + list wan_proxy_ipv4_ips '149.154.160.0/20' + list wan_proxy_ipv4_ips '185.76.151.0/24' + list wan_proxy_ipv6_ips '2001:67c:4e8::/48' + list wan_proxy_ipv6_ips '2001:b28:f23c::/48' + list wan_proxy_ipv6_ips '2001:b28:f23d::/48' + list wan_proxy_ipv6_ips '2001:b28:f23f::/48' + list wan_proxy_ipv6_ips '2a0a:f280::/32' config homeproxy 'routing' option sniff_override '1' diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 99cc99c33..361097e1c 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -30,13 +30,13 @@ define Download/geosite HASH:=dbaba085b1de1b8b875f3db78fb367aef080f24993af01abe21f4d4ba99048be endef -GEOSITE_IRAN_VER:=202407150030 +GEOSITE_IRAN_VER:=202407201213 GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER) define Download/geosite-ir URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/ URL_FILE:=iran.dat FILE:=$(GEOSITE_IRAN_FILE) - HASH:=73f55b3bc7ae33c63a9eb5ae11be288d9500b89ffa824584a57eb89cbc84a8d6 + HASH:=2c466acbb0775577d5c77c757c968693abf90c03a27c757f1a36d3d77fe33009 endef define Package/v2ray-geodata/template