From 36d86399cc170d856cef140c9e0f25dbc7d4534b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 25 Aug 2020 20:07:41 +0800 Subject: [PATCH 1/4] naiveproxy: add package --- package/ctcgfw/luci-app-naiveproxy/Makefile | 21 ++++ .../luasrc/controller/naiveproxy.lua | 23 ++++ .../luasrc/model/cbi/naiveproxy.lua | 28 +++++ .../view/naiveproxy/naiveproxy_status.htm | 22 ++++ .../luci-app-naiveproxy/po/en/naiveproxy.po | 26 ++++ .../po/zh-cn/naiveproxy.po | 26 ++++ .../root/etc/uci-defaults/naiveproxy | 11 ++ package/ctcgfw/naiveproxy/Makefile | 90 ++++++++++++++ .../ctcgfw/naiveproxy/files/naiveproxy.config | 6 + .../ctcgfw/naiveproxy/files/naiveproxy.init | 47 ++++++++ package/ctcgfw/naiveproxy/files/proxy.json | 1 + ...-build-add-OpenWrt-staging-libraries.patch | 33 +++++ ...ps-x86-OpenWrt-toolchain-definitions.patch | 79 ++++++++++++ ...003-build-drop-useless-deps-simd_asm.patch | 32 +++++ package/ctcgfw/naiveproxy/src/init_env.sh | 113 ++++++++++++++++++ 15 files changed, 558 insertions(+) create mode 100644 package/ctcgfw/luci-app-naiveproxy/Makefile create mode 100644 package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua create mode 100644 package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua create mode 100644 package/ctcgfw/luci-app-naiveproxy/luasrc/view/naiveproxy/naiveproxy_status.htm create mode 100644 package/ctcgfw/luci-app-naiveproxy/po/en/naiveproxy.po create mode 100644 package/ctcgfw/luci-app-naiveproxy/po/zh-cn/naiveproxy.po create mode 100644 package/ctcgfw/luci-app-naiveproxy/root/etc/uci-defaults/naiveproxy create mode 100644 package/ctcgfw/naiveproxy/Makefile create mode 100644 package/ctcgfw/naiveproxy/files/naiveproxy.config create mode 100644 package/ctcgfw/naiveproxy/files/naiveproxy.init create mode 100644 package/ctcgfw/naiveproxy/files/proxy.json create mode 100644 package/ctcgfw/naiveproxy/patches/001-build-add-OpenWrt-staging-libraries.patch create mode 100644 package/ctcgfw/naiveproxy/patches/002-build-add-mips-x86-OpenWrt-toolchain-definitions.patch create mode 100644 package/ctcgfw/naiveproxy/patches/003-build-drop-useless-deps-simd_asm.patch create mode 100755 package/ctcgfw/naiveproxy/src/init_env.sh diff --git a/package/ctcgfw/luci-app-naiveproxy/Makefile b/package/ctcgfw/luci-app-naiveproxy/Makefile new file mode 100644 index 0000000000..ae64510325 --- /dev/null +++ b/package/ctcgfw/luci-app-naiveproxy/Makefile @@ -0,0 +1,21 @@ +# Copyright (C) 2020 Openwrt.org +# +# This is a free software, use it under GNU General Public License v3.0. +# +# Created By [CTCGFW]Project-OpenWrt +# https://github.com/project-openwrt + +include $(TOPDIR)/rules.mk + +PKG_NAME:=luci-app-naiveproxy +PKG_VERSION:=1.0 +PKG_RELEASE:=1 +LUCI_TITLE:=LuCI support for NaiveProxy +LUCI_DEPENDS:=+naiveproxy +LUCI_PKGARCH:=all + +PKG_MAINTAINER:=CN_SZTL + +include $(TOPDIR)/feeds/luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature \ No newline at end of file diff --git a/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua b/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua new file mode 100644 index 0000000000..39180ab190 --- /dev/null +++ b/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua @@ -0,0 +1,23 @@ +-- This is a free software, use it under GNU General Public License v3.0. +-- Created By [CTCGFW]Project OpenWRT +-- https://github.com/project-openwrt + +module("luci.controller.naiveproxy", package.seeall) + +function index() + if not nixio.fs.access("/etc/config/naiveproxy") then + return + end + + local page + page = entry({"admin", "services", "naiveproxy"}, cbi("naiveproxy"), _("NaiveProxy"), 100) + page.dependent = true + entry({"admin", "services", "naiveproxy", "status"},call("act_status")).leaf=true +end + +function act_status() + local e={} + e.running=luci.sys.call("pgrep naive >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) +end diff --git a/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua b/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua new file mode 100644 index 0000000000..cfc727836c --- /dev/null +++ b/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua @@ -0,0 +1,28 @@ +-- Created By [CTCGFW]Project-OpenWrt +-- https://github.com/project-openwrt + +mp = Map("naiveproxy", translate("NaiveProxy")) +mp.description = translate("NaïveProxy uses Chrome's network stack to camouflage traffic with strong censorship resistance and low detectability. Reusing Chrome's stack also ensures best practices in performance and security.") + +mp:section(SimpleSection).template = "naiveproxy/naiveproxy_status" + +s = mp:section(TypedSection, "naiveproxy") +s.anonymous=true +s.addremove=false + +enable = s:option(Flag, "enable", translate("Enable")) +enable.default = 0 +enable.rmempty = false + +listen_addr = s:option(Value, "listen_addr", translate("Listen Address")) +listen_addr.description = translate("proto://[addr][:port]") +listen_addr.rmempty = false + +server_addr = s:option(Value, "server_addr", translate("Server Address")) +server_addr.description = translate("proto://user:pass@hostname[:port]") +server_addr.rmempty = false + +extra_command = s:option(Value, "extra_command", translate("Extra Argument")) +extra_command.description = translate("Appends extra argument to NaiveProxy") + +return mp diff --git a/package/ctcgfw/luci-app-naiveproxy/luasrc/view/naiveproxy/naiveproxy_status.htm b/package/ctcgfw/luci-app-naiveproxy/luasrc/view/naiveproxy/naiveproxy_status.htm new file mode 100644 index 0000000000..2ebbdc86d6 --- /dev/null +++ b/package/ctcgfw/luci-app-naiveproxy/luasrc/view/naiveproxy/naiveproxy_status.htm @@ -0,0 +1,22 @@ + + +
+

+ <%:Collecting data...%> +

+
\ No newline at end of file diff --git a/package/ctcgfw/luci-app-naiveproxy/po/en/naiveproxy.po b/package/ctcgfw/luci-app-naiveproxy/po/en/naiveproxy.po new file mode 100644 index 0000000000..5c04430518 --- /dev/null +++ b/package/ctcgfw/luci-app-naiveproxy/po/en/naiveproxy.po @@ -0,0 +1,26 @@ +msgid "NaiveProxy" +msgstr "" + +msgid "NaïveProxy uses Chrome's network stack to camouflage traffic with strong censorship resistance and low detectability. Reusing Chrome's stack also ensures best practices in performance and security." +msgstr "" + +msgid "RUNNING" +msgstr "" + +msgid "NOT RUNNING" +msgstr "" + +msgid "Enable" +msgstr "" + +msgid "Listen Address" +msgstr "" + +msgid "Server Address" +msgstr "" + +msgid "Extra Argument" +msgstr "" + +msgid "Appends extra argument to NaiveProxy" +msgstr "" diff --git a/package/ctcgfw/luci-app-naiveproxy/po/zh-cn/naiveproxy.po b/package/ctcgfw/luci-app-naiveproxy/po/zh-cn/naiveproxy.po new file mode 100644 index 0000000000..c5db92aacd --- /dev/null +++ b/package/ctcgfw/luci-app-naiveproxy/po/zh-cn/naiveproxy.po @@ -0,0 +1,26 @@ +msgid "NaiveProxy" +msgstr "NaiveProxy" + +msgid "NaïveProxy uses Chrome's network stack to camouflage traffic with strong censorship resistance and low detectability. Reusing Chrome's stack also ensures best practices in performance and security." +msgstr "NaïveProxy 使用 Chrome 网络堆栈强大的反审查功能和低可检测性来伪装流量，同时确保在性能和安全方面达到最佳。" + +msgid "RUNNING" +msgstr "运行中" + +msgid "NOT RUNNING" +msgstr "未运行" + +msgid "Enable" +msgstr "启用" + +msgid "Listen Address" +msgstr "监听地址" + +msgid "Server Address" +msgstr "服务器地址" + +msgid "Extra Argument" +msgstr "额外参数" + +msgid "Appends extra argument to NaiveProxy" +msgstr "追加额外参数到 NaiveProxy" diff --git a/package/ctcgfw/luci-app-naiveproxy/root/etc/uci-defaults/naiveproxy b/package/ctcgfw/luci-app-naiveproxy/root/etc/uci-defaults/naiveproxy new file mode 100644 index 0000000000..96db99b1c7 --- /dev/null +++ b/package/ctcgfw/luci-app-naiveproxy/root/etc/uci-defaults/naiveproxy @@ -0,0 +1,11 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@naiveproxy[-1] + add ucitrack naiveproxy + set ucitrack.@naiveproxy[-1].init=naiveproxy + commit ucitrack +EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/package/ctcgfw/naiveproxy/Makefile b/package/ctcgfw/naiveproxy/Makefile new file mode 100644 index 0000000000..42075a30b3 --- /dev/null +++ b/package/ctcgfw/naiveproxy/Makefile @@ -0,0 +1,90 @@ +# +# Copyright (C) 2020 Project OpenWrt +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=naiveproxy +PKG_VERSION:=84.0.4147.89-2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=f18fbb77dfb5326e97aff8340d42d327ec8572a82e5611e405e375454fe37b29 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=CN_SZTL + +PKG_FIXUP:=autoreconf +PKG_BUILD_DEPENDS:=ninja/host python3/host +PKG_USE_MIPS16:=0 +PKG_BUILD_PARALLEL:=1 + +ifneq ($(CONFIG_CPU_TYPE)," ") + CPU_TYPE:=$(word 1, $(subst +," ,$(CONFIG_CPU_TYPE))) + CPU_SUBTYPE:=$(word 2, $(subst +, ",$(CONFIG_CPU_TYPE))) + ifeq ($(CPU_SUBTYPE),) + CPU_SUBTYPE:="" + endif +else + CPU_TYPE:="" + CPU_SUBTYPE:="" +endif + +include $(INCLUDE_DIR)/package.mk + +define Package/naiveproxy + SECTION:=net + CATEGORY:=Network + SUBMENU:=Web Servers/Proxies + URL:=https://github.com/klzgrad/naiveproxy + TITLE:=Make a fortune quietly + DEPENDS:=@!(arc||armeb||powerpc) +libatomic +libnss +endef + +define Package/naiveproxy/description + NaïveProxy uses Chrome's network stack to camouflage traffic with strong + censorship resistance and low detectability. Reusing Chrome's stack also + ensures best practices in performance and security. +endef + +ifneq ($(CONFIG_CCACHE),) + export CCACHE_SLOPPINESS=time_macros + export CCACHE_BASEDIR=$(PKG_BUILD_DIR)/src + export CCACHE_CPP2=yes + export naive_ccache_flags=cc_wrapper="ccache" +endif + +define Build/Compile +( \ + cd $(PKG_BUILD_DIR) ; \ + ./tools/import-upstream.sh ; \ + . ./init_env.sh "$(ARCH)" "$(BOARD)" $(CPU_TYPE) $(CPU_SUBTYPE) "$(TOOLCHAIN_DIR)" "$(DL_DIR)"; \ + export naive_flags="$$$${naive_flags} $$$${naive_ccache_flags}" ; \ + export OP_STAGING_DIR="$(STAGING_DIR)" ; \ + mkdir -p out ; \ + ./gn/out/gn gen "out/Release" --args="$$$${naive_flags}" --script-executable="$(STAGING_DIR_HOSTPKG)/bin/python3" ; \ + $(STAGING_DIR_HOSTPKG)/bin/ninja -C "out/Release" naive ; \ +) +endef + +define Package/naiveproxy/conffiles +/etc/chromium/policies/managed/proxy.json +/etc/config/naiveproxy +endef + +define Package/naiveproxy/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/out/Release/naive $(1)/usr/bin/naive + $(INSTALL_DIR) $(1)/etc/chromium/policies/managed + $(INSTALL_CONF) $(CURDIR)/files/proxy.json $(1)/etc/chromium/policies/managed/proxy.json + $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d + $(INSTALL_CONF) $(CURDIR)/files/naiveproxy.config $(1)/etc/config/naiveproxy + $(INSTALL_BIN) $(CURDIR)/files/naiveproxy.init $(1)/etc/init.d/naiveproxy +endef + +$(eval $(call BuildPackage,naiveproxy)) diff --git a/package/ctcgfw/naiveproxy/files/naiveproxy.config b/package/ctcgfw/naiveproxy/files/naiveproxy.config new file mode 100644 index 0000000000..439e30bef4 --- /dev/null +++ b/package/ctcgfw/naiveproxy/files/naiveproxy.config @@ -0,0 +1,6 @@ + +config naiveproxy 'config' + option enable '0' + option listen_addr '' + option server_addr '' + option extra_argument '' diff --git a/package/ctcgfw/naiveproxy/files/naiveproxy.init b/package/ctcgfw/naiveproxy/files/naiveproxy.init new file mode 100644 index 0000000000..c524070f71 --- /dev/null +++ b/package/ctcgfw/naiveproxy/files/naiveproxy.init @@ -0,0 +1,47 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2010 [CTCGFW] Project OpenWRT + +. /lib/functions.sh +. /lib/functions/procd.sh + +USE_PROCD=1 + +START=99 +STOP=10 + +init_conf() { + config_load "naiveproxy" + config_get "enable" "config" "enable" "0" + config_get "listen_addr" "config" "listen_addr" + config_get "server_addr" "config" "server_addr" + config_get "extra_argument" "config" "extra_argument" +} + +start_service() { + init_conf + [ "${enable}" == "1" ] || exit 0 + + procd_open_instance naiveproxy + + procd_set_param command naive + procd_append_param command --listen="${listen_addr}" + procd_append_param command --proxy="${server_addr}" + [ -n "${extra_argument}" ] && procd_append_param command "${extra_argument}" + + procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} + procd_set_param limits core="unlimited" + procd_set_param stdout 1 + procd_set_param stderr 1 + + procd_close_instance +} + +reload_service() +{ + stop + start +} + +service_triggers() { + procd_add_reload_trigger "naiveproxy" +} diff --git a/package/ctcgfw/naiveproxy/files/proxy.json b/package/ctcgfw/naiveproxy/files/proxy.json new file mode 100644 index 0000000000..d1ebe78958 --- /dev/null +++ b/package/ctcgfw/naiveproxy/files/proxy.json @@ -0,0 +1 @@ +{ "MaxConnectionsPerProxy": 99 } diff --git a/package/ctcgfw/naiveproxy/patches/001-build-add-OpenWrt-staging-libraries.patch b/package/ctcgfw/naiveproxy/patches/001-build-add-OpenWrt-staging-libraries.patch new file mode 100644 index 0000000000..5ec1f4faca --- /dev/null +++ b/package/ctcgfw/naiveproxy/patches/001-build-add-OpenWrt-staging-libraries.patch @@ -0,0 +1,33 @@ +From 5b476d92f8dbee8b83061faa8cd18a46e5ab4aae Mon Sep 17 00:00:00 2001 +From: CN_SZTL +Date: Tue, 18 Aug 2020 20:36:39 +0000 +Subject: [PATCH 1/3] build: add OpenWrt staging libraries + +--- + src/build/config/posix/BUILD.gn | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/build/config/posix/BUILD.gn b/src/build/config/posix/BUILD.gn +index 9ccb89f27..de9e5501d 100644 +--- a/src/build/config/posix/BUILD.gn ++++ b/src/build/config/posix/BUILD.gn +@@ -28,6 +28,9 @@ config("runtime_library") { + if (!is_mac && !is_ios && sysroot != "") { + # Pass the sysroot to all C compiler variants, the assembler, and linker. + sysroot_flags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ] ++ sysroot_flags += [ "-I" + getenv("OP_STAGING_DIR") + "/usr/include" ] ++ sysroot_flags += [ "-I" + getenv("OP_STAGING_DIR") + "/usr/include/nss" ] ++ sysroot_flags += [ "-I" + getenv("OP_STAGING_DIR") + "/usr/include/nspr" ] + if (is_linux) { + # This is here so that all files get recompiled after a sysroot roll and + # when turning the sysroot on or off. (defines are passed via the command +@@ -57,6 +60,7 @@ config("runtime_library") { + cflags_objcc += sysroot_flags + + # Need to get some linker flags out of the sysroot. ++ ldflags += [ "-L" + getenv("OP_STAGING_DIR") + "/usr/lib" ] + ld_paths = exec_script("sysroot_ld_path.py", + [ + rebase_path("//build/linux/sysroot_ld_path.sh", +-- +2.17.1 diff --git a/package/ctcgfw/naiveproxy/patches/002-build-add-mips-x86-OpenWrt-toolchain-definitions.patch b/package/ctcgfw/naiveproxy/patches/002-build-add-mips-x86-OpenWrt-toolchain-definitions.patch new file mode 100644 index 0000000000..393c2de69f --- /dev/null +++ b/package/ctcgfw/naiveproxy/patches/002-build-add-mips-x86-OpenWrt-toolchain-definitions.patch @@ -0,0 +1,79 @@ +From fd4f8c65ecbbdd15d71a04d213314de056107a31 Mon Sep 17 00:00:00 2001 +From: CN_SZTL +Date: Tue, 18 Aug 2020 20:47:40 +0000 +Subject: [PATCH 2/3] build: add mips & x86 OpenWrt toolchain definitions + +--- + src/build/toolchain/linux/BUILD.gn | 42 ++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +diff --git a/src/build/toolchain/linux/BUILD.gn b/src/build/toolchain/linux/BUILD.gn +index 2e7913a4f..cc8084eac 100644 +--- a/src/build/toolchain/linux/BUILD.gn ++++ b/src/build/toolchain/linux/BUILD.gn +@@ -95,6 +95,18 @@ clang_toolchain("clang_x86") { + } + } + ++clang_toolchain("clang_x86_openwrt") { ++ # Output linker map files for binary size analysis. ++ enable_linker_map = true ++ extra_cppflags = "--target=i386-openwrt-linux-musl -D_LIBCPP_HAS_MUSL_LIBC -D__UCLIBC__" ++ extra_ldflags = "--target=i386-openwrt-linux-musl" ++ ++ toolchain_args = { ++ current_cpu = "x86" ++ current_os = "linux" ++ } ++} ++ + clang_toolchain("clang_x86_v8_arm") { + toolchain_args = { + current_cpu = "x86" +@@ -203,6 +215,26 @@ gcc_toolchain("x64") { + } + } + ++clang_toolchain("clang_mips_openwrt") { ++ extra_cppflags = "--target=mips-openwrt-linux-musl -D_LIBCPP_HAS_MUSL_LIBC -D__UCLIBC__" ++ extra_ldflags = "--target=mips-openwrt-linux-musl" ++ ++ toolchain_args = { ++ current_cpu = "mips" ++ current_os = "linux" ++ } ++} ++ ++clang_toolchain("clang_mips64_openwrt") { ++ extra_cppflags = "--target=mips64-openwrt-linux-musl -D_LIBCPP_HAS_MUSL_LIBC -D__UCLIBC__" ++ extra_ldflags = "--target=mips64-openwrt-linux-musl" ++ ++ toolchain_args = { ++ current_cpu = "mips64" ++ current_os = "linux" ++ } ++} ++ + clang_toolchain("clang_mipsel") { + toolchain_args = { + current_cpu = "mipsel" +@@ -227,6 +259,16 @@ clang_toolchain("clang_mips64el") { + } + } + ++clang_toolchain("clang_mips64el_openwrt") { ++ extra_cppflags = "--target=mips64el-openwrt-linux-musl -D_LIBCPP_HAS_MUSL_LIBC -D__UCLIBC__" ++ extra_ldflags = "--target=mips64el-openwrt-linux-musl" ++ ++ toolchain_args = { ++ current_cpu = "mips64el" ++ current_os = "linux" ++ } ++} ++ + gcc_toolchain("mipsel") { + toolprefix = "mipsel-linux-gnu-" + +-- +2.17.1 + diff --git a/package/ctcgfw/naiveproxy/patches/003-build-drop-useless-deps-simd_asm.patch b/package/ctcgfw/naiveproxy/patches/003-build-drop-useless-deps-simd_asm.patch new file mode 100644 index 0000000000..f5c94733d6 --- /dev/null +++ b/package/ctcgfw/naiveproxy/patches/003-build-drop-useless-deps-simd_asm.patch @@ -0,0 +1,32 @@ +From dd07b78f561914ccc6cbe076ae66c380304bf92c Mon Sep 17 00:00:00 2001 +From: CN_SZTL +Date: Wed, 19 Aug 2020 12:42:45 +0000 +Subject: [PATCH 3/3] build: drop useless deps simd_asm + +libjpeg_turbo itself has alreadly set the dependency "simd_asm", +and this will cause cross-compile failed: +``` +ERROR Unresolved dependencies. +//:gn_all(//build/toolchain/linux:clang_arm64_openwrt) + needs //third_party/libjpeg_turbo:simd_asm(//build/toolchain/linux:clang_arm64_openwrt) +``` +So, let's drop it in global build file. +--- + src/BUILD.gn | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/BUILD.gn b/src/BUILD.gn +index 97494c0a0..daddf5213 100644 +--- a/src/BUILD.gn ++++ b/src/BUILD.gn +@@ -746,7 +746,6 @@ group("gn_all") { + if (enable_nacl) { + deps += [ "//native_client/src/trusted/platform_qualify:vcpuid" ] + } +- deps += [ "//third_party/libjpeg_turbo:simd_asm" ] + } + if (is_linux && current_toolchain == host_toolchain) { + deps += [ "//v8:v8_shell" ] +-- +2.17.1 + diff --git a/package/ctcgfw/naiveproxy/src/init_env.sh b/package/ctcgfw/naiveproxy/src/init_env.sh new file mode 100755 index 0000000000..0955ed0785 --- /dev/null +++ b/package/ctcgfw/naiveproxy/src/init_env.sh @@ -0,0 +1,113 @@ +#!/bin/bash +# [CTCGFW] Project-OpenWrt +# Use it under GPLv3. +# -------------------------------------------------------- +# Init build dependencies for naiveproxy + +# Read args from shell +target_arch="$1" +target_board="$2" +cpu_type="$3" +cpu_subtype="$4" +toolchain_dir="$5" +dl_dir="$6" + +# Set arch info +naive_arch="${target_arch}" +[ "${target_arch}" == "i386" ] && naive_arch="x86" +[ "${target_arch}" == "x86_64" ] && naive_arch="x64" +[ "${target_arch}" == "aarch64" ] && naive_arch="arm64" +ldso_path="/lib/$(find "${toolchain_dir}/" | grep -Eo "ld-musl-[a-z0-9_-]+\\.so\\.1")" + +# OS detection +[ "$(uname)" != "Linux" -o "$(uname -m)" != "x86_64" ] && { echo -e "Support Linux AMD64 only."; exit 1; } + +cd "$PWD/src" + +# AFDO profile +[ ! -f "chrome/android/profiles/afdo.prof" ] && { + AFDO_NAME="$(cat "chrome/android/profiles/newest.txt")" + [ ! -f "${dl_dir}/${AFDO_NAME}" ] && curl -L "https://storage.googleapis.com/chromeos-prebuilt/afdo-job/llvm/${AFDO_NAME}" -o "${dl_dir}/${AFDO_NAME}" + bzip2 -cd > "chrome/android/profiles/afdo.prof" < "${dl_dir}/${AFDO_NAME}" +} + +# Download Clang +[ ! -d "third_party/llvm-build/Release+Asserts/bin" ] && { + mkdir -p "third_party/llvm-build/Release+Asserts" + CLANG_REVISION="$(python3 "tools/clang/scripts/update.py" --print-revision)" + [ ! -f "${dl_dir}/clang-${CLANG_REVISION}.tgz" ] && curl -L "https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${CLANG_REVISION}.tgz" -o "${dl_dir}/clang-${CLANG_REVISION}.tgz" + tar -xzf "${dl_dir}/clang-${CLANG_REVISION}.tgz" -C "third_party/llvm-build/Release+Asserts" +} + +# Download GN tool +[ ! -f "gn/out/gn" ] && { + mkdir -p "gn/out" + GN_VERSION="$(grep "'gn_version':" "buildtools/DEPS" | cut -d"'" -f4)" + [ ! -f "${dl_dir}/gn-${GN_VERSION}.zip" ] && curl -L "https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/${GN_VERSION}" -o "${dl_dir}/gn-${GN_VERSION}.zip" + unzip -o "${dl_dir}/gn-${GN_VERSION}.zip" -d "gn/out" +} + +# Set ENV +export DEPOT_TOOLS_WIN_TOOLCHAIN=0 +export naive_flags=" +is_official_build=true +exclude_unwind_tables=true +enable_resource_whitelist_generation=false +symbol_level=0 +is_clang=true +use_sysroot=false + +use_allocator=\"none\" +use_allocator_shim=false + +fatal_linker_warnings=false +treat_warnings_as_errors=false + +fieldtrial_testing_like_official_build=true + +enable_nacl=false +enable_print_preview=false +enable_remoting=false +use_alsa=false +use_cups=false +use_dbus=false +use_gio=false +use_platform_icu_alternatives=true +use_gtk=false +use_system_libdrm=false +use_gnome_keyring=false +use_libpci=false +use_pangocairo=false +use_aura=false +use_glib=false +use_pulseaudio=false +use_udev=false + +disable_file_support=true +enable_websockets=false +disable_ftp_support=true +use_kerberos=false +enable_mdns=false +enable_reporting=false +include_transport_security_state_preload_list=false +rtc_use_pipewire=false + +use_xkbcommon=false +use_ozone=true +ozone_auto_platforms=false +ozone_platform=\"headless\" +ozone_platform_headless=true + +current_os=\"linux\" +current_cpu=\"${naive_arch}\" +sysroot=\"${toolchain_dir}\" +custom_toolchain=\"//build/toolchain/linux:clang_${naive_arch}_openwrt\" +ldso_path=\"${ldso_path}\"" +[ "${target_arch}" == "arm" ] && { + naive_flags="${naive_flags} arm_version=0 arm_cpu=\"${cpu_type}\"" + [ -n "${cpu_subtype}" ] && { echo "${cpu_subtype}" | grep -q "neon" && neon_flag="arm_use_neon=true" || neon_flag="arm_use_neon=false"; naive_flags="${naive_flags} arm_fpu=\"${cpu_subtype}\" arm_float_abi=\"hard\" ${neon_flag}"; } || naive_flags="${naive_flags} arm_float_abi=\"soft\" arm_use_neon=false" +} +[[ "mips mips64 mipsel mips64el" =~ (^|[[:space:]])"${target_arch}"($|[[:space:]]) ]] && { + naive_flags="${naive_flags} use_gold=false is_cfi=false use_cfi_icall=false use_thin_lto=false mips_arch_variant=\"r2\"" + [[ "${target_arch}" =~ ^"mips"$|^"mipsel"$ ]] && naive_flags="mips_float_abi=\"soft\" mips_tune=\"${cpu_type}\"" +} From 1e5c66191267de7f5a1cd42b78a8c4df6d65a786 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 25 Aug 2020 20:14:19 +0800 Subject: [PATCH 2/4] luci-app-vssr: bump to v1.14 --- package/ctcgfw/luci-app-vssr/Makefile | 4 +- .../luci-app-vssr/luasrc/controller/vssr.lua | 14 +--- .../luasrc/model/cbi/vssr/advanced.lua | 2 +- .../luasrc/model/cbi/vssr/client-config.lua | 2 +- .../luasrc/model/cbi/vssr/client.lua | 52 +++---------- .../luasrc/model/cbi/vssr/control.lua | 5 ++ .../luci-app-vssr/luasrc/view/vssr/ssrurl.htm | 73 ++++++++++++++----- package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po | 11 ++- .../ctcgfw/luci-app-vssr/root/etc/init.d/vssr | 6 +- .../root/usr/share/vssr/genconfig_v2ray.lua | 13 ++++ package/ctcgfw/naiveproxy/src/init_env.sh | 6 +- 11 files changed, 107 insertions(+), 81 deletions(-) diff --git a/package/ctcgfw/luci-app-vssr/Makefile b/package/ctcgfw/luci-app-vssr/Makefile index eb5cf66ce6..dd46a5cd67 100644 --- a/package/ctcgfw/luci-app-vssr/Makefile +++ b/package/ctcgfw/luci-app-vssr/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-vssr -PKG_VERSION:=1.13 -PKG_RELEASE:=20200823 +PKG_VERSION:=1.14 +PKG_RELEASE:=20200824 include $(INCLUDE_DIR)/package.mk diff --git a/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua b/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua index 8fa383f0ab..5c48e2f4ca 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua @@ -7,7 +7,7 @@ function index() if nixio.fs.access("/usr/bin/ssr-redir") then entry({"admin", "services", "vssr"}, - alias("admin", "services", "vssr", "client"), _("Hello World"), 10).dependent = + alias("admin", "services", "vssr", "client"), _("Hello World"), 0).dependent = true -- 首页 entry({"admin", "services", "vssr", "client"}, cbi("vssr/client"), _("SSR Client"), 10).leaf = true -- 基本设置 @@ -47,7 +47,7 @@ function index() entry({"admin", "services", "vssr", "checkport"}, call("check_port")) -- 检测单个端口并返回Ping entry({"admin", "services", "vssr", "run"}, call("act_status")) -- 检测全局服务器状态 entry({"admin", "services", "vssr", "change"}, call("change_node")) -- 切换节点 - entry({"admin", "services", "vssr", "allserver"}, call("get_servers")) -- 获取所有节点Json + --entry({"admin", "services", "vssr", "allserver"}, call("get_servers")) -- 获取所有节点Json entry({"admin", "services", "vssr", "subscribe"}, call("get_subscribe")) -- 执行订阅 entry({"admin", "services", "vssr", "flag"}, call("get_flag")) -- 获取节点国旗 iso code entry({"admin", "services", "vssr", "ip"}, call("check_ip")) -- 获取ip情况 @@ -99,10 +99,6 @@ function get_servers() uci:foreach("vssr", "servers", function(s) local e = {} e["name"] = s[".name"] - local t1 = luci.sys.exec( - "ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'" % - s["server"]) - e["t1"] = t1 table.insert(server_table, e) end) luci.http.prepare_content("application/json") @@ -114,14 +110,12 @@ function change_node() local e = {} local uci = luci.model.uci.cursor() local sid = luci.http.formvalue("set") - local name = "" - uci:foreach("vssr", "global", function(s) name = s[".name"] end) e.status = false e.sid = sid if sid ~= "" then - uci:set("vssr", name, "global_server", sid) + uci:set("vssr", '@global[0]', 'global_server', sid) uci:commit("vssr") - luci.sys.call("/etc/init.d/vssr restart") + luci.sys.exec("/etc/init.d/vssr reload") e.status = true end luci.http.prepare_content("application/json") diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua index c938774732..78305c26c0 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua @@ -103,7 +103,7 @@ o.inputstyle = "reset" o.write = function() uci:delete_all("vssr", "servers", function(s) return true end) uci:commit("vssr") - luci.sys.call("/etc/init.d/vssr stop") + luci.sys.exec("/etc/init.d/vssr stop") luci.http.redirect(luci.dispatcher.build_url("admin", "services", "vssr", "advanced")) end diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client-config.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client-config.lua index 592dd1a7a5..e5bf092829 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client-config.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client-config.lua @@ -132,7 +132,7 @@ o.description = translate( o = s:option(Value, "alias", translate("Alias(optional)")) -o = s:option(Value, "flag", translate("Country")) +o = s:option(Value, "flag", translate("Area")) o.description = translate("请自己指定。格式：cn us hk 等") o.rmempty = true diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client.lua index 37ee587612..fa1e84e409 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client.lua @@ -6,6 +6,8 @@ local m, s, sec, o, kcp_enable local vssr = "vssr" local gfwmode=0 + + if nixio.fs.access("/etc/dnsmasq.ssr/gfw_list.conf") then gfwmode=1 end @@ -34,6 +36,9 @@ end table.sort(key_table) +local route_name = {"youtube_server","tw_video_server","netflix_server","disney_server","prime_server","tvb_server","custom_server"} +local route_label = {"Youtube Proxy","TaiWan Video Proxy","Netflix Proxy","Diseny+ Proxy","Prime Video Proxy","TVB Video Proxy","Custom Proxy"} + -- [[ Global Setting ]]-- s = m:section(TypedSection, "global",translate("Basic Settings [SS|SSR|V2ray|Trojan]")) s.anonymous = true @@ -53,46 +58,13 @@ o = s:option(Flag, "v2ray_flow", translate("Open v2ray route")) o.rmempty = false o.description = translate("When open v2ray routed,Apply may take more time.") -o = s:option(ListValue, "youtube_server", translate("Youtube Proxy")) -o:value("nil", translate("Same as Main Server")) -for _,key in pairs(key_table) do o:value(key,server_table[key]) end -o:depends("v2ray_flow", "1") -o.default = "nil" - - - -o = s:option(ListValue, "tw_video_server", translate("TaiWan Video Proxy")) -o:value("nil", translate("Same as Main Server")) -for _,key in pairs(key_table) do o:value(key,server_table[key]) end -o:depends("v2ray_flow", "1") -o.default = "nil" - - -o = s:option(ListValue, "netflix_server", translate("Netflix Proxy")) -o:value("nil", translate("Same as Main Server")) -for _,key in pairs(key_table) do o:value(key,server_table[key]) end -o:depends("v2ray_flow", "1") -o.default = "nil" - - -o = s:option(ListValue, "disney_server", translate("Diseny+ Proxy")) -o:value("nil", translate("Same as Main Server")) -for _,key in pairs(key_table) do o:value(key,server_table[key]) end -o:depends("v2ray_flow", "1") -o.default = "nil" - - -o = s:option(ListValue, "prime_server", translate("Prime Video Proxy")) -o:value("nil", translate("Same as Main Server")) -for _,key in pairs(key_table) do o:value(key,server_table[key]) end -o:depends("v2ray_flow", "1") -o.default = "nil" - -o = s:option(ListValue, "tvb_server", translate("TVB Video Proxy")) -o:value("nil", translate("Same as Main Server")) -for _,key in pairs(key_table) do o:value(key,server_table[key]) end -o:depends("v2ray_flow", "1") -o.default = "nil" +for i,v in pairs(route_name) do + o = s:option(ListValue, v, translate(route_label[i])) + o:value("nil", translate("Same as Main Server")) + for _,key in pairs(key_table) do o:value(key,server_table[key]) end + o:depends("v2ray_flow", "1") + o.default = "nil" +end o = s:option(ListValue, "threads", translate("Multi Threads Option")) o:value("0", translate("Auto Threads")) diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/control.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/control.lua index 8be1a49c3b..bd841e4db4 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/control.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/control.lua @@ -85,4 +85,9 @@ o.remove = function(self, section, value) NXFS.writefile(blockconf, "") end +s:tab("proxy", translate("Custom Proxy Domain Name")) + +o = s:taboption("proxy", DynamicList, "proxy_domain_name", translate("Proxy Domain Name")) +o.datatype = "hostname" + return m \ No newline at end of file diff --git a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/ssrurl.htm b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/ssrurl.htm index 464e6b7d0a..81a92f5763 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/ssrurl.htm +++ b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/ssrurl.htm @@ -130,33 +130,66 @@ s.innerHTML = "<%:Import%>ShadowsocksR<%:Configuration Succeeded%>"; return false; } else if (ssu[0] == "ss") { - var ploc = ssu[1].indexOf("#"); - if (ploc > 0) { - url0 = ssu[1].substr(0, ploc); - param = ssu[1].substr(ploc + 1); - } else { - url0 = ssu[1] - } - var sstr = b64decsafe(url0); + var url0, param = ""; + var sipIndex = ssu[1].indexOf("@"); + var ploc = ssu[1].indexOf("#"); + if (ploc > 0) { + url0 = ssu[1].substr(0, ploc); + param = ssu[1].substr(ploc + 1); + } else { + url0 = ssu[1]; + } + if (sipIndex != -1) { + // SIP002 + var userInfo = b64decsafe(url0.substr(0, sipIndex)); + var temp = url0.substr(sipIndex + 1).split("/?"); + var serverInfo = temp[0].split(":"); + var server = serverInfo[0]; + var port = serverInfo[1]; + var method, password, plugin, pluginOpts; + if (temp[1]) { + var pluginInfo = decodeURIComponent(temp[1]); + var pluginIndex = pluginInfo.indexOf(";"); + var pluginNameInfo = pluginInfo.substr(0, pluginIndex); + plugin = pluginNameInfo.substr(pluginNameInfo.indexOf("=") + 1) + pluginOpts = pluginInfo.substr(pluginIndex + 1); + } - el('.type').value = "ss"; - - el('.type').dispatchEvent(event); - var team = sstr.split('@'); - console.log(param); - var part1 = team[0].split(':'); - var part2 = team[1].split(':'); - el('.server').value = part2[0]; - el('.server_port').value = part2[1]; - el('.password').value = part1[1]; - el('.encrypt_method_ss').value = part1[0]; + var userInfoSplitIndex = userInfo.indexOf(":"); + if (userInfoSplitIndex != -1) { + method = userInfo.substr(0, userInfoSplitIndex); + password = userInfo.substr(userInfoSplitIndex + 1); + } + el('.type').value = "ss"; + el('.type').dispatchEvent(event); + el('.server').value = server; + el('.server_port').value = port; + el('.password').value = password || ""; + el('.encrypt_method_ss').value = method || ""; + el('.plugin').value = plugin || ""; + el('.plugin_opts').value = pluginOpts || ""; + } else { + var sstr = b64decsafe(url0); + el('.type').value = "ss"; + el('.type').dispatchEvent(event); + var team = sstr.split('@'); + console.log(param); + var part1 = team[0].split(':'); + var part2 = team[1].split(':'); + el('.server').value = part2[0]; + el('.server_port').value = part2[1]; + el('.password').value = part1[1]; + el('.encrypt_method_ss').value = part1[0]; + el('.plugin').value = ""; + el('.plugin_opts').value = ""; + } if (param != undefined) { rema = decodeURI(param) el('.alias').value = decodeURI(param); } - getFlag(rema, part2[0], sid); //get flag iso code + getFlag(rema, server, sid); //get flag iso code s.innerHTML = "<%:Import%>Shadowsocks<%:Configuration Succeeded%>"; return false; } else if (ssu[0] == "trojan") { diff --git a/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po b/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po index 48c3cab4bc..bc9a105e01 100644 --- a/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po +++ b/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po @@ -639,6 +639,15 @@ msgstr "Prime Video 代理" msgid "TVB Video Proxy" msgstr "TVB 视频代理" +msgid "Custom Proxy" +msgstr "自定义代理" + +msgid "Custom Proxy Domain Name" +msgstr "自定义分流域名" + +msgid "Proxy Domain Name" +msgstr "需要被分流的域名" + msgid "adblock settings" msgstr "广告屏蔽设置" @@ -649,4 +658,4 @@ msgid "Licence" msgstr "许可" msgid "Area" -msgstr "区域" \ No newline at end of file +msgstr "国家或地区" diff --git a/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr b/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr index af5cc3a7b1..4882698786 100755 --- a/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr +++ b/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr @@ -34,9 +34,9 @@ switch_server=$1 MAXFD=32768 CRON_FILE=/etc/crontabs/root threads=1 -shunt_type=("global" "youtube" "tw_video" "netflix" "disney" "prime" "tvb") -shunt_port=(2080 2081 2082 2083 2084 2085 2086) -shunt_array=("youtube" "tw_video" "netflix" "disney" "prime" "tvb") +shunt_type=("global" "youtube" "tw_video" "netflix" "disney" "prime" "tvb" "custom") +shunt_port=(2080 2081 2082 2083 2084 2085 2086 2087) +shunt_array=("youtube" "tw_video" "netflix" "disney" "prime" "tvb" "custom") scount=0 uci_get_by_name() { local ret=$(uci get $NAME.$1.$2 2>/dev/null) diff --git a/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray.lua b/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray.lua index 32ab211872..84beedf7bf 100755 --- a/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray.lua +++ b/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray.lua @@ -14,6 +14,8 @@ local netflix_server = ucursor:get_first(name, 'global', 'netflix_server') local disney_server = ucursor:get_first(name, 'global', 'disney_server') local prime_server = ucursor:get_first(name, 'global', 'prime_server') local tvb_server = ucursor:get_first(name, 'global', 'tvb_server') +local custom_server = ucursor:get_first(name, 'global', 'custom_server') +local proxy_domain_name = ucursor:get_list(name,"@access_control[0]","proxy_domain_name") function gen_outbound(server_node, tags, local_ports) local bound = {} @@ -107,6 +109,7 @@ if v2ray_flow == "1" then table.insert(outbounds_table, gen_outbound(disney_server, "disney",2084)) table.insert(outbounds_table, gen_outbound(prime_server, "prime",2085)) table.insert(outbounds_table, gen_outbound(tvb_server, "tvb",2086)) + table.insert(outbounds_table, gen_outbound(custom_server, "custom",2087)) else table.insert(outbounds_table, gen_outbound(server_section, "main",local_port)) end @@ -207,6 +210,12 @@ local tvb_rule = { outboundTag = "tvb" } +local custom_rule = { + type = "field", + domain = proxy_domain_name, + outboundTag = "custom" +} + local rules_table = {} if (youtube_server ~= "nil" and v2ray_flow == "1") then @@ -233,6 +242,10 @@ if (tvb_server ~= "nil" and v2ray_flow == "1") then table.insert(rules_table, tvb_rule) end +if (custom_server ~= "nil" and v2ray_flow == "1") then + table.insert(rules_table, custom_rule) +end + local v2ray = { log = { -- error = "/var/vssrsss.log", diff --git a/package/ctcgfw/naiveproxy/src/init_env.sh b/package/ctcgfw/naiveproxy/src/init_env.sh index 0955ed0785..9119beeaf2 100755 --- a/package/ctcgfw/naiveproxy/src/init_env.sh +++ b/package/ctcgfw/naiveproxy/src/init_env.sh @@ -27,7 +27,7 @@ cd "$PWD/src" # AFDO profile [ ! -f "chrome/android/profiles/afdo.prof" ] && { AFDO_NAME="$(cat "chrome/android/profiles/newest.txt")" - [ ! -f "${dl_dir}/${AFDO_NAME}" ] && curl -L "https://storage.googleapis.com/chromeos-prebuilt/afdo-job/llvm/${AFDO_NAME}" -o "${dl_dir}/${AFDO_NAME}" + [ ! -f "${dl_dir}/${AFDO_NAME}" ] && curl -f --connect-timeout 20 --retry 5 --location --insecure "https://storage.googleapis.com/chromeos-prebuilt/afdo-job/llvm/${AFDO_NAME}" -o "${dl_dir}/${AFDO_NAME}" bzip2 -cd > "chrome/android/profiles/afdo.prof" < "${dl_dir}/${AFDO_NAME}" } @@ -35,7 +35,7 @@ cd "$PWD/src" [ ! -d "third_party/llvm-build/Release+Asserts/bin" ] && { mkdir -p "third_party/llvm-build/Release+Asserts" CLANG_REVISION="$(python3 "tools/clang/scripts/update.py" --print-revision)" - [ ! -f "${dl_dir}/clang-${CLANG_REVISION}.tgz" ] && curl -L "https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${CLANG_REVISION}.tgz" -o "${dl_dir}/clang-${CLANG_REVISION}.tgz" + [ ! -f "${dl_dir}/clang-${CLANG_REVISION}.tgz" ] && curl -f --connect-timeout 20 --retry 5 --location --insecure "https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${CLANG_REVISION}.tgz" -o "${dl_dir}/clang-${CLANG_REVISION}.tgz" tar -xzf "${dl_dir}/clang-${CLANG_REVISION}.tgz" -C "third_party/llvm-build/Release+Asserts" } @@ -43,7 +43,7 @@ cd "$PWD/src" [ ! -f "gn/out/gn" ] && { mkdir -p "gn/out" GN_VERSION="$(grep "'gn_version':" "buildtools/DEPS" | cut -d"'" -f4)" - [ ! -f "${dl_dir}/gn-${GN_VERSION}.zip" ] && curl -L "https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/${GN_VERSION}" -o "${dl_dir}/gn-${GN_VERSION}.zip" + [ ! -f "${dl_dir}/gn-${GN_VERSION}.zip" ] && curl -f --connect-timeout 20 --retry 5 --location --insecure "https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/${GN_VERSION}" -o "${dl_dir}/gn-${GN_VERSION}.zip" unzip -o "${dl_dir}/gn-${GN_VERSION}.zip" -d "gn/out" } From 90927409fa8fa3e97cd51aa4a4042bf32588f8f4 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 25 Aug 2020 20:15:33 +0800 Subject: [PATCH 3/4] luci-app-passwall: bump to 3.9-43 --- package/lienol/luci-app-passwall/Makefile | 4 +- .../model/cbi/passwall/client/global.lua | 9 +- .../luci-app-passwall/po/zh-cn/passwall.po | 27 +- .../root/etc/config/passwall | 11 +- .../root/usr/share/passwall/app.sh | 27 +- .../root/usr/share/passwall/rules/chnlist | 309 +++++------------- .../root/usr/share/passwall/rules/chnroute | 1 + .../usr/share/passwall/rules/gfwlist.conf | 14 +- 8 files changed, 146 insertions(+), 256 deletions(-) diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile index a75c6b4c2f..cfde969d9f 100644 --- a/package/lienol/luci-app-passwall/Makefile +++ b/package/lienol/luci-app-passwall/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=3.9 -PKG_RELEASE:=42 -PKG_DATE:=20200822 +PKG_RELEASE:=43 +PKG_DATE:=20200825 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index 965a28c70f..02b0140448 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -101,7 +101,7 @@ end s:tab("DNS", translate("DNS")) o = s:taboption("DNS", Value, "up_china_dns", translate("Resolver For Local/WhiteList Domains") .. "(UDP)") -o.description = translate("Forced to local filter mode on 'Not China List' mode
IP:Port mode acceptable, multi value split with english comma.") +o.description = translate("IP:Port mode acceptable, multi value split with english comma.") o.default = "default" o:value("default", translate("Default")) o:value("223.5.5.5", "223.5.5.5 (" .. translate("Ali") .. "DNS)") @@ -182,7 +182,12 @@ o:depends({dns_mode = "chinadns-ng", up_trust_chinadns_ng_dns = "dns2socks"}) o:depends({dns_mode = "dns2socks"}) o:depends({dns_mode = "pdnsd"}) -o = s:taboption("DNS", Button, "clear_ipset", translate("Clear IPSET")) +o = s:taboption("DNS", ListValue, "dns_default", translate("Dnsmasq default dns"), translate("When the accessed domain name does not exist in the rule list, the default DNS used.")) +o.default = "china" +o:value("china", translate("China")) +o:value("remote", translate("Remote")) + +o = s:taboption("DNS", Button, "clear_ipset", translate("Clear IPSET"), translate("Try this feature if the rule modification does not take effect.")) o.inputstyle = "remove" function o.write(e, e) luci.sys.call("/etc/init.d/" .. appname .. " stop && /usr/share/" .. appname .. "/iptables.sh flush_ipset && /etc/init.d/" .. appname .. " restart") diff --git a/package/lienol/luci-app-passwall/po/zh-cn/passwall.po b/package/lienol/luci-app-passwall/po/zh-cn/passwall.po index b044c3dee6..1ea965f17a 100644 --- a/package/lienol/luci-app-passwall/po/zh-cn/passwall.po +++ b/package/lienol/luci-app-passwall/po/zh-cn/passwall.po @@ -151,8 +151,8 @@ msgstr "定义接受 IP:Port 形式的输入，以指定其它域名服务的过 msgid "Resolver For Local/WhiteList Domains" msgstr "解析本地和白名单域名" -msgid "Forced to local filter mode on 'Not China List' mode
IP:Port mode acceptable, multi value split with english comma." -msgstr "在 '中国列表以外' 模式下会被强制设置为设定的DNS过滤服务
接受 IP:Port 形式的输入，多个以英文逗号分隔。" +msgid "IP:Port mode acceptable, multi value split with english comma." +msgstr "接受 IP:Port 形式的输入，多个以英文逗号分隔。" msgid "Ali" msgstr "阿里" @@ -184,14 +184,23 @@ msgstr "ChinaDNS-NG 公平模式" msgid "Filtered DNS(For Proxied Domains)" msgstr "域名过滤服务(用于被代理的域名)" +msgid "IP:Port mode acceptable, the 1st for 'dns2socks' if split with english comma." +msgstr "接受 IP:Port 形式的输入，多个以英文逗号分隔 ，'dns2socks' 模式下仅首个有效。" + msgid "Cache Resolved" msgstr "缓存解析结果" +msgid "Dnsmasq default dns" +msgstr "Dnsmasq的默认DNS" + +msgid "When the accessed domain name does not exist in the rule list, the default DNS used." +msgstr "当访问的域名不存在规则列表中，使用的默认DNS。" + msgid "Clear IPSET" msgstr "清空 IPSET" -msgid "IP:Port mode acceptable, the 1st for 'dns2socks' if split with english comma." -msgstr "接受 IP:Port 形式的输入，多个以英文逗号分隔 ，'dns2socks' 模式下仅首个有效。" +msgid "Try this feature if the rule modification does not take effect." +msgstr "如果修改规则后没有生效，请尝试此功能。" msgid "The server client can also use this rule to scientifically surf the Internet." msgstr "本机服务器的客户端也可以使用这个代理模式上网。" @@ -622,8 +631,8 @@ msgstr "防火墙域名列表(gfwlist)更新URL" msgid "China IPs(chnroute) Update URL" msgstr "中国IP段(chnroute)更新URL" -msgid "China IPv6s(chnroute) Update URL" -msgstr "中国IPv6段(chnroute)更新URL" +msgid "China IPv6s(chnroute6) Update URL" +msgstr "中国IPv6段(chnroute6)更新URL" msgid "Rule status" msgstr "规则版本" @@ -703,6 +712,12 @@ msgstr "Kcptun 客户端路径" msgid "Brook Path" msgstr "Brook 路径" +msgid "Trojan-Go Version API" +msgstr "Trojan-Go 版本 API" + +msgid "alternate API URL for version checking" +msgstr "用于版本检查的 API URL" + msgid "Node Subscribe" msgstr "节点订阅" diff --git a/package/lienol/luci-app-passwall/root/etc/config/passwall b/package/lienol/luci-app-passwall/root/etc/config/passwall index 48f1a2334a..f80df3bf26 100644 --- a/package/lienol/luci-app-passwall/root/etc/config/passwall +++ b/package/lienol/luci-app-passwall/root/etc/config/passwall @@ -6,6 +6,7 @@ config global option dns_mode 'pdnsd' option up_china_dns 'default' option dns_forward '8.8.4.4' + option dns_default 'china' option use_tcp_node_resolve_dns '1' option tcp_proxy_mode 'chnroute' option udp_proxy_mode 'chnroute' @@ -40,12 +41,12 @@ config global_rules option auto_update '0' option chnlist_update '1' option chnroute_update '1' - option chnroute6_update '0' + option chnroute6_update '1' option gfwlist_update '1' - option gfwlist_version '2020-08-20' - option chnroute_version '2020-08-20' - option chnroute6_version '2020-08-20' - option chnlist_version '2020-08-20' + option chnroute6_version '2020-08-22' + option gfwlist_version '2020-08-24' + option chnroute_version '2020-08-24' + option chnlist_version '2020-08-24' option enable_custom_url '0' option gfwlist_url 'https://cdn.jsdelivr.net/gh/Loukky/gfwlist-by-loukky/gfwlist.txt' option chnroute_url 'https://ispip.clang.cn/all_cn.txt' diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh index 2c554e88d4..fbbc025391 100755 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh @@ -283,6 +283,7 @@ load_config() { DNS_MODE=$(config_t_get global dns_mode pdnsd) DNS_FORWARD=$(config_t_get global dns_forward 8.8.4.4:53 | sed 's/:/#/g') DNS_CACHE=$(config_t_get global dns_cache 1) + DNS_DEFAULT=$(config_t_get global dns_default china) process=1 if [ "$(config_t_get global_forwarding process 0)" = "0" ]; then process=$(cat /proc/cpuinfo | grep 'processor' | wc -l) @@ -696,7 +697,7 @@ start_dns() { [ "$(config_t_get global fair_mode 1)" = "1" ] && extra_mode="-f" ln_start_bin "$(first_type chinadns-ng)" chinadns-ng -l "${DNS_PORT}" ${china_ng_chn:+-c "${china_ng_chn}"} ${chnlist_param:+-m "${chnlist_param}" -M} ${china_ng_gfw:+-t "${china_ng_gfw}"} ${gfwlist_param:+-g "${gfwlist_param}"} $extra_mode echolog " + 过滤服务：ChinaDNS-NG(:${DNS_PORT}${extra_mode}) + ${msg}：中国域名列表：${china_ng_chn:-D114.114.114.114}，防火墙域名列表：${china_ng_gfw:-D8.8.8.8}" - [ -n "${global}${chnlist}" ] && [ -z "${returnhome}" ] && TUN_DNS="${china_ng_gfw}" + #[ -n "${global}${chnlist}" ] && [ -z "${returnhome}" ] && TUN_DNS="${china_ng_gfw}" ;; *) TUN_DNS="$(echo ${DNS_MODE} | sed 's/:/#/g')" @@ -740,24 +741,29 @@ add_dnsmasq() { [ "${DNS_MODE}" = "other_dns" ] || [ "${DNS_MODE}" = "chinadns-ng" ] && force_local=3 fi [ "${DNS_MODE}" = "other_dns" ] || [ "${DNS_MODE}" = "chinadns-ng" ] || [ -n "${global}${chnlist}" ] && filtered_dns=1 + [ "${DNS_DEFAULT}" = "china" ] && unset filtered_dns + + #始终用国内DNS解析节点域名 + fwd_dns="${LOCAL_DNS}" + servers=$(uci show "${CONFIG}" | grep ".address=" | cut -d "'" -f 2) + hosts_foreach "servers" host_from_url | grep -v "google.c" | grep '[a-zA-Z]$' | sort -u | gen_dnsmasq_items "vpsiplist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/vpsiplist_host.conf" + echolog " - [$?]节点列表中的域名(vpsiplist)：${fwd_dns:-默认}" fwd_dns="${LOCAL_DNS}" [ -z "${global}" ] && { [ -z "${chnlist}" ] || [ -n "${returnhome}" ] && [ -n "${force_local}" ] && unset fwd_dns + [ "${DNS_DEFAULT}" = "china" ] && unset fwd_dns + [ "${DNS_MODE}" = "chinadns-ng" ] && unset fwd_dns [ "${DNS_MODE}" = "other_dns" ] && fwd_dns="${TUN_DNS}" sort -u "${RULES_PATH}/direct_host" | gen_dnsmasq_items "whitelist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/direct_host.conf" echolog " - [$?]域名白名单(whitelist)：${fwd_dns:-默认}" } - servers=$(uci show "${CONFIG}" | grep ".address=" | cut -d "'" -f 2) - [ "${filtered_dns}" = "1" ] && [ "${DNS_MODE}" != "chinadns-ng" ] && [ -z "${global}${chnlist}" ] && unset fwd_dns - hosts_foreach "servers" host_from_url | grep -v "google.c" | grep '[a-zA-Z]$' | sort -u | gen_dnsmasq_items "vpsiplist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/vpsiplist_host.conf" - echolog " - [$?]节点列表中的域名(vpsiplist)：${fwd_dns:-默认}" - [ -n "${returnhome}" ] || [ "${filtered_dns}" = "1" ] && { [ -n "${gfwlist}" ] && fwd_dns="${LOCAL_DNS}" [ -n "${returnhome}" ] && fwd_dns="${TUN_DNS}" [ "${filtered_dns}" = "1" ] && [ -z "${chnlist}" ] && unset fwd_dns + [ "${DNS_DEFAULT}" = "china" ] && unset fwd_dns [ -n "${global}" ] && unset fwd_dns sort -u "${RULES_PATH}/chnlist" | gen_dnsmasq_items "chnroute" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/chinalist_host.conf" echolog " - [$?]中国域名表(chnroute)：${fwd_dns:-默认}" @@ -769,7 +775,7 @@ add_dnsmasq() { sort -u "${RULES_PATH}/proxy_host" | gen_dnsmasq_items "blacklist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/proxy_host.conf" echolog " - [$?]代理域名表(blacklist)：${fwd_dns:-默认}" - [ -n "${gfwlist}" ] || [ "${filtered_dns}" = "1" ] && [ -z "${returnhome}" ] && { + [ -z "${returnhome}" ] && { [ "${filtered_dns}" = "1" ] && [ "${DNS_MODE}" != "chinadns-ng" ] && unset fwd_dns sort -u "${TMP_PATH}/gfwlist.txt" | gen_dnsmasq_items "gfwlist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/gfwlist.conf" #sort -u "${TMP_PATH}/gfwlist.txt" | gen_dnsmasq_items "gfwlist,gfwlist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/gfwlist.conf" @@ -792,14 +798,15 @@ add_dnsmasq() { echo "conf-dir=${TMP_DNSMASQ_PATH}" > "${DNSMASQ_PATH}/dnsmasq-${CONFIG}.conf" [ "${filtered_dns}" = "1" ] && [ -z "${returnhome}" ] && servers="${TUN_DNS}" - if [ "${DNS_MODE}" = "chinadns-ng" ]; then - [ -z "${global}${chnlist}" ] && servers="127.0.0.1#${DNS_PORT}" && msg="chinadns-ng" - fi [ -n "${chnlist}" ] && msg="中国列表以外" [ -n "${returnhome}" ] && msg="中国列表" [ -n "${global}" ] && msg="全局" if [ "${DNS_MODE}" = "other_dns" ]; then msg="指定DNS" + elif [ "${DNS_MODE}" = "chinadns-ng" ]; then + #[ -z "${global}${chnlist}" ] && servers="127.0.0.1#${DNS_PORT}" && msg="chinadns-ng" + #直接交给Chinadns-ng处理 + servers="${TUN_DNS}" && msg="chinadns-ng" else [ "${IS_DEFAULT_DNS}" = "1" ] && [ "${filtered_dns}" != "1" ] && { echolog " - 不强制设置默认DNS(上级分配)！" diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnlist b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnlist index b2009b5bd3..6220c2d79c 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnlist +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnlist @@ -522,7 +522,6 @@ 0536qz.com 0537tt.com 0537yz.com -0539cs.com 053c.com 054057.com 0543hr.com @@ -736,7 +735,6 @@ 0763home.com 076650.com 0768.gd -07698h.com 0769che.com 0769net.com 0769sun.com @@ -1308,7 +1306,6 @@ 11777msc.com 117play.com 117show.com -117uus.com 118114.net 1182.org 1185050.com @@ -1450,7 +1447,6 @@ 123chaogu.com 123du.cc 123ems.com -123etao.com 123fc.com 123fj.com 123haitao.com @@ -1739,7 +1735,6 @@ 160.me 160015.com 16086371--c1.com -160970.com 160edu.net 160yx.com 161580.com @@ -2052,7 +2047,6 @@ 17ie.com 17itou.com 17ivr.com -17jiaoliu.com 17jiaoyu.com 17jita.com 17jq.net @@ -2207,6 +2201,7 @@ 18856.com 1885888.com 1886zuche.com +1888.com.mo 188963.com 188app.xyz 188bifen.com @@ -2503,7 +2498,6 @@ 1y2y.com 1yabc.com 1yee.com -1yfl.com 1ykh.com 1yuanzheng.com 1yun.cc @@ -2578,7 +2572,6 @@ 2019zjj.com 202030.com 202096e.com -2020haoyun.com 2020zjj.com 2021cc.com 2029.cc @@ -3229,8 +3222,8 @@ 3023.com 3033c.com 30556.com +306t.com 307760.com -307zy.com 308308.com 309edu.com 309yy.com @@ -3270,7 +3263,6 @@ 315034.com 315166.com 315196.com -3152018.com 315246.com 3156610.com 3158.com @@ -3355,7 +3347,6 @@ 322wl.com 3230.com 3234.com -323400.com 323507.com 324.com 325286.com @@ -3485,7 +3476,6 @@ 352k.com 3533.com 3551.com -3557y.com 355pan.com 356123.com 35666c.com @@ -3688,7 +3678,6 @@ 36588zs.com 365960.com 365a8.com -365aikan.com 365ailv.com 365ajw.com 365art.com @@ -3756,7 +3745,6 @@ 365sec.com 365shequ.com 365sky.com -365sunshop.com 365ta.com 365tex.com 365ttcz.com @@ -4068,7 +4056,6 @@ 3gus.com 3h3.com 3haow.com -3hcd.com 3hgui.com 3j4.com 3jidi.com @@ -4233,7 +4220,6 @@ 4040001.com 40407.com 404600.com -4046y.com 404forest.com 404mzk.com 404v.com @@ -4574,7 +4560,6 @@ 50zww.com 51-arm.com 51-cf.com -51-games.com 51-jia.com 51-n.com 51-superbike.com @@ -5194,7 +5179,6 @@ 51xie.com 51xingjy.com 51xpj.com -51xuan.com 51xue8.com 51xuediannao.com 51xuetang.com @@ -5267,7 +5251,6 @@ 51zxw.net 51zyrc.com 51zzl.com -51zzmx.com 52-ic.com 520.com 520.net @@ -6870,6 +6853,7 @@ 71xe.com 71zs.com 720582.com +720pmovie.com 720static.com 720think.com 720ui.com @@ -7250,7 +7234,6 @@ 7sdn.com 7sheji.com 7sj.com -7starnet.com 7su.com 7t9.com 7tbv.site @@ -7416,7 +7399,6 @@ 818today.com 818tu.com 81999.org -81bz.com 81comdns.com 81dk.com 81it.com @@ -7469,7 +7451,6 @@ 83823.net 83830.com 8384cs.com -8385.com 838dz.com 83990567.com 83dd.com @@ -7513,7 +7494,6 @@ 856dy.com 85814.com 858game.com -85dushu.com 85ju.com 85kf.com 86-import.com @@ -7583,7 +7563,6 @@ 86kl.com 86kongqi.com 86kx.com -86kyjob.com 86lawyer.com 86mai.com 86mama.com @@ -7992,7 +7971,6 @@ 91ac.com 91accp.com 91act.com -91admax.com 91aiche.com 91aliyun.com 91all.net @@ -8131,7 +8109,6 @@ 91tianqi.com 91ting.net 91tingge.com -91toufang.com 91town.com 91tuanli.com 91tuyatu.com @@ -8202,7 +8179,6 @@ 927927.com 927953.com 927jx.com -927v.com 928383.com 928vbi.com 92913.com @@ -8838,9 +8814,9 @@ 9qc.com 9qu.com 9qu5.com +9quan.net 9rmb.com 9see.com -9show.com 9simg.com 9skm.com 9sky.com @@ -9041,6 +9017,7 @@ able-consultant.com able-elec.com ableaders.com ablejeans.com +ablesci.com ablesky.com abletive.com ablman.com @@ -10040,7 +10017,6 @@ aleyoo.com alfeng.com alfheim.cc alfheim.online -alfredworkflow.com alfz999.com algomatubulars.com algorithmart.com @@ -10176,6 +10152,7 @@ aliyunddos1022.com aliyunddos1025.com aliyunddos1026.com aliyunddos1028.com +aliyunddos1029.com aliyunduncc.com aliyundunwaf.com aliyunedu.net @@ -10190,6 +10167,8 @@ aliyunwaf.com aliyunwaf1.com aliyunwaf2.com aliyunwaf3.com +aliyunwaf4.com +aliyunwaf5.com aliyunyh.com aliyunyhw.com alizhaopin.com @@ -10772,7 +10751,6 @@ apkdo.com apkgu.com apkhooker.com apkjam.com -apkol.com apkplug.com apksc.com apksw.com @@ -10998,7 +10976,6 @@ arefly.com arenacdn.com ares.dl.playstation.net arestech-sz.com -arhacqxm.com arhieason.com aria2.org ariesmob.com @@ -11011,7 +10988,6 @@ arkoo.com arkrdigital.com arkteam.net arliki.com -arm-basics.com arm001.com arm9.net arm9home.net @@ -11324,7 +11300,6 @@ auto510.com auto6s.com auto98.com autoai.com -autoairfl.com autobaidu.com autobizreview.com autocamel.com @@ -11478,7 +11453,6 @@ ayibang.com ayidada.com ayijx.com ayjcysteel.com -ayjhw.com ayjs.net ayjzb.com ayqy.net @@ -11716,7 +11690,6 @@ baiduux.com baiduv.com baiduvv.com baiduwebgame.com -baiduweixin.xyz baiduyiyi.com baiduyun.com baiduyun.wiki @@ -12071,7 +12044,6 @@ baofu.com baogang.info baogao.com baoguangsi.org -baogub2b.com baohebao.com baohejr.com baohuaa.com @@ -12253,7 +12225,6 @@ bbercn.com bbfstore.com bbgsite.com bbgstatic.com -bbhou.com bbicn.com bbioo.com bbiquge.com @@ -12412,7 +12383,6 @@ bdydns.com bdydns.net bdysite.com bdyxzx.com -bdzetai.com be-xx.com be90.com beaacc.com @@ -12507,7 +12477,6 @@ beihaiting.com beihangonline.com beihuasoft.com beiidc.com -beijidy.com beijing-hmo.com beijing-hualian.com beijing-ip.com @@ -12578,7 +12547,6 @@ bej9.com bejoin.net bejson.com belfone.com -belisport.com belle8.com belmeng.com belost.xyz @@ -13180,7 +13148,6 @@ bitguai.com bithosts.net bithub00.com bitjia.com -bitjocky.com bitkan.com bitky.cc bitmain.com @@ -13291,7 +13258,6 @@ bj597.com bj65z.com bj96007.com bjadn.net -bjado.com bjaic.com bjaodidazhong.com bjaokaihua.com @@ -13414,7 +13380,6 @@ bjjqzyy.com bjjssh.org bjjtat.com bjjubao.org -bjjyj2012.com bjjzsc.com bjjzzpt.com bjk30.com @@ -13559,7 +13524,6 @@ bjwyseo.com bjxatq.com bjxdxx.org bjxf315.com -bjxgdc.com bjximei.com bjxinku.com bjxinyou.com @@ -13969,7 +13933,6 @@ booking001.com bookingtee.com bookinlife.net booklist.mobi -bookpi.com bookqi.com bookresource.net books51.com @@ -14006,7 +13969,6 @@ boqiicdn.com boqingbokeji.com boquge.com boraid.org -boricardo.com borlonclan.com borninsummer.com bornlead.com @@ -14120,7 +14082,6 @@ brhthg.com bricktou.com bridgee.net bridgetiger.com -briewell.com brighost.com brightdairy.com brightfood.com @@ -14262,6 +14223,7 @@ btrcsc.com btrenren.com bts.hk btsabc.org +btschool.net btsemi.com btsha.com btshoufa.cc @@ -14679,7 +14641,6 @@ c7c8.com c7cc.com c7sky.com c833.com -c887.icu c89a5f15.com c8so.com c9018.com @@ -14736,7 +14697,6 @@ cad8.net cada.cc cadcaecam.com cadchat.cc -cadencephoto.com cadict.net cadmon.net cadreg.com @@ -15607,6 +15567,7 @@ cdren.com cdren.net cdronghai.com cdrtvu.com +cdruzhu.com cdryny.com cds-cdn.v.aaplimg.com cds.apple.com @@ -15962,6 +15923,7 @@ cha-tm.com cha086.com cha127.com chabeichong.com +chacha.design chachaba.com chachaqu.com chachongba.cc @@ -16583,6 +16545,7 @@ china-pub.com china-qiao.com china-reform.org china-ric.com +china-riscv.com china-russia.org china-see.com china-seeq.com @@ -17003,7 +16966,6 @@ chinaosx.net chinaott.net chinaoulong.com chinaowps.com -chinap2g.com chinapastel.com chinapay.com chinape168.com @@ -17100,6 +17062,7 @@ chinatarena.com chinatat.com chinatechinsights.com chinatelecom-ec.com +chinatelecom.com.mo chinatelecomiot.com chinatelling.com chinatet.com @@ -17263,6 +17226,7 @@ chint.net chinwind.com chipcoo.com chipcreation.com +chipdance.com chiphell.com chiplayout.net chipmanufacturing.org @@ -17419,6 +17383,7 @@ chuangbie.com chuangcache.com chuangcdn.com chuangchangnet.com +chuangcifang.com chuangduyouyue.com chuangen.com chuangfeixin.com @@ -17469,6 +17434,7 @@ chuanshanqundao.com chuansong.me chuansongme.com chuantec.com +chuantou.org chuantu.biz chuanxincao.net chuanye.com @@ -17980,7 +17946,6 @@ cloudxns.com cloudxns.net cloudyo.net cloudyouku.com -cloutropy.net clpga.org clscsbcj.com clsn.io @@ -18979,7 +18944,6 @@ coleboats.com colipu.com colnect.com colobu.com -color.cc color365.com colorbird.com colorfulltech.net @@ -19205,6 +19169,7 @@ cose.space cosedm.com cosesvip.com cosfund.com +coshelper.com coshi.cc coship.com cosimcloud.com @@ -19358,7 +19323,6 @@ cqhhr2.com cqhimalayanky.com cqhkcdns.com cqhpoldi.com -cqhrt.com cqhxgf.com cqhydraulic.com cqiits.com @@ -19865,7 +19829,6 @@ cubiloseindustry.com cucdc.com cuchost.com cuctv.com -cucujie.com cudaojia.com cuebzzy.com cuelog.com @@ -20356,7 +20319,6 @@ daghighparto.com dagongcredit.com dagongnet.com daguangnews.com -daguantao.com dagumanhua.net daguu.com daguzhe.com @@ -20892,7 +20854,6 @@ dbx-vip.com dbyb.org dbylptkhd.com dbytwl.com -dbyx0089.com dbyxgo.com dbzgia.com dbzyz.com @@ -20998,7 +20959,6 @@ ddr.kim ddrhhh.com ddsaas.com ddshu.net -ddsj.cc ddske.com ddsoucai.com ddspsc.com @@ -21006,6 +20966,7 @@ ddstarapp.com ddsy.com ddtaba.com ddtkj.com +ddtugame.com ddtui.com ddun.com ddurl.to @@ -21261,7 +21222,6 @@ deyiso.com deyoulife.com deyunxiangsheng.com deyurumen.com -deyuwanjia.com dezhi.com dezhong365.com dezhoudaily.com @@ -21278,7 +21238,6 @@ dfcx-bj.com dfd88.com dfdaily.com dfedu.com -dffyw.com dfgzqc.com dfhdw.com dfhon.com @@ -21343,7 +21302,6 @@ dggxdjzcd.com dgh2.com dghfw.com dghh888.com -dghongxinwei.com dghqmotor.com dginfo.com dgjiuqi.com @@ -21616,6 +21574,7 @@ didixk.com didiyun.com didown.com didu86.com +diducoder.com didunews.com diebaosoft.com diebian.net @@ -21965,6 +21924,7 @@ dlsstax.com dlszywz.com dltobacco.com dltubu.com +dltxwz.com dlvalve.com dlxgjy.com dlxiongshi.com @@ -22008,7 +21968,6 @@ dmeiti.com dmeiti.net dmeng.net dmfuns.com -dmg857.com dmgapp.com dmgeek.com dmgpark.com @@ -22478,7 +22437,6 @@ douyapu.com douyar.com douyin.com douyincdn.com -douyingwang.com douyinvideo.net douyou100.com douyu.com @@ -22938,6 +22896,7 @@ duowanns.com duoxiaoshi.com duoxinqi.com duoxj.com +duoxuan100.com duoyewu.com duoyeyou.com duoyi.com @@ -23630,7 +23589,6 @@ ecyti.com ed2000.app ed2000.com ed2000k.com -ed2k.online ed2kers.com ed2kfile.com ed2kk.com @@ -23866,7 +23824,6 @@ efwang.com efwh.com efy-tech.com efyt6.com -eg-seishin.com egaoxiu.com egdns.cc egfcare.com @@ -24113,7 +24070,6 @@ emoi-cncdn.bing.com emojiall.com emojidaquan.com emojimobile.com -empbeat.com empireofcloud.com empos.net ems517.com @@ -24256,7 +24212,6 @@ epcsw.com epday.com epeaksport.com epeiyin.com -epeking.com epet.com epetbar.com epetpet.com @@ -24277,6 +24232,7 @@ epoos.com epport.com epqiming.com epremierwigs.com +eprezi.com eps114.com epschool.net ept-team.com @@ -24564,7 +24520,6 @@ everedit.net everet.org evergrande.com evergrandeauto.com -evergreen-plastic.com everlose.com eversino.com evervc.com @@ -24836,7 +24791,6 @@ f8fm.com f96.net fa-today.com fa597.com -fa71.com faaaar.com faakee.com fabang.com @@ -25269,7 +25223,6 @@ fcvvip.com fcw013.com fcxjiuyuan.com fcxxh.org -fcxzb.com fcyhw.com fcz360.com fczbl.vip @@ -25334,7 +25287,6 @@ feeye.com feeyeah.com feeyo.com feeyun.com -fefork.com fegine.com fegirl.com feheadline.com @@ -25376,7 +25328,6 @@ feigesp.com feihu.me feihuo.com feihutaoke.com -feiigg.com feiin.com feijizu.com feikanu.net @@ -25547,7 +25498,6 @@ fengyushan.com fengyx.com fengzhiyuanseal.com fengzigame.com -fengzimu.com fenha.net fenjianli.com fenking.club @@ -25731,6 +25681,7 @@ fir.im fir.vip fire233.com fire2333.com +firebase-settings.crashlytics.com firebirdprint.com fireemblem.net fireemulator.com @@ -25830,7 +25781,6 @@ fjndwb.com fjnet.com fjnjl.net fjotic.com -fjpdh.com fjpta.com fjreading.com fjsdfz.org @@ -26034,7 +25984,6 @@ fodang.org fodian.net fodizi.com fodoco.com -fofohub.com fogangtong.com fogtowerblog.com fohee.net @@ -26043,7 +25992,6 @@ folkw.com foloda.com folou.com fomen123.com -fomter.com fondcool.com foneplatform.com fongmong.com @@ -26130,7 +26078,6 @@ foshannews.net fosss.org fosun-uhi.com fosun.com -fota16.com fotao.name fotao9.com fotilestyle.com @@ -26211,7 +26158,6 @@ fqsou.com fqsszx.com fqxs.org fqxsw.com -fqzf.net fqzww.com fr-odc.samsungapps.com fr-trading.com @@ -26220,7 +26166,6 @@ fr8npi.com fractal-technology.com francissoung.com francochinois.com -francoisem.com frankorz.com frankway.net franzsandner.com @@ -26399,6 +26344,7 @@ fubi8.com fuchaoqun.com fuckingdata.com fuckjpg.com +fudaiapp.com fudanglp.com fudanmed.com fudannb.org @@ -27130,7 +27076,6 @@ gczx.cc gczyg.com gd-china.com gd-id.com -gd-jlwj.com gd-linux.com gd-linux.org gd1580.com @@ -27194,7 +27139,6 @@ gdlins.com gdlppow.com gdlszz.com gdmappress.com -gdmc66.com gdmingshizx.com gdmm.com gdmoa.org @@ -28110,7 +28054,6 @@ goodrain.com goods-brand.com goodstudydayup.com goodtp.com -goodwan.net google-analytics.com googleadservices.com googleadsl.com @@ -28246,13 +28189,11 @@ gpd.hk gpdi.com gper.club gpio.me -gpkcd.com gpl-express.com gplayspace.com gplqdb.com gpnewtech.com gppapp.com -gps0595.com gps345.com gps8.com gpshk.cc @@ -28268,6 +28209,7 @@ gpzbs.com gq60.com gqak.com gqblinds.com +gqgkj.com gqhmt.com gqjd.net gqk.tv @@ -28356,6 +28298,7 @@ groad.net groovyfilmes.com groovygroupergrill.com grouk.com +group-purchasing.com group.citic groupjx.com grouplus.com @@ -30073,7 +30016,6 @@ hbfire.com hbfls.vip hbfnnyw.com hbfootball.com -hbfuli.com hbfy.com hbfyhb.com hbgajg.com @@ -30261,7 +30203,6 @@ hbzkzx.com hbzkzxw.com hbzlw.com hbzncz.com -hbzongtao.com hbzqzx.com hbzrtx.com hbzsb.com @@ -30410,7 +30351,6 @@ healthr.com healthych.com healthythinkingkids.com healthyun.com -heartbegin.xyz heartide.com heartinsti.com hebangdianzi.com @@ -30524,6 +30464,7 @@ heirenlei.com heisener.com heisha.net heishao.net +heishenhua.com heisiwang.com heisixiang.net heisldg.com @@ -30905,6 +30846,7 @@ hhq330.com hhqqs.com hhrcard.com hhrdc.com +hhrhl.vip hhrtu.com hhrtzbv.com hhsjtyn.com @@ -30984,6 +30926,7 @@ hifpga.com hifreud.com hifuntv.com higame123.com +higeshi.com highdigitizing.com highest.cc highgo.com @@ -31024,6 +30967,7 @@ hilunwen.com himaker.com himawari-japan.com himeidian.com +himigame.com himiku.com himofi.com himovie.net @@ -31299,7 +31243,6 @@ hmsem.com hmsemi.com hmseo.net hmting.com -hmxjx.com hmxw.com hmz.com hmzone.com @@ -31452,6 +31395,7 @@ hnyiche3.com hnyingfang.com hnyinhan.com hnyouneng.com +hnyredu.com hnyuandian.com hnyugame.com hnyumantang.com @@ -31781,7 +31725,6 @@ hoyoh.com hozin.com hp-china.biz hp-marathon.com -hp-praty.com hp046.com hp082.com hp123.com @@ -31792,7 +31735,6 @@ hpcoo.com hpe-online.com hpej.org hpgsc88.com -hpnzl.com hpoi.net hprx.com hpstore.cc @@ -32037,7 +31979,6 @@ hteos.com htexam.com htexam.net htfcn.com -htfh120.com htfoxit.com htfutures.com htgjjl.com @@ -32563,6 +32504,7 @@ huiruanzhijia.com huishangbao.com huishangol.com huishangxian.com +huishenghuo888888.com huishengqianzhushou.com huishoubao.com huishoushang.com @@ -32667,7 +32609,6 @@ hundsun.com hundun.net hundx.com hunger-valley.com -hungfungtech.com hunhun520.com hunjuwang.com hunlang.com @@ -32685,7 +32626,6 @@ huntkeydiy.com hunuo.com hunyin666.com hunyinyiyuan.com -hunzhan.org huo-cun.com huo119.com huoban.com @@ -32757,6 +32697,7 @@ huowan.com huoxing24.com huoxingba.com huoxinggirl.com +huoxinglaike.com huoxingzi.com huoxun.com huoyan.com @@ -33114,7 +33055,6 @@ hzlhf.com hzlscl.com hzlug.org hzlyun.com -hzlzh.io hzmama.net hzman.net hzmantu.com @@ -33699,7 +33639,6 @@ ido512.com idoacg.com idoall.org idocbank.com -idocg.com idocoffice.com idocv.com idol001.com @@ -33887,7 +33826,6 @@ ig62onx.wang igame007.com igamebuy.com igamecj.com -igamesocial.net igao7.com igaoda.com igbox.net @@ -33933,7 +33871,6 @@ ihaier.co ihaier.com ihaima.com ihaiu.com -ihakazushi.com ihalf.co ihanghai.com ihanhua.com @@ -34025,6 +33962,7 @@ iiilab.com iiipros.com iiiview.net iikuzhan.com +iikx.com iiloo.com iincn.net iinterest.net @@ -34149,7 +34087,6 @@ ileci.com ileedarson.com ileehoo.com ilego.club -ilemonrain.com ilewan.com ilewed.com ilewen.com @@ -34496,7 +34433,6 @@ infoshow.net infosoft.cc infotorch.net infovc.com -infoweb24.com infowuxi.com infoxa.com infoxgame.com @@ -34505,7 +34441,6 @@ infzm.com ing10bbs.com ing2ing.com ingageapp.com -inganlgz.site ingben.com ingcore.com ingdan.com @@ -34932,7 +34867,6 @@ isilicontech.com isinosig.com isitone.com isixue.com -isjian.com iskryou.com isky000.com iskylinem.com @@ -35292,6 +35226,7 @@ ivayy.com ivemusic.net ivideostar.com iviewui.com +ivixivi.com ivmoe.com ivocaloid.com ivrfan.com @@ -35323,7 +35258,6 @@ iwangding.com iwangke.me iwangnan.com iwanoutdoor.com -iwanpc.com iwanvr.com iwanws.com iwanyl.com @@ -35954,7 +35888,6 @@ jhsdai.com jhsfojiao.com jhssapp.com jhsssq.com -jhtmls.com jhua168.com jhw.la jhwl444.com @@ -36414,7 +36347,6 @@ jimucake.com jimucc.com jimufund.com jimujiazx.com -jimulicai.com jin10.com jin10x.com jin24k.com @@ -36438,7 +36370,6 @@ jinchutou.com jincin.com jincon.com jinda.tv -jindangqi.com jindanlicai.com jindaodao.com jindian120.com @@ -36794,7 +36725,6 @@ jiupaicom.com jiupin8.com jiuq.com jiurong.com -jiushang999.com jiushikou.com jiushixing.com jiushu.net @@ -36958,7 +36888,6 @@ jjxsw.cc jjxsw.com jjxsw.la jjxsw.org -jjxszp.com jjxwzk.org jjxyls.com jjy118.com @@ -37078,6 +37007,7 @@ jmjc.tech jmjinrong.com jmjiuchang.com jmjxc.com +jmkjmob2.xyz jmkx.com jmlk.co jmmuseum.com @@ -37197,6 +37127,7 @@ jobvvv.com jobyp.com jocat.com jocctv.com +joci.net jocsn23.site joe92.com joehill.me @@ -37375,7 +37306,6 @@ jqzw.com jr-soft.com jr123.com jr18.com -jrballc.com jrdzj.cc jrecchina.com jrexam.com @@ -37492,10 +37422,10 @@ jshzqc.com jsinfo.net jsiteec.org jsjclykz.com -jsjdhotel.com jsjdrcb.com jsjdz.com jsjdzf.com +jsjinfu.com jsjkx.com jsjlzxw.com jsjs.cc @@ -37693,7 +37623,6 @@ juemuren4449.com jueok.com jueshe.cc juesheng.com -jueshi166.com jueshinan.com jueshitangmen.info juesw.com @@ -37911,6 +37840,7 @@ juxia.com juxiangyou.com juxin.tv juxinfu.com +juxing-edu.com juxingyi.com juxinhuizhi.com juxinjt.com @@ -38004,7 +37934,6 @@ jxf57.com jxf75.com jxg1.com jxgdw.com -jxgsk.com jxgxbd.com jxhyshiye.com jxiaolan.com @@ -38042,9 +37971,9 @@ jxrencai.com jxrjzx.com jxrsrc.com jxrtv.com -jxsanlig.com jxsgfzx.com jxsllw.com +jxslsyy.com jxsqw.com jxsrfdc.com jxstsz.com @@ -38102,7 +38031,6 @@ jyfans.net jyfund.com jygame.net jygjj.com -jyglz.org jyguagua.com jygz.com jyh007.com @@ -38295,7 +38223,6 @@ kaiboda.org kaiboer.com kaichengschool.com kaicong.info -kaicool.com kaidanbao.com kaidianbang.com kaidiwen.com @@ -38777,7 +38704,6 @@ kernel.cc kerneldiy.com kernelgo.org kernelnote.com -kernelpanic.fm kerneltravel.net keruibell.com kerunwh-edu.com @@ -38982,6 +38908,7 @@ kingreader.com kingrein.com kingroot.net kings3d.com +kingsemi.com kingsoft-office-service.com kingsoft.com kingsoft.net @@ -39198,7 +39125,6 @@ kmtarena.net kmway.com kmxg.net kmxkh.com -kmxtp.com kmyestar.com kmyyzx.com kmzljc.com @@ -39540,7 +39466,6 @@ kuaifawu.com kuaifeng.com kuaigames.com kuaigeng.com -kuaigoujia.com kuaihaodai.com kuaihou.com kuaiji.cm @@ -39941,7 +39866,6 @@ ladystr.com ladywu.net ladyyu.com lafaso.com -lafeiylkh.com lafhzx.com lafoo.net lagelle.com @@ -40263,7 +40187,6 @@ laosizhou.com laotiaomao.com laowangappxy.xyz laowangshengge.com -laowk.com laowuxx.com laoxier365.com laoxiezi.com @@ -40373,7 +40296,6 @@ lbesec.com lbgoo.com lbinin.com lbl520.com -lblouj.gq lboyue.com lbrbis.com lbsheng.com @@ -40548,7 +40470,6 @@ leehom-cn.com leehon.com leeif.me leeiio.me -leelichen.com leenke.com leenzhu.com leeon.me @@ -40626,7 +40547,6 @@ leiyunge.com leiyunge.net leiyunge8.com leiyunge88.com -leiyuntx.com lejiachao.com lejian.com lejianweike.com @@ -40760,7 +40680,6 @@ letsbbs.com letsebuy.com letsfilm.org lettercloud.net -letterfan.com letuisong.com letuknowit.com letushu.com @@ -40853,7 +40772,6 @@ lfan.net lfang.com lfbxw.com lfcmw.com -lfe-bike.com lfengw.com lfex.com lfhacks.com @@ -40952,6 +40870,7 @@ liangfeizc.com liangjan.com liangjian.com liangjianghu.com +liangka.vip liangkun.net liangle.com lianglihui.com @@ -41180,7 +41099,6 @@ lihtao.com lihua.com lihuaguzheng.com lihuia.com -lihuiy.com lihun66.com lijiangdiy.com lijiateng.com @@ -41524,7 +41442,6 @@ listentoworld.com listenvod.com litang.me litaow.com -lite.ren liteapp.mobi litecoin.ink litecoin.ren @@ -41571,6 +41488,7 @@ liuhu.net liuhuafang.net liuhui998.com liuinsect.com +liujg.com liujiajia.me liujiangblog.com liujiasj.com @@ -41726,7 +41644,6 @@ lizhi77.com lizhidaren.com lizhifilm.com lizhifm.com -lizhine.com lizhiqiang.name lizhiweike.com lizhixia.com @@ -42127,6 +42044,7 @@ losking.com losmedya.com lossyou.com lostali.com +lostheidi.com lostphp.com lostsakura.com lotanelaw.com @@ -42655,7 +42573,6 @@ lw0703.com lw112.com lw208.com lw23.com -lw263.net lw54.com lw84.com lw85.com @@ -42746,7 +42663,6 @@ ly1800.com ly200-cdn.com ly200.com ly39zx.com -ly51auto.com ly522.com ly6080.com ly7a.com @@ -43650,7 +43566,6 @@ medioverde.com meditic.com meditrusthealth.com mediumin.net -mediwraps.com medky.net medlinker.com medlinker.net @@ -43672,6 +43587,7 @@ meetlawyer.com meetqs.com meetsite.com meetzoom.net +meeuapp.net mefeng.net mega-garage.com megajoy.com @@ -43867,7 +43783,6 @@ meiweishudan.com meiwenfen.com meiwenting.com meiwentx.com -meixiao365.com meixie.com meixincdn.com meixiong5.com @@ -43954,7 +43869,6 @@ mengtaier.com mengtian.com mengtu.cc mengtuiapp.com -mengwowo.com mengwuji.net mengxi.com mengxiangeka.com @@ -44051,7 +43965,6 @@ mfjcbg.gdn mfjmedia.com mfk.com mfkpp.com -mfmdttz.com mfpad.com mfqqx.com mfqyw.com @@ -44181,6 +44094,7 @@ miaostreet.com miaotu2018.com miaov.com miaoweijianfei.com +miaowugo.com miaowutech.com miaoxiakuan.com miaoxiala.com @@ -44259,7 +44173,6 @@ mier123.com miercn.com mierhuo.com mieseng.com -mieui.com miexue.com mieyabubbletalk.com mieyisi.com @@ -44419,7 +44332,6 @@ mingdiantou.com mingdongman.com mingdzs.com mingf168.com -minghaodz.com mingin.com mingjian.com mingjinglu.com @@ -44485,7 +44397,6 @@ minisoyo.com ministudy.com minitiao.com minitos.com -miniu98.com miniui.com miniwangdai.com minixiazai.com @@ -44518,7 +44429,6 @@ mipuwu.com miqiks.com miquapp.com miquw.com -mir13800138000.com mir2world.com mir4399.com miraclevision.net @@ -45121,7 +45031,6 @@ motrix.app mottoin.com motuo2.com motuowei.com -mou.li mouldbbs.com mouldnews.com moulem.com @@ -45184,6 +45093,7 @@ mp4cn.com mp4dy.net mp4ju.com mpacc.net +mpaidata.com mpdaogou.com mpdsj.com mpfmall.com @@ -45208,7 +45118,6 @@ mqwds.cc mqxww.com mr-ping.com mr-z.me -mr765.com mr77.com mr91.com mrabit.com @@ -45342,7 +45251,6 @@ mtmssdn0.com mtncharge.com mtnets.com mtnets.net -mtnlgkd.com mtoilet.com mtoou.info mtr8.com @@ -45637,7 +45545,6 @@ myf6.com myfans.cc myfcomic.com myfirstwon.com -myfortunenet.com myfreax.com myfrfr.com myfun.com @@ -45647,7 +45554,6 @@ myfx0816.com mygame66.com mygame82.com mygame88.com -mygeneclub.com mygjp.com mygobatv.com mygolbs.com @@ -45716,6 +45622,7 @@ myoldtime.com myonlystar.com myoppo.com myoschain.com +myottad.com myouth.net myp2pcam.com myp2pch.net @@ -45777,7 +45684,10 @@ mysuperdns.com mysvw.com myt126.com mytanwan.com +mythbird.com mythcall.com +mythcare.com +mythidea.com mythroad.net mythsman.com mythware.com @@ -45870,6 +45780,7 @@ n423.com n553.com n6zw.com n77777777.com +n802.com n9324.com n99243.com n9cn.net @@ -46039,7 +45950,6 @@ nba20.com nbabm.com nbahero.com nbahi.com -nbauxedt.com nbayaobasketballclub.com nbayaoschool.com nbazww.com @@ -46334,7 +46244,6 @@ newnewle.com newoasis.cc newoer.com newoo.com -newopc.com neworiental.org nework360.com neworld.org @@ -46506,7 +46415,6 @@ nicotv.club nicotv.me nicvision.com nicwin7.com -nidekoudai.com nideu.com nidianwobang.com nidong.com @@ -46744,12 +46652,10 @@ njzglxs.com njzhonglv.com njzhuoer.com njzhzx.net -njzmt.com njzrxx.xyz njztgg.com njzztyl.com nk84.com -nkgwql.com nkn199m.site nkonel.com nkqingnianshuo.com @@ -47246,6 +47152,7 @@ oadz.com oahelp.com oahelp.net oalinux.com +oameibang.com oaschina.com oasissino.com oatos.com @@ -47393,7 +47300,6 @@ oilepay.com oilhr.com oinkyeeky.com oipapio.com -oitool.com oiuwe.com ok-meeting.com ok06.com @@ -47480,6 +47386,7 @@ okzhaosheng.com okzuowenxs.com okzy.co okzy.me +okzy.tv okzyp2p.com okzyw.com okzyzy.cc @@ -47499,7 +47406,6 @@ oldcp.com olddriver.website oldenland.com older99.com -oldj.net oldking.net oldlinux.org oldpan.me @@ -47514,7 +47420,6 @@ ollomall.com olloop.com olmall.vip olmy8.com -olnx.vip oltzmemfbp.icu olymtech.com omaxdigital.com @@ -47907,6 +47812,7 @@ ourats.com ouravr.com ourcdns.com ourcm.net +ourcoders.com ourd3js.com ourden.net ourdomains.com @@ -48185,6 +48091,7 @@ pangku.com pangmao56.com pangmaovc.com pangoing.com +pangolin-dsp-toutiao.com pangolin-sdk-toutiao.com pangomicro.com pangong88.com @@ -48427,7 +48334,6 @@ pctutu.net pctvx.com pcviva.com pcw365.com -pcwbvulypm13.com pcwenda.com pcwenti.com pcwl.com @@ -48813,7 +48719,6 @@ picchealth.com piccinvest.com piccjs.com picgz.com -pickshirt.com picooc.com picosmos.net picp.io @@ -48959,7 +48864,6 @@ pintuer.com pinweiduo.com pinweiwed.com pinwenba.com -pinwu2013.com pinyanzhai.com pinyou8.com pinyuan.cc @@ -49165,7 +49069,6 @@ pnwan.com pnwww.com pnzpw.com po369.com -po5563.com poachegg.com pobaby.net pobasoft.com @@ -49194,7 +49097,6 @@ pokemongjd.com pokermate.net poketec.com pokooo.com -polaris-dev.com polaris-vc.com polarxiong.com polaxiong.com @@ -49466,7 +49368,6 @@ prismcdn.com privateadx.com privatess.win prjdrj.com -prktsfy.com prm.dji.com pro6e.com proassist-hsv.com @@ -49515,7 +49416,6 @@ psd8.com psdiv.com psdpicture.com psdyapp.com -psefan.com psgui.com psing.tech psjay.com @@ -49940,7 +49840,6 @@ qdkongtiaohuishou.com qdlinghu.com qdlongre.com qdmama.net -qdmayizhixingbj.com qdmcxh.com qdmeihe.com qdmm.com @@ -50795,7 +50694,6 @@ qlrc.com qls.fun qlteacher.com qlth-cn.com -qlunion.com qluu.com qm000.com qm120.com @@ -50837,6 +50735,7 @@ qncyw.com qndb.net qnfuli.com qnhuifu.com +qnid.cc qnjslm.com qnl1.com qnllq.com @@ -50946,6 +50845,7 @@ qqgd.com qqgexing.com qqgexingqianming.com qqgx.com +qqgyhk.com qqhao123.com qqhaoniu.com qqhbx.com @@ -51667,7 +51567,6 @@ ran-wen.com ran10.com ranbl.com randellbeck.com -randydodd.com rangercd.com rangnihaokan.com rangzuo3147.com @@ -52444,6 +52343,7 @@ rsdyy.com rsjztz.com rsng.net rso.wang +rsp.ink rsscc.com rssmv.com rsty77.com @@ -52532,7 +52432,6 @@ ruijiery.com ruiliys.com ruilvtu.com ruioushang.com -ruiqianlianhe.com ruiqicanyin.com ruiruigeblog.com ruiscz.com @@ -53136,6 +53035,7 @@ scrtf.com scrumcn.com scscms.com scsdns.com +scsdzxh.org scsgk.com scshenyu.com scsjnxh.org @@ -53166,7 +53066,6 @@ scxnyl.com scxyoa.com scycbz.com scycxh.com -scykxx.com scyl88.com scyongqin.com scyslb.com @@ -53232,7 +53131,6 @@ sdfhyl.com sdfkxm.com sdfll.com sdfmgg.com -sdfxt7.com sdg-china.com sdgdxt.com sdgh.net @@ -53377,7 +53275,6 @@ sealand100.com sealeadbattery.com sealyun.com seamanhome.com -seanbeite.com seandou.com seaning.com seanyxie.com @@ -53409,7 +53306,6 @@ seclover.com secoo.com secooart.com secooimg.com -secordia.com secpulse.com secretgardenresorts.com secretmine.net @@ -53460,6 +53356,7 @@ seektea.net seelvyou.com seemmo.com seentao.com +seeqiu.net seer520.com seersee.com seeseed.com @@ -53537,6 +53434,7 @@ senseluxury.com sensertek.com sensetime.com senseyun.com +sensorsdatavip.com sensorshome.com senszx.com sentaijs.com @@ -53602,13 +53500,13 @@ sesier.com sesliritim.com seteuid0.com setphp.com +settings.crashlytics.com seuic.com seutex.com sevdot.com sevenseas-china.com sewise.com seysalome.com -sezs999.com sf-airlines.com sf-bearing.com sf-card.com @@ -54203,7 +54101,6 @@ sheying001.net sheyingtg.com shfangshui.com shfcw.com -shfdedu.net shfdyk.com shfft.com shfilmmuseum.org @@ -54421,6 +54318,7 @@ shiyue.com shiyuegame.com shiyunlaile.com shiyunwatch.com +shiyunwulian.xyz shizhuonet.com shizila.com shjdc.com @@ -54488,7 +54386,6 @@ shnupps.com shoasis.net shobserver.com shockerli.net -shodr.org shoegaze.com shoeshr.com shojo.cc @@ -54515,7 +54412,6 @@ shopyy.com shortof.com shortvideoflux.com shou555.com -shou99.net shoubanjiang.com shoubanm.com shoubiaobaojia.com @@ -54711,7 +54607,6 @@ shuangkuai.co shuanglicrane.com shuangtao.com shuangtv.net -shuangxidacanyin.com shuangxinhui.com shuangyuejn.com shuangzan.com @@ -55061,7 +54956,6 @@ silingge.com silkpresent.com silkroadtechnologies.com sillydong.com -sillyguard.com silucar.com silucg.com siludao.com @@ -55619,7 +55513,6 @@ smemo.info smeoa.com smesun.com smfsgs.com -smfsjx.com smfyun.com smggw.com smgif.com @@ -56145,6 +56038,7 @@ spacechina.com spacesystech.com spacexlanding.com sparepart168.com +spark-app.store spark4y.com sparkandshine.net sparkgis.com @@ -56292,6 +56186,7 @@ srx3.net srxww.com sryjx.com srzc.com +srzxg.com srzxjt.com ss-ceo.com ss0.me @@ -56515,7 +56410,6 @@ stocks-sparkline-lb.apple.com.akadns.net stockstar.com stockwei.com stockxp.com -stoexpress.us stointl.com stone168.com stonebuy.com @@ -56717,7 +56611,6 @@ suleapi.com sulianlian.com suliao5.com suliaodingzhi.com -sum-hk.com sumaart.com sumaarts.com sumavision.com @@ -56827,7 +56720,6 @@ sunup3d.com sunupcg.com sunwayworld.com sunweiwei.com -sunww.info sunwy.org sunxiaoning.com sunxin.org @@ -57169,7 +57061,6 @@ sycaijing.com sycdtz.com sycf666.com sycfd.com -syda2015.com sydcch.com sydi.org sydimg.com @@ -57396,7 +57287,6 @@ szgla.com szgldh.com szguanai.com szgwsd.com -szgxjx.com szhdlm.com szhdyic.com szhetai.com @@ -57620,6 +57510,7 @@ t086.com t10.com t105.com t12.com +t123yh.xyz t1networks.com t1y4.com t1y5.com @@ -57787,7 +57678,6 @@ tandjx.com tang-lei.com tang.su tangangny.com -tangangnyxm.com tangcuwang.com tangdaoya.com tangdou.com @@ -58032,6 +57922,7 @@ tasiyun.com taskcity.com taskcn.com taskyou.net +taslgs.com tasly.com tastespirit.com tastones.com @@ -58094,7 +57985,6 @@ tbwan.com tbwda.com tbwfy.com tbwshc.com -tbxro.com tbxt.com tbyfsoft.com tbyuantu.com @@ -58254,7 +58144,6 @@ techxue.com teclast.com tecyle.com tedaniu.com -tedbys19.com teddymobile.net tedx.net tee7.com @@ -58370,7 +58259,6 @@ teogee.com teown.com tepcb.com tepintehui.com -teppanbase.com terabuy.com terence2008.info terencexie.com @@ -58516,6 +58404,7 @@ theonemusic.net theorychina.org thepast.cc therepenny.com +thestack.net thethirdmedia.com thetongji.com thetype.cloud @@ -58915,7 +58804,6 @@ tinyservices.net tinysou.com tinyyuan.com tiodata.com -tip-line.com tipask.com tipdm.com tipray.com @@ -59324,6 +59212,7 @@ top1food.com top21cn.com top263.net top2fun.com +top301.com top3456.com topacg.com topbester.com @@ -59487,7 +59376,6 @@ towntour.net towords.com towry.me toxingwang.com -toyama-style.com toybaba.com toycloud.com toyean.com @@ -59751,7 +59639,6 @@ tszyzx.com tt-beian.com tt-bike.com tt-ly.com -tt-nba.com tt116114.com tt1386.com tt1h.com @@ -60257,7 +60144,6 @@ txttool.com txtuu.com txtv97.com txtwork.com -txtxu.com txtxz.com txtzz.com txu.la @@ -60568,14 +60454,12 @@ uepei.com ueren.com uestcedu.com uestcguoji.com -uetuf.com ueuz.com ueview.com uewaf.com uf-crm.com uf-tobacco.com uf0088.vip -ufa866.com ufanw.com ufcap.com ufenqi.com @@ -60966,7 +60850,6 @@ usahaitao.com usahome123.com usakongjian.net usaliuxue.com -usamassgeneral.com usaobb.com usashopcn.com usbabyada.com @@ -61038,6 +60921,7 @@ utopinga.com utouion.com utourworld.com utovr.com +utransm.com utt.cc uttang.com utv4dtalk.com @@ -61230,6 +61114,7 @@ v86.org v8d8.com v9238.store v977.com +v9b5n91.com va-etong.com va88.pw vaakwe.com @@ -61381,13 +61266,13 @@ ventoy.net ventureinc.net venucia.com venustrain.com -venvicixy.com vephp.com verdareto.com verisilicon.com veritas501.space veritrans-link.com verodillan.com +versaloon.com versg.com versun.org vertuonline.com @@ -61652,7 +61537,6 @@ vivcms.com vividict.com vivifz.vip vivijk.com -vivirtigris.com viviv.com vivo.com vivoglobal.com @@ -61823,7 +61707,6 @@ vrarz.com vrbeing.com vrbig.com vrbrothers.com -vrcan.com vrcdkj.com vrcfo.com vrdou.com @@ -61874,7 +61757,6 @@ vstou.com vsuch.com vsyo.com vtache.com -vtaoyouxiang.com vte8.com vteamgroup.com vtears.com @@ -61884,7 +61766,6 @@ vtibet.com vtoov.com vtoutiao.cc vtrois.com -vtyq78.com vue-js.com vue5.com vuejscaff.com @@ -62309,7 +62190,6 @@ wangyou2.com wangyq.com wangyuan.com wangyuegame.com -wangyushuang.com wangyutang.com wangyuwang.com wangyuxiong.com @@ -62475,7 +62355,6 @@ wasair.com waseeo.com washpayer.com wasoinfo.com -wasqq.com wasu.com wasu.tv watanabe-mayu.com @@ -62587,7 +62466,6 @@ wdjcdn.com wdjimg.com wdjky.com wdjl.net -wdjsg.com wdku.net wdl.so wdliuxue.com @@ -62768,7 +62646,6 @@ wefinger.club wegame.com wegamex.com.hk wegene.com -wegoez.com wehefei.com weherepost.com wei2008.com @@ -63404,6 +63281,7 @@ whecloud.com whecn.com whedu21.com whegj.com +whenchat.net whenever-online.com wherxian.com whetc.com @@ -64493,6 +64371,7 @@ wrsaea.com wrtnode.cc wrtnode.com wrtsz.com +wrwugl.com wrx319.com ws.ksmobile.net ws8.org @@ -64546,7 +64425,6 @@ wshost.cc wshoto.com wshtgame.com wshttpdns.com -wshufa.com wsisp.com wsisp.net wsj186.com @@ -64981,7 +64859,6 @@ wxcha.com wxcsgd.com wxdgjx.com wxdh001.com -wxdianxin.com wxdspt.com wxeditor.com wxfenxiao.com @@ -65070,7 +64947,6 @@ wyn88.com wynnad.com wyptk.com wypxj.com -wyqhw.com wyqrks.com wyr.me wyrj.com @@ -65292,7 +65168,6 @@ xazzp.com xazzs.com xb.dlservice.microsoft.com xb100.net -xb22223.com xb2s.com xbaixing.com xbaquge.com @@ -65304,6 +65179,7 @@ xbblfz.site xbbsw.com xbceo.com xbcl4.com +xbdym.com xbequge.com xbeta.info xbext.com @@ -65472,6 +65348,7 @@ xdoor.cc xdowns.com xdplt.com xdpvp.com +xdrig.com xds04.com xdsipo.com xdtos.com @@ -65737,7 +65614,6 @@ xianfae.com xianfeng.net xianfengex.com xianfengsg.com -xiang-di.com xiang-le.com xiang5.com xiang578.com @@ -65816,6 +65692,7 @@ xianliao.me xianlife.com xianmin.org xianms.com +xiannanyou.com xiannvtu.com xianpp.com xianqiao.wang @@ -66540,7 +66417,9 @@ xinhaolian.com xinhaoqi.net xinhay.com xinhehui.com +xinhexinli.com xinhongru.com +xinhtz.com xinhua-news.com xinhua.net xinhua.org @@ -66550,7 +66429,6 @@ xinhuacu.com xinhuamm.net xinhuanet.com xinhuanet.ltd -xinhuanet55.com xinhuaphoto.org xinhuapo.com xinhuaprs.com @@ -66591,7 +66469,6 @@ xinli001wx.com xinliceping.com xinlifudao.com xinlimaoyi.com -xinlinganwei.com xinlinghuayuan.com xinlingletu.com xinlixue525.com @@ -66674,7 +66551,6 @@ xinxiansk.com xinxiaochina.com xinxiaodian.com xinxiaoqi.com -xinxiaoxi.vip xinxic.com xinxifabu.net xinxilai.net @@ -66792,7 +66668,6 @@ xituju.com xiu.com xiu8.com xiu90.com -xiuad.com xiuai.com xiucai.com xiuchuang.com @@ -67010,7 +66885,6 @@ xlbinyi.com xlcidc.com xlctyd.com xlcz.com -xldpp.com xldytt.com xle6688.com xlfans.com @@ -67946,7 +67820,6 @@ xystatic.com xystoy.com xysy.com xyszx678.com -xyt.wang xytaoquan.com xytianzi.com xytjcpj.com @@ -68004,7 +67877,6 @@ xzapi56.com xzbu.com xzcblog.com xzddx.com -xzgj120.com xzgjf.com xzgjj.com xzhichang.com @@ -68073,22 +67945,12 @@ yabo242.com yabo5807.com yabo5826.com yabodns.com -yabojgs.com -yaboksd.com -yabokzl.com yabolive.com -yabolps.com -yabomdj.com yaboor.com -yabopzh.com yaboqth.com yaboqxn.com -yaborkz.com -yabosys.com yaboszs.com -yabowlcb.com yaboxam.com -yaboxlglm.com yac8.com yac8.net yadgen.com @@ -68151,7 +68013,6 @@ yangblink.com yangcai168.com yangchebao.cc yangchenglianhe.com -yangchuangkj.com yangchunjian.com yangcong.com yangcong345.com @@ -69549,6 +69410,7 @@ ymhudong.com ymiot.net ymjm.net ymlfxp.com +ymlykj.com ymmfa.com ymmzb.com ymnote.com @@ -69582,7 +69444,6 @@ ynb2dca.com ynbes.com ynbike.net ynbojie.com -yncct.com yncunguan.com yndaily.com yndkt.com @@ -70271,7 +70132,6 @@ ysx8.net ysx8.vip ysxs8.com ysyycv.com -yszjdy.com yszyun.com yszyz.com yt1998.com @@ -70398,6 +70258,7 @@ yuantoushuo.com yuantu8.com yuanu.com yuanxifu.net +yuanxin.ink yuanxuxu.com yuanyangaobei.com yuanyanglw.com @@ -70945,7 +70806,6 @@ ywnz.com ywopt.com ywpfjm.com ywsawei.com -ywsgld.com ywshouyou.com ywsoftware.com ywtlfishing.com @@ -71006,7 +70866,6 @@ yxixy.com yxjbkyj.com yxjedu02.com yxjia.com -yxjrsz.com yxke12.com yxkfw.com yxkjlcd.com @@ -72167,7 +72026,6 @@ zhezheai.com zhezhekan.com zhezhier.com zhfc.com -zhfgwh.net zhfund.com zhgc.com zhgjm.com @@ -73035,6 +72893,7 @@ zituo.net zivers.com zivoo.com ziwanyouxi.com +ziweigame.com ziweihuan.com ziwork.com ziwoyou.net @@ -73848,7 +73707,6 @@ zuosa.com zuoshipin.com zuoshitu.com zuotishi.com -zuoweixin.com zuowen.com zuowen8.com zuowenck.com @@ -74063,6 +73921,7 @@ zyiis.com zyiis.net zyip.com zyjyyun.com +zykjgame.com zyku.net zyl.me zylm99.com diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute index 9cd23308b0..1bd335c232 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute @@ -4076,6 +4076,7 @@ 103.154.162.0/23 103.154.164.0/23 103.154.168.0/23 +103.154.242.0/23 103.192.0.0/22 103.192.4.0/22 103.192.8.0/22 diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/gfwlist.conf b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/gfwlist.conf index d56faae147..e289b721aa 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/gfwlist.conf +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rules/gfwlist.conf @@ -4922,20 +4922,22 @@ server=/.xxxfuckmom.com/127.0.0.1#7913 ipset=/.xxxfuckmom.com/gfwlist server=/.macts.com.tw/127.0.0.1#7913 ipset=/.macts.com.tw/gfwlist +server=/.xn--90wwvt03e.com/127.0.0.1#7913 +ipset=/.xn--90wwvt03e.com/gfwlist server=/.crrev.com/127.0.0.1#7913 ipset=/.crrev.com/gfwlist server=/.hitomi.la/127.0.0.1#7913 ipset=/.hitomi.la/gfwlist -server=/.xn--90wwvt03e.com/127.0.0.1#7913 -ipset=/.xn--90wwvt03e.com/gfwlist server=/.xn--oiq.cc/127.0.0.1#7913 ipset=/.xn--oiq.cc/gfwlist server=/.xn--i2ru8q2qg.com/127.0.0.1#7913 ipset=/.xn--i2ru8q2qg.com/gfwlist -server=/.heungkongdiscuss.com/127.0.0.1#7913 -ipset=/.heungkongdiscuss.com/gfwlist server=/.xn--4gq171p.com/127.0.0.1#7913 ipset=/.xn--4gq171p.com/gfwlist +server=/.heungkongdiscuss.com/127.0.0.1#7913 +ipset=/.heungkongdiscuss.com/gfwlist +server=/.jingsim.org/127.0.0.1#7913 +ipset=/.jingsim.org/gfwlist server=/.atc.org.au/127.0.0.1#7913 ipset=/.atc.org.au/gfwlist server=/.asianews.it/127.0.0.1#7913 @@ -9696,8 +9698,8 @@ server=/.freechinaforum.org/127.0.0.1#7913 ipset=/.freechinaforum.org/gfwlist server=/.spotify.com/127.0.0.1#7913 ipset=/.spotify.com/gfwlist -server=/.jingsim.org/127.0.0.1#7913 -ipset=/.jingsim.org/gfwlist +server=/.comparitech.com/127.0.0.1#7913 +ipset=/.comparitech.com/gfwlist server=/.tibetanaidproject.org/127.0.0.1#7913 ipset=/.tibetanaidproject.org/gfwlist server=/.goagent.biz/127.0.0.1#7913 From b4ab04790430b8ea73aa11a826894185147f76f1 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 25 Aug 2020 20:21:35 +0800 Subject: [PATCH 4/4] luci-app-clash: bump to v1.7.5.7 --- package/ntlf9t/luci-app-clash/Makefile | 4 +- .../luasrc/controller/clash.lua | 2 +- .../luasrc/model/cbi/clash/client/client.lua | 2 +- .../luasrc/model/cbi/clash/dns/advance.lua | 5 - .../luasrc/model/cbi/clash/update/update.lua | 6 +- .../luasrc/view/clash/status.htm | 512 +- .../ntlf9t/luci-app-clash/po/zh-cn/clash.po | 6 +- .../luci-app-clash/root/etc/init.d/clash | 62 +- .../root/usr/share/clash/china_ip.txt | 8492 +++++++++++++++++ .../root/usr/share/clash/chinaipset.sh | 6 + .../root/usr/share/clash/geoip.sh | 1 + .../root/usr/share/clash/luci_version | 2 +- 12 files changed, 8945 insertions(+), 155 deletions(-) create mode 100644 package/ntlf9t/luci-app-clash/root/usr/share/clash/china_ip.txt create mode 100755 package/ntlf9t/luci-app-clash/root/usr/share/clash/chinaipset.sh diff --git a/package/ntlf9t/luci-app-clash/Makefile b/package/ntlf9t/luci-app-clash/Makefile index 0fa23b301e..8c9793c375 100644 --- a/package/ntlf9t/luci-app-clash/Makefile +++ b/package/ntlf9t/luci-app-clash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-clash -PKG_VERSION:=v1.7.5.6 +PKG_VERSION:=v1.7.5.7 PKG_MAINTAINER:=frainzy1477 include $(INCLUDE_DIR)/package.mk @@ -144,6 +144,8 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) ./root/usr/share/clash/clash_real.txt $(1)/usr/share/clash $(INSTALL_BIN) ./root/usr/share/clash/logstatus_check $(1)/usr/share/clash $(INSTALL_BIN) ./root/usr/share/clash/clash.txt $(1)/usr/share/clash + $(INSTALL_BIN) ./root/usr/share/clash/chinaipset.sh $(1)/usr/share/clash + $(INSTALL_BIN) ./root/usr/share/clash/china_ip.txt $(1)/usr/share/clash $(INSTALL_BIN) ./root/usr/share/clash/dashboard/index.html $(1)/etc/clash/dashboard $(INSTALL_BIN) ./root/usr/share/clash/dashboard/main.658aa6a6e3feec8f168b.css $(1)/etc/clash/dashboard diff --git a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua index 5107ae4aa3..295bd4bd96 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua @@ -11,7 +11,7 @@ function index() return end - local page = entry({"admin", "services", "clash"},alias("admin", "services", "clash", "overview"), _("Clash"), 5) + local page = entry({"admin", "services", "clash"},alias("admin", "services", "clash", "overview"), _("Clash"), 1) page.dependent = true page.acl_depends = {"luci-app-clash"} diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client/client.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client/client.lua index a703ee462e..85d0af5b8d 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client/client.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client/client.lua @@ -33,7 +33,7 @@ o:value("1", translate("Enable")) o.description = translate("Set rules under Setting=>Game Rules, will take effect when client start") -o = s:option(ListValue, "append_rules", translate("Customs Rules")) +o = s:option(ListValue, "append_rules", translate("Append Customs Rules")) o.default = "0" o:value("0", translate("Disable")) o:value("1", translate("Enable")) diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns/advance.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns/advance.lua index 3b3537292b..87346d507c 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns/advance.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns/advance.lua @@ -25,11 +25,6 @@ y:value("0", translate("disabled")) y:value("1", translate("enabled")) y.description = translate("Set to enable or disable dns cache") -y = s:option(ListValue, "enable_udp", translate("Enable UDP")) -y:value("0", translate("disabled")) -y:value("1", translate("enabled")) -y.description = translate("Enable udp traffic ,make sure your server support udp") - y = s:option(ListValue, "access_control", translate("Access Control")) y:value("0", translate("disabled")) y:value("1", translate("Whitelist IPs")) diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update/update.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update/update.lua index 594d28f53d..9490b57288 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update/update.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update/update.lua @@ -106,9 +106,9 @@ s = k:section(TypedSection, "clash",translate("Download Online")) s.anonymous = true o = s:option(ListValue, "dcore", translate("Core Type")) o.default = "clashcore" -o:value("1", translate("Clash")) -o:value("3", translate("Clash(ctun)")) -o:value("4", translate("Clash(premium)")) +o:value("1", translate("clash")) +o:value("3", translate("clash(ctun)")) +o:value("4", translate("clash(premium)")) diff --git a/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm b/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm index 8dae230427..6dae21622c 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm +++ b/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm @@ -10,15 +10,254 @@ +
-

Clash for OpenWRT

<%:Rule-based Custom Proxy Client%>

+
+ +
+ +
+
+
+
+ +
+
+
+

<%:Baidu%>

<%:Collecting data...%>

+
+
+
+ + +
+
+
+
+ +
+
+
+

<%:Google%>

<%:Collecting data...%>

+
+
+
+ +
+
+
+
+ +
+
+
+

<%:Youtube%>

<%:Collecting data...%>

+
+
+
+ +
+
+
+
+ +
+
+
+

<%:GitHub%>

<%:Collecting data...%>

+
+
+
+ +
+
+ +<% if luci.i18n.context.lang == "zh-cn" then %> + +
+ +
+ +
+
+
+
+ +
+
+
+

<%:Global IP%>

<%:Checking...%>

+
+
+
+ + +
+
+
+
+ +
+
+
+

<%:Domestic IP%>

<%:Checking...%>

+
+
+
+ +
+
+ +<%end%> + +<% if luci.i18n.context.lang == "en" or luci.i18n.context.lang == "auto" then %> +
+ +
+ +
+
+
+
+ +
+
+
+

<%:Global IP%>

<%:Checking...%>

+
+
+
+ + +
+
+
+
+ +
+
+
+

<%:Domestic IP%>

<%:Checking...%>

+
+
+
+ +
+
+<%end%> + +
@@ -41,121 +280,163 @@ -
-
<%:Clash Client%><%:Collecting data...%>
- - -
<%:Global IP%>  : <%:Checking...%> <%:Google%> : <%:Collecting data...%><%:Youtube%>  : <%:Collecting data...%><%:Github%>  : <%:Collecting data...%>
<%:Domestic IP%>  : <%:Checking...%><%:Baidu%> : <%:Collecting data...%><%:Music.163%> : <%:Collecting data...%><%:iQiyi%> : <%:Collecting data...%>
-
-