From 37e16fde63596d1b419c96f085c05ba44ecf0dab Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 30 Nov 2019 19:16:05 +0800 Subject: [PATCH] luci-app-passwall: update --- package/lienol/luci-app-passwall/Makefile | 6 +- .../luasrc/controller/passwall.lua | 145 +- .../luasrc/model/cbi/passwall/acl.lua | 44 +- .../luasrc/model/cbi/passwall/api/api.lua | 15 + .../luasrc/model/cbi/passwall/api/brook.lua | 5 +- .../api/gen_trojan_client_config_file.lua | 16 +- .../api/gen_v2ray_client_config_file.lua | 98 +- .../luasrc/model/cbi/passwall/api/kcptun.lua | 5 +- .../luasrc/model/cbi/passwall/api/v2ray.lua | 5 +- .../luasrc/model/cbi/passwall/auto_switch.lua | 10 +- .../luasrc/model/cbi/passwall/balancing.lua | 85 +- .../luasrc/model/cbi/passwall/global.lua | 105 +- .../{serverconfig.lua => node_config.lua} | 150 +- .../luasrc/model/cbi/passwall/node_list.lua | 99 + .../luasrc/model/cbi/passwall/other.lua | 36 +- .../luasrc/model/cbi/passwall/rule.lua | 76 +- .../passwall/{rulelist.lua => rule_list.lua} | 0 .../luasrc/model/cbi/passwall/server_list.lua | 92 - .../luasrc/view/passwall/global/status.htm | 608 +++-- .../luasrc/view/passwall/global/status2.htm | 260 ++ .../luasrc/view/passwall/node_list/apply.htm | 3 + .../{server_list => node_list}/auto_ping.htm | 0 .../link_add_node.htm} | 42 +- .../view/passwall/node_list/node_list.htm | 104 + .../{server_list => node_list}/ping.htm | 2 +- .../view/passwall/rule/brook_version.htm | 6 +- .../view/passwall/rule/kcptun_version.htm | 6 +- .../view/passwall/rule/rule_version.htm | 45 +- .../view/passwall/rule/v2ray_version.htm | 6 +- .../view/passwall/server_list/apply.htm | 33 - .../view/passwall/server_list/server_list.htm | 41 - .../luci-app-passwall/po/zh-cn/passwall.po | 244 +- .../root/etc/config/passwall | 28 +- .../root/usr/share/passwall/app.sh | 304 ++- .../usr/share/passwall/dnsmasq.d/gfwlist.conf | 2342 ++++++++--------- .../root/usr/share/passwall/iptables.sh | 210 +- .../root/usr/share/passwall/monitor.sh | 32 +- .../root/usr/share/passwall/subscription.sh | 139 +- .../root/usr/share/passwall/test.sh | 16 +- 39 files changed, 2969 insertions(+), 2494 deletions(-) rename package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/{serverconfig.lua => node_config.lua} (74%) create mode 100644 package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_list.lua rename package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/{rulelist.lua => rule_list.lua} (100%) delete mode 100644 package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server_list.lua create mode 100644 package/lienol/luci-app-passwall/luasrc/view/passwall/global/status2.htm create mode 100644 package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/apply.htm rename package/lienol/luci-app-passwall/luasrc/view/passwall/{server_list => node_list}/auto_ping.htm (100%) rename package/lienol/luci-app-passwall/luasrc/view/passwall/{server_list/link_add_server.htm => node_list/link_add_node.htm} (57%) create mode 100644 package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm rename package/lienol/luci-app-passwall/luasrc/view/passwall/{server_list => node_list}/ping.htm (55%) delete mode 100644 package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/apply.htm delete mode 100644 package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/server_list.htm diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile index 8b031a8b8a..dfca21d7e4 100644 --- a/package/lienol/luci-app-passwall/Makefile +++ b/package/lienol/luci-app-passwall/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall -PKG_VERSION:=2.0 -PKG_RELEASE:=103-20191120 +PKG_VERSION:=3.0 +PKG_RELEASE:=113-20191129 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PO2LMO:=./po2lmo @@ -77,7 +77,7 @@ endmenu endef define Package/$(PKG_NAME) - CATEGORY:=LuCI + CATEGORY:=LuCI for Lienol SUBMENU:=3. Applications TITLE:=LuCI support for PassWall By Lienol PKGARCH:=all diff --git a/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua b/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua index 5242c76b8b..218a255e88 100644 --- a/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua +++ b/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua @@ -19,8 +19,8 @@ function index() end entry({"admin", "vpn", "passwall", "settings"}, cbi("passwall/global"), _("Basic Settings"), 1).dependent = true - entry({"admin", "vpn", "passwall", "server_list"}, - cbi("passwall/server_list"), _("Server List"), 2).dependent = true + entry({"admin", "vpn", "passwall", "node_list"}, cbi("passwall/node_list"), + _("Node List"), 2).dependent = true -- entry({"admin", "vpn", "passwall", "auto_switch"}, -- cbi("passwall/auto_switch"), _("Auto Switch"), 3).leaf = true entry({"admin", "vpn", "passwall", "other"}, cbi("passwall/other"), @@ -33,31 +33,30 @@ function index() _("Rule Update"), 96).leaf = true entry({"admin", "vpn", "passwall", "acl"}, cbi("passwall/acl"), _("Access control"), 97).leaf = true - entry({"admin", "vpn", "passwall", "rulelist"}, cbi("passwall/rulelist"), + entry({"admin", "vpn", "passwall", "rule_list"}, cbi("passwall/rule_list"), _("Set Blacklist And Whitelist"), 98).leaf = true entry({"admin", "vpn", "passwall", "log"}, cbi("passwall/log"), _("Watch Logs"), 99).leaf = true - entry({"admin", "vpn", "passwall", "serverconfig"}, - cbi("passwall/serverconfig")).leaf = true + entry({"admin", "vpn", "passwall", "node_config"}, + cbi("passwall/node_config")).leaf = true - entry({"admin", "vpn", "passwall", "link_add_server"}, - call("link_add_server")).leaf = true + entry({"admin", "vpn", "passwall", "link_add_node"}, call("link_add_node")).leaf = + true entry({"admin", "vpn", "passwall", "get_log"}, call("get_log")).leaf = true entry({"admin", "vpn", "passwall", "clear_log"}, call("clear_log")).leaf = true - entry({"admin", "vpn", "passwall", "server_status"}, call("server_status")).leaf = - true + entry({"admin", "vpn", "passwall", "status"}, call("status")).leaf = true entry({"admin", "vpn", "passwall", "connect_status"}, call("connect_status")).leaf = true entry({"admin", "vpn", "passwall", "check_port"}, call("check_port")).leaf = true - entry({"admin", "vpn", "passwall", "auto_ping_server"}, - call("auto_ping_server")).leaf = true - entry({"admin", "vpn", "passwall", "ping_server"}, call("ping_server")).leaf = + entry({"admin", "vpn", "passwall", "auto_ping_node"}, call("auto_ping_node")).leaf = true - entry({"admin", "vpn", "passwall", "set_server"}, call("set_server")).leaf = + entry({"admin", "vpn", "passwall", "ping_node"}, call("ping_node")).leaf = true - entry({"admin", "vpn", "passwall", "copy_server"}, call("copy_server")).leaf = + entry({"admin", "vpn", "passwall", "set_node"}, call("set_node")).leaf = + true + entry({"admin", "vpn", "passwall", "copy_node"}, call("copy_node")).leaf = true entry({"admin", "vpn", "passwall", "update_rules"}, call("update_rules")).leaf = true @@ -90,7 +89,7 @@ function hide_menu() luci.http.redirect(luci.dispatcher.build_url("admin", "status", "overview")) end -function link_add_server() +function link_add_node() local link = luci.http.formvalue("link") luci.sys.call('rm -f /tmp/links.conf && echo "' .. link .. '" >> /tmp/links.conf') @@ -105,8 +104,8 @@ end function clear_log() luci.sys.call("echo '' > /var/log/passwall.log") end -function server_status() - -- local dns_mode = luci.sys.exec("echo -n `uci get " .. appname .. ".@global[0].dns_mode`") +function status() + -- local dns_mode = luci.sys.exec("echo -n `uci -q get " .. appname .. ".@global[0].dns_mode`") local e = {} e.dns_mode_status = luci.sys.call("netstat -apn | grep 7913 >/dev/null") == 0 @@ -117,46 +116,48 @@ function server_status() "ps -w | grep -v grep | grep -i 'log /var/etc/" .. appname .. "/kcptun' >/dev/null") == 0 - local tcp_redir_server_num = luci.sys.exec( - "echo -n `uci get %s.@global_other[0].tcp_redir_server_num`" % - appname) - for i = 1, tcp_redir_server_num, 1 do + local tcp_node_num = luci.sys.exec( + "echo -n `uci -q get %s.@global_other[0].tcp_node_num`" % + appname) + for i = 1, tcp_node_num, 1 do local listen_port = luci.sys.exec( string.format( "[ -f '/var/etc/passwall/port/TCP_%s' ] && echo -n `cat /var/etc/passwall/port/TCP_%s`", i, i)) - e["tcp_redir_server%s_status" % i] = - luci.sys.call(string.format( - "ps -w | grep -v grep | grep -i -E '%s/TCP_%s|brook tproxy -l 0.0.0.0:%s|ipt2socks -T -l %s' >/dev/null", - appname, i, listen_port, listen_port)) == 0 + e["tcp_node%s_status" % i] = luci.sys.call( + string.format( + "ps -w | grep -v grep | grep -i -E '%s/TCP_%s|brook tproxy -l 0.0.0.0:%s|ipt2socks -T -l %s' >/dev/null", + appname, i, listen_port, + listen_port)) == 0 end - local udp_redir_server_num = luci.sys.exec( - "echo -n `uci get %s.@global_other[0].udp_redir_server_num`" % - appname) - for i = 1, udp_redir_server_num, 1 do + local udp_node_num = luci.sys.exec( + "echo -n `uci -q get %s.@global_other[0].udp_node_num`" % + appname) + for i = 1, udp_node_num, 1 do local listen_port = luci.sys.exec( string.format( "[ -f '/var/etc/passwall/port/UDP_%s' ] && echo -n `cat /var/etc/passwall/port/UDP_%s`", i, i)) - e["udp_redir_server%s_status" % i] = - luci.sys.call(string.format( - "ps -w | grep -v grep | grep -i -E '%s/UDP_%s|brook tproxy -l 0.0.0.0:%s|ipt2socks -U -l %s' >/dev/null", - appname, i, listen_port, listen_port)) == 0 + e["udp_node%s_status" % i] = luci.sys.call( + string.format( + "ps -w | grep -v grep | grep -i -E '%s/UDP_%s|brook tproxy -l 0.0.0.0:%s|ipt2socks -U -l %s' >/dev/null", + appname, i, listen_port, + listen_port)) == 0 end - local socks5_proxy_server_num = luci.sys.exec( - "echo -n `uci get %s.@global_other[0].socks5_proxy_server_num`" % - appname) - for i = 1, socks5_proxy_server_num, 1 do + local socks5_node_num = luci.sys.exec( + "echo -n `uci -q get %s.@global_other[0].socks5_node_num`" % + appname) + for i = 1, socks5_node_num, 1 do local listen_port = luci.sys.exec( string.format( "[ -f '/var/etc/passwall/port/Socks5_%s' ] && echo -n `cat /var/etc/passwall/port/Socks5_%s`", i, i)) - e["socks5_proxy_server%s_status" % i] = - luci.sys.call(string.format( - "ps -w | grep -v grep | grep -i -E '%s/Socks5_%s|brook client -l 0.0.0.0:%s' >/dev/null", - appname, i, listen_port)) == 0 + e["socks5_node%s_status" % i] = luci.sys.call( + string.format( + "ps -w | grep -v grep | grep -i -E '%s/Socks5_%s|brook client -l 0.0.0.0:%s' >/dev/null", + appname, i, listen_port)) == 0 end luci.http.prepare_content("application/json") luci.http.write_json(e) @@ -177,7 +178,7 @@ function connect_status() luci.http.write_json(e) end -function auto_ping_server() +function auto_ping_node() local e = {} e.index = luci.http.formvalue("index") e.ping = luci.sys.exec( @@ -187,41 +188,40 @@ function auto_ping_server() luci.http.write_json(e) end -function ping_server() +function ping_node() local e = {} - local server = luci.http.formvalue("server") + local node = luci.http.formvalue("node") e.ping = luci.sys.exec( "echo -n `ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*' | awk -F '=' '{print$2}'`" % - server) + node) luci.http.prepare_content("application/json") luci.http.write_json(e) end -function set_server() +function set_node() local e = {} local protocol = luci.http.formvalue("protocol") local number = luci.http.formvalue("number") local section = luci.http.formvalue("section") if protocol == "tcp" then - luci.sys.call( - "uci set passwall.@global[0].tcp_redir_server" .. number .. "=" .. - section .. - " && uci commit passwall && /etc/init.d/passwall restart") - elseif protocol == "udp" then - luci.sys.call( - "uci set passwall.@global[0].udp_redir_server" .. number .. "=" .. - section .. - " && uci commit passwall && /etc/init.d/passwall restart") - elseif protocol == "socks5" then - luci.sys.call("uci set passwall.@global[0].socks5_proxy_server" .. - number .. "=" .. section .. + luci.sys.call("uci set passwall.@global[0].tcp_node" .. number .. "=" .. + section .. " && uci commit passwall && /etc/init.d/passwall restart") + elseif protocol == "udp" then + luci.sys.call("uci set passwall.@global[0].udp_node" .. number .. "=" .. + section .. + " && uci commit passwall && /etc/init.d/passwall restart") + elseif protocol == "socks5" then + luci.sys.call( + "uci set passwall.@global[0].socks5_node" .. number .. "=" .. + section .. + " && uci commit passwall && /etc/init.d/passwall restart") end luci.http.prepare_content("application/json") luci.http.write_json(e) end -function copy_server() +function copy_node() local e = {} local section = luci.http.formvalue("section") luci.http.prepare_content("application/json") @@ -233,41 +233,38 @@ function check_port() retstring = retstring .. "暂时不支持UDP检测
" local s - local server_name = "" + local node_name = "" local uci = luci.model.uci.cursor() - uci:foreach("passwall", "servers", function(s) + uci:foreach("passwall", "nodes", function(s) local ret = "" local tcp_socket local udp_socket if (s.use_kcp and s.use_kcp == "1" and s.kcp_port) or - (s.v2ray_transport and s.v2ray_transport == "mkcp" and s.server_port) then - --[[local port = (s.use_kcp == "1" and s.kcp_port) and s.kcp_port or (s.v2ray_transport == "mkcp" and s.server_port) and s.server_port or nil + (s.v2ray_transport and s.v2ray_transport == "mkcp" and s.port) then + --[[local port = (s.use_kcp == "1" and s.kcp_port) and s.kcp_port or (s.v2ray_transport == "mkcp" and s.port) and s.port or nil if port then udp_socket = nixio.socket("inet", "dgram") udp_socket:setopt("socket", "rcvtimeo", 3) udp_socket:setopt("socket", "sndtimeo", 3) - udp_socket:sendto("test", s.server, port) + udp_socket:sendto("test", s.address, port) r,c,d=udp_socket:recvfrom(10) ret="" end--]] else - if s.server_type and s.server and s.server_port and s.remarks then - server_name = "%s：[%s] %s:%s" % - { - s.server_type, s.remarks, s.server, s.server_port - } + if s.type and s.address and s.port and s.remarks then + node_name = "%s：[%s] %s:%s" % + {s.type, s.remarks, s.address, s.port} end tcp_socket = nixio.socket("inet", "stream") tcp_socket:setopt("socket", "rcvtimeo", 3) tcp_socket:setopt("socket", "sndtimeo", 3) - ret = tcp_socket:connect(s.server, s.server_port) + ret = tcp_socket:connect(s.address, s.port) if tostring(ret) == "true" then - retstring = - retstring .. "" .. server_name .. - " OK.
" + retstring = retstring .. "" .. node_name .. + " OK.
" else - retstring = retstring .. "" .. server_name .. + retstring = retstring .. "" .. node_name .. " Error.
" end ret = "" diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/acl.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/acl.lua index d1393aa2f7..e74a9c0619 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/acl.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/acl.lua @@ -1,16 +1,16 @@ local sys = require "luci.sys" local webadmin = require "luci.tools.webadmin" local uci = require"luci.model.uci".cursor() +local api = require "luci.model.cbi.passwall.api.api" local appname = "passwall" local n = {} -uci:foreach(appname, "servers", function(e) - if e.server_type and e.server and e.remarks then +uci:foreach(appname, "nodes", function(e) + if e.type and e.address and e.remarks then if e.use_kcp and e.use_kcp == "1" then - n[e[".name"]] = "%s+%s：[%s]" % - {e.server_type, "Kcptun", e.remarks} + n[e[".name"]] = "%s+%s：[%s]" % {e.type, "Kcptun", e.remarks} else - n[e[".name"]] = "%s：[%s]" % {e.server_type, e.remarks} + n[e[".name"]] = "%s：[%s]" % {e.type, e.remarks} end end end) @@ -23,7 +23,7 @@ m = Map("passwall") -- [[ ACLs Settings ]]-- s = m:section(TypedSection, "acl_rule", translate("ACLs"), translate( - "ACLs is a tools which used to designate specific IP proxy mode")) + "ACLs is a tools which used to designate specific IP proxy mode, IP or MAC address can be entered.")) s.template = "cbi/tblsection" s.sortable = true s.anonymous = true @@ -33,12 +33,12 @@ s.addremove = true o = s:option(Flag, "enabled", translate("Enable")) o.rmempty = false ----- ACL Remarks -o = s:option(Value, "aclremarks", translate("ACL Remarks")) +---- Remarks +o = s:option(Value, "remarks", translate("Remarks")) o.rmempty = true ---- IP Address -o = s:option(Value, "ipaddr", translate("IP Address")) +o = s:option(Value, "ip", translate("IP")) o.datatype = "ip4addr" o.rmempty = true @@ -54,27 +54,19 @@ for index, key in pairs(ips) do o:value(key, temp[key]) end -- webadmin.cbi_add_knownips(o) ---- MAC Address -o = s:option(Value, "macaddr", translate("MAC Address")) +o = s:option(Value, "mac", translate("MAC")) o.rmempty = true sys.net.mac_hints(function(e, t) o:value(e, "%s " % {e}) end) ----- TCP Redir Server -local tcp_redir_server_num = uci:get(appname, "@global_other[0]", - "tcp_redir_server_num") -o = s:option(ListValue, "tcp_redir_server", translate("TCP Server")) -o:value("1",translate("TCP Redir Server").." 1") -if tcp_redir_server_num and tonumber(tcp_redir_server_num) >= 2 then - for i = 2, tcp_redir_server_num, 1 do o:value(i,translate("TCP Redir Server").." "..i) end -end +---- TCP Node +local tcp_node_num = api.uci_get_type("global_other", "tcp_node_num") +o = s:option(ListValue, "tcp_node", translate("TCP Node")) +for i = 1, tcp_node_num, 1 do o:value(i, "TCP_" .. i) end ----- UDP Redir Server -local udp_redir_server_num = uci:get(appname, "@global_other[0]", - "udp_redir_server_num") -o = s:option(ListValue, "udp_redir_server", translate("UDP Server")) -o:value("1",translate("UDP Redir Server").." 1") -if udp_redir_server_num and tonumber(udp_redir_server_num) >= 2 then - for i = 2, udp_redir_server_num, 1 do o:value(i,translate("UDP Redir Server").." "..i) end -end +---- UDP Node +local udp_node_num = api.uci_get_type("global_other", "udp_node_num") +o = s:option(ListValue, "udp_node", translate("UDP Node")) +for i = 1, udp_node_num, 1 do o:value(i, "UDP_" .. i) end ---- Proxy Mode o = s:option(ListValue, "proxy_mode", translate("Proxy Mode")) diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua index a9148d9cdf..7e188feea9 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua @@ -5,6 +5,8 @@ local uci = require"luci.model.uci".cursor() local util = require "luci.util" local i18n = require "luci.i18n" +local appname = "passwall" + local wget = "/usr/bin/wget" local wget_args = { "--no-check-certificate", "--quiet", "--timeout=100", "--tries=3" @@ -15,6 +17,19 @@ local command_timeout = 300 local LEDE_BOARD = nil local DISTRIB_TARGET = nil +function uci_get_type(type, config) + return uci:get(appname, "@" .. type .. "[0]", config) or + sys.exec( + "echo -n `uci -q get " .. appname .. ".@" .. type .. "[0]." .. + config .. "`") +end + +function uci_get_type_id(id, config) + return uci:get(appname, id, config) or + sys.exec("echo -n `uci -q get " .. appname .. "." .. id .. "." .. + config .. "`") +end + function _unpack(t, i) i = i or 1 if t[i] ~= nil then return t[i], _unpack(t, i + 1) end diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua index 6ad6475da8..9f4ef2b9da 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua @@ -1,7 +1,6 @@ module("luci.model.cbi.passwall.api.brook", package.seeall) local fs = require "nixio.fs" local sys = require "luci.sys" -local uci = require"luci.model.uci".cursor() local util = require "luci.util" local i18n = require "luci.i18n" local api = require "luci.model.cbi.passwall.api.api" @@ -19,9 +18,7 @@ local LEDE_BOARD = nil local DISTRIB_TARGET = nil function get_brook_file_path() - return uci:get("passwall", "global_app", "brook_client_file") or - luci.sys.exec( - "echo -n `uci get passwall.@global_app[0].brook_client_file`") + return api.uci_get_type("global_app", "brook_file") end function get_brook_version(file) diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_trojan_client_config_file.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_trojan_client_config_file.lua index b0e644dc5a..d290787fcd 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_trojan_client_config_file.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_trojan_client_config_file.lua @@ -1,22 +1,22 @@ local ucursor = require"luci.model.uci".cursor() local json = require "luci.jsonc" -local server_section = arg[1] +local node_section = arg[1] local run_type = arg[2] local proxy_port = arg[3] -local server = ucursor:get_all("passwall", server_section) +local node = ucursor:get_all("passwall", node_section) local trojan = { run_type = run_type, local_addr = "0.0.0.0", local_port = proxy_port, - remote_addr = server.server, - remote_port = tonumber(server.server_port), - password = {server.password}, + remote_addr = node.address, + remote_port = tonumber(node.port), + password = {node.password}, log_level = 1, ssl = { - verify = true, + verify = (node.trojan_verify_cert == "1") and true or false, verify_hostname = true, - cert = "", + cert = node.trojan_cert_path, cipher = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:RSA-AES128-GCM-SHA256:RSA-AES256-GCM-SHA384:RSA-AES128-SHA:RSA-AES256-SHA:RSA-3DES-EDE-SHA", sni = "", alpn = {"h2", "http/1.1"}, @@ -27,7 +27,7 @@ local trojan = { tcp = { no_delay = true, keep_alive = true, - fast_open = (server.fast_open == "true") and true or false, + fast_open = (node.tcp_fast_open == "true") and true or false, fast_open_qlen = 20 } } diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray_client_config_file.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray_client_config_file.lua index e7bf79de33..9cfada9747 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray_client_config_file.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray_client_config_file.lua @@ -1,11 +1,12 @@ local ucursor = require"luci.model.uci".cursor() local json = require "luci.jsonc" -local server_section = arg[1] +local node_section = arg[1] local proto = arg[2] local redir_port = arg[3] local socks5_proxy_port = arg[4] -local server = ucursor:get_all("passwall", server_section) +local node = ucursor:get_all("passwall", node_section) local inbound_json = {} +local inboundDetour_json = nil if socks5_proxy_port ~= "nil" then inbound_json = { @@ -23,6 +24,25 @@ if redir_port ~= "nil" then settings = {network = proto, followRedirect = true}, sniffing = {enabled = true, destOverride = {"http", "tls"}} } + if proto == "tcp" and node.v2ray_tcp_socks == "1" then + inboundDetour_json = { + { + listen = "0.0.0.0", + port = tonumber(node.v2ray_tcp_socks_port), + protocol = "socks", + settings = { + auth = node.v2ray_tcp_socks_auth, + accounts = (node.v2ray_tcp_socks_auth == "password") and { + { + user = node.v2ray_tcp_socks_auth_username, + pass = node.v2ray_tcp_socks_auth_password + } + } or nil, + udp = true + } + } + } + end end local v2ray = { @@ -32,64 +52,64 @@ local v2ray = { }, -- 传入连接 inbound = inbound_json, + inboundDetour = inboundDetour_json, -- 传出连接 outbound = { - protocol = server.v2ray_protocol, + protocol = node.v2ray_protocol, settings = { vnext = { { - address = server.server, - port = tonumber(server.server_port), + address = node.address, + port = tonumber(node.port), users = { { - id = server.v2ray_VMess_id, - alterId = tonumber(server.v2ray_VMess_alterId), - level = tonumber(server.v2ray_VMess_level), - security = server.v2ray_security + id = node.v2ray_VMess_id, + alterId = tonumber(node.v2ray_VMess_alterId), + level = tonumber(node.v2ray_VMess_level), + security = node.v2ray_security } } } } }, mux = { - enabled = (server.v2ray_mux == "1") and true or false, - concurrency = (server.v2ray_mux_concurrency) and - tonumber(server.v2ray_mux_concurrency) or 8 + enabled = (node.v2ray_mux == "1") and true or false, + concurrency = (node.v2ray_mux_concurrency) and + tonumber(node.v2ray_mux_concurrency) or 8 }, -- 底层传输配置 streamSettings = { - network = server.v2ray_transport, - security = server.v2ray_stream_security, - tlsSettings = (server.v2ray_stream_security == "tls") and { - serverName = server.tls_serverName, - allowInsecure = (server.tls_allowInsecure == "1") and true or + network = node.v2ray_transport, + security = node.v2ray_stream_security, + tlsSettings = (node.v2ray_stream_security == "tls") and { + serverName = node.tls_serverName, + allowInsecure = (node.tls_allowInsecure == "1") and true or false } or nil, - kcpSettings = (server.v2ray_transport == "mkcp") and { - mtu = tonumber(server.v2ray_mkcp_mtu), - tti = tonumber(server.v2ray_mkcp_tti), - uplinkCapacity = tonumber(server.v2ray_mkcp_uplinkCapacity), - downlinkCapacity = tonumber(server.v2ray_mkcp_downlinkCapacity), - congestion = (server.v2ray_mkcp_congestion == "1") and true or + kcpSettings = (node.v2ray_transport == "mkcp") and { + mtu = tonumber(node.v2ray_mkcp_mtu), + tti = tonumber(node.v2ray_mkcp_tti), + uplinkCapacity = tonumber(node.v2ray_mkcp_uplinkCapacity), + downlinkCapacity = tonumber(node.v2ray_mkcp_downlinkCapacity), + congestion = (node.v2ray_mkcp_congestion == "1") and true or false, - readBufferSize = tonumber(server.v2ray_mkcp_readBufferSize), - writeBufferSize = tonumber(server.v2ray_mkcp_writeBufferSize), - header = {type = server.v2ray_mkcp_guise} + readBufferSize = tonumber(node.v2ray_mkcp_readBufferSize), + writeBufferSize = tonumber(node.v2ray_mkcp_writeBufferSize), + header = {type = node.v2ray_mkcp_guise} } or nil, - wsSettings = (server.v2ray_transport == "ws") and { - path = server.v2ray_ws_path, - headers = (server.v2ray_ws_host ~= nil) and - {Host = server.v2ray_ws_host} or nil + wsSettings = (node.v2ray_transport == "ws") and { + path = node.v2ray_ws_path, + headers = (node.v2ray_ws_host ~= nil) and + {Host = node.v2ray_ws_host} or nil } or nil, - httpSettings = (server.v2ray_transport == "h2") and - {path = server.v2ray_h2_path, host = server.v2ray_h2_host} or - nil, - dsSettings = (server.v2ray_transport == "ds") and - {path = server.v2ray_ds_path} or nil, - quicSettings = (server.v2ray_transport == "quic") and { - security = server.v2ray_quic_security, - key = server.v2ray_quic_key, - header = {type = server.v2ray_quic_guise} + httpSettings = (node.v2ray_transport == "h2") and + {path = node.v2ray_h2_path, host = node.v2ray_h2_host} or nil, + dsSettings = (node.v2ray_transport == "ds") and + {path = node.v2ray_ds_path} or nil, + quicSettings = (node.v2ray_transport == "quic") and { + security = node.v2ray_quic_security, + key = node.v2ray_quic_key, + header = {type = node.v2ray_quic_guise} } or nil } }, diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua index 282a6544a3..36be58500f 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua @@ -1,7 +1,6 @@ module("luci.model.cbi.passwall.api.kcptun", package.seeall) local fs = require "nixio.fs" local sys = require "luci.sys" -local uci = require"luci.model.uci".cursor() local util = require "luci.util" local i18n = require "luci.i18n" local api = require "luci.model.cbi.passwall.api.api" @@ -18,9 +17,7 @@ local LEDE_BOARD = nil local DISTRIB_TARGET = nil function get_kcptun_file_path() - return uci:get("passwall", "global_app", "kcptun_client_file") or - luci.sys.exec( - "echo -n `uci get passwall.@global_app[0].kcptun_client_file`") + return api.uci_get_type("global_app", "kcptun_client_file") end function get_kcptun_version(file) diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua index 83ed6c7576..ca8fc55e94 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua @@ -1,7 +1,6 @@ module("luci.model.cbi.passwall.api.v2ray", package.seeall) local fs = require "nixio.fs" local sys = require "luci.sys" -local uci = require"luci.model.uci".cursor() local util = require "luci.util" local i18n = require "luci.i18n" local ipkg = require("luci.model.ipkg") @@ -20,9 +19,7 @@ local DISTRIB_TARGET = nil local is_armv7 = false function get_v2ray_file_path() - return uci:get("passwall", "global_app", "v2ray_client_file") or - sys.exec( - "echo -n `uci get passwall.@global_app[0].v2ray_client_file`") + return api.uci_get_type("global_app", "v2ray_file") end function get_v2ray_version() diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua index 81b5bf1f4f..0efbbf5deb 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua @@ -1,10 +1,10 @@ -local uci = require "luci.model.uci".cursor() +local uci = require"luci.model.uci".cursor() local appname = "passwall" local n = {} -uci:foreach(appname, "servers", function(e) - if e.server_type and e.server and e.remarks then - n[e[".name"]] = "%s：[%s] %s" % {e.server_type, e.remarks, e.server} +uci:foreach(appname, "nodes", function(e) + if e.type and e.address and e.remarks then + n[e[".name"]] = "%s：[%s] %s" % {e.type, e.remarks, e.address} end end) @@ -30,7 +30,7 @@ o.default = "10" ---- Tcp Redir Server o = s:option(DynamicList, "tcp_redir_server", - translate("List of alternate TCP forwarding servers"), translate( + translate("List of alternate TCP forwarding nodes"), translate( "When there is no server, an automatic reconnect scheme is used")) for _, key in pairs(key_table) do o:value(key, n[key]) end diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua index 06a78af2e3..f06db3c4f4 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua @@ -1,83 +1,76 @@ local e = require "nixio.fs" local e = require "luci.sys" -local net = require "luci.model.network".init() -local uci = require "luci.model.uci".cursor() +local net = require"luci.model.network".init() +local uci = require"luci.model.uci".cursor() local ifaces = e.net:devices() local appname = "passwall" -local servers_name = {} -local servers_port = {} +local nodes_name = {} +local nodes_port = {} -uci:foreach(appname, "servers", function(e) - if e.server and e.server_port and e.server ~= "127.0.0.1" then - servers_name[e[".name"]] = "%s" % {e.server} - servers_port[e[".name"]] = "%s" % {e.server_port} +uci:foreach(appname, "nodes", function(e) + if e.address and e.port and e.address ~= "127.0.0.1" then + nodes_name[e[".name"]] = "%s" % {e.address} + nodes_port[e[".name"]] = "%s" % {e.port} end end) m = Map("passwall") -- [[ Haproxy Settings ]]-- -s = m:section(TypedSection, "global_haproxy", translate("Admin Status"), - translate( - "In the browser input routing IP plus port access, such as:192.168.1.1:1188") .. - "
") s.anonymous = true ----- Admin Enable -o = s:option(Flag, "admin_enable", translate("Enable Admin Status")) +---- Balancing Enable +o = s:option(Flag, "balancing_enable", translate("Enable Load Balancing")) o.rmempty = false o.default = false ----- Admin Port -o = s:option(Value, "admin_port", translate("Admin Status port setting")) -o.default = "1188" -o:depends("admin_enable", 1) - ----- Admin User -o = s:option(Value, "admin_user", translate("Admin Status User")) +---- Console Username +o = s:option(Value, "console_user", translate("Console Username")) o.default = "admin" -o:depends("admin_enable", 1) +o:depends("balancing_enable", 1) ----- Admin Password -o = s:option(Value, "admin_password", translate("Admin Status Password")) +---- Console Password +o = s:option(Value, "console_password", translate("Console Password")) o.password = true o.default = "admin" -o:depends("admin_enable", 1) +o:depends("balancing_enable", 1) ----- Balancing Enable -o = s:option(Flag, "balancing_enable", - translate("Enable or Disable Load Balancing")) -o.rmempty = false -o.default = false +---- Console Port +o = s:option(Value, "console_port", translate("Console Port"), translate( + "In the browser input routing IP plus port access, such as:192.168.1.1:1188")) +o.default = "1188" +o:depends("balancing_enable", 1) ---- Haproxy Port -o = s:option(Value, "haproxy_port", translate("Haproxy port setting")) +o = s:option(Value, "haproxy_port", translate("Haproxy Port")) o.default = "1181" o:depends("balancing_enable", 1) -- [[ Balancing Settings ]]-- -s = m:section(TypedSection, "balancing", - translate("Load Balancing Server Setting"), translate( - "Add a load balancing server, note reading above requirements.")) +s = m:section(TypedSection, "balancing", translate("Load Balancing Setting"), + translate( + "Add a node, Export Of Multi WAN Only support Multi Wan. If no effect, please go to mwan3 to set. Load specific gravity range 1-256. Multiple primary servers can be load balanced, standby will only be enabled when the primary server is offline!")) s.template = "cbi/tblsection" s.sortable = true s.anonymous = true s.addremove = true ----- Server Address -o = s:option(Value, "lbss", translate("Server Address")) -for m, s in pairs(servers_name) do o:value(s) end +---- Node Address +o = s:option(Value, "lbss", translate("Node Address")) +for m, s in pairs(nodes_name) do o:value(s) end o.rmempty = false ----- Server Port -o = s:option(Value, "lbort", translate("Server Port")) -for m, s in pairs(servers_port) do o:value(s) end +---- Node Port +o = s:option(Value, "lbort", translate("Node Port")) +for m, s in pairs(nodes_port) do o:value(s) end o.rmempty = false ----- Server weight -o = s:option(Value, "lbweight", translate("Server weight")) +---- Node Weight +o = s:option(Value, "lbweight", translate("Node Weight")) o.default = "5" o.rmempty = false @@ -96,10 +89,10 @@ end o.default = 0 o.rmempty = false ----- Backup -o = s:option(ListValue, "backup", translate("Server Mode")) -o:value(0, translate("Primary Server")) -o:value(1, translate("Standby Server")) +---- Mode +o = s:option(ListValue, "backup", translate("Mode")) +o:value(0, translate("Primary")) +o:value(1, translate("Standby")) o.rmempty = false return m diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/global.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/global.lua index 5678eaa808..a0dffb07fa 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/global.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/global.lua @@ -3,6 +3,7 @@ local fs = require "nixio.fs" local sys = require "luci.sys" local ipkg = require("luci.model.ipkg") local uci = require"luci.model.uci".cursor() +local api = require "luci.model.cbi.passwall.api.api" local appname = "passwall" local function is_installed(e) return ipkg.installed(e) end @@ -13,19 +14,14 @@ local function is_finded(e) false end -local function has_udp_relay() - return sys.call("lsmod | grep TPROXY >/dev/null") == 0 -end - local n = {} -uci:foreach(appname, "servers", function(e) - if e.server_type and e.server and e.remarks then +uci:foreach(appname, "nodes", function(e) + if e.type and e.address and e.remarks then if e.use_kcp and e.use_kcp == "1" then n[e[".name"]] = "%s+%s：[%s] %s" % - {e.server_type, "Kcptun", e.remarks, e.server} + {e.type, "Kcptun", e.remarks, e.address} else - n[e[".name"]] = "%s：[%s] %s" % - {e.server_type, e.remarks, e.server} + n[e[".name"]] = "%s：[%s] %s" % {e.type, e.remarks, e.address} end end end) @@ -35,67 +31,62 @@ for key, _ in pairs(n) do table.insert(key_table, key) end table.sort(key_table) m = Map(appname) -m:append(Template("passwall/global/status")) +local status_use_big_icon = api.uci_get_type("global_other", + "status_use_big_icon") +if status_use_big_icon and status_use_big_icon == "1" then + m:append(Template("passwall/global/status")) +else + m:append(Template("passwall/global/status2")) +end -- [[ Global Settings ]]-- s = m:section(TypedSection, "global", translate("Global Settings")) s.anonymous = true s.addremove = false ----- TCP Redir Server -o = s:option(ListValue, "tcp_redir_server1", translate("TCP Redir Server"), - translate("For used to surf the Internet.")) -o:value("nil", translate("Close")) -for _, key in pairs(key_table) do o:value(key, n[key]) end - -local tcp_redir_server_num = uci:get(appname, "@global_other[0]", - "tcp_redir_server_num") -if tcp_redir_server_num and tonumber(tcp_redir_server_num) >= 2 then - for i = 2, tcp_redir_server_num, 1 do - o = s:option(ListValue, "tcp_redir_server" .. i, - translate("TCP Redir Server") .. " " .. i) - o:value("nil", translate("Close")) - for _, key in pairs(key_table) do o:value(key, n[key]) end +---- TCP Node +local tcp_node_num = api.uci_get_type("global_other", "tcp_node_num") +for i = 1, tcp_node_num, 1 do + if i == 1 then + o = s:option(ListValue, "tcp_node" .. i, translate("TCP Node"), + translate("For used to surf the Internet.")) + else + o = s:option(ListValue, "tcp_node" .. i, + translate("TCP Node") .. " " .. i) end -end - ----- UDP Redir Server -if has_udp_relay() then - o = s:option(ListValue, "udp_redir_server1", translate("UDP Redir Server"), - translate("For Game Mode or DNS resolution and more.") .. - translate("The selected server will not use Kcptun.")) o:value("nil", translate("Close")) - o:value("default", translate("Same as the tcp redir server")) for _, key in pairs(key_table) do o:value(key, n[key]) end - - local udp_redir_server_num = uci:get(appname, "@global_other[0]", - "udp_redir_server_num") - if udp_redir_server_num and tonumber(udp_redir_server_num) >= 2 then - for i = 2, udp_redir_server_num, 1 do - o = s:option(ListValue, "udp_redir_server" .. i, - translate("UDP Redir Server") .. " " .. i) - o:value("nil", translate("Close")) - for _, key in pairs(key_table) do o:value(key, n[key]) end - end - end end ----- Socks5 Proxy Server -o = s:option(ListValue, "socks5_proxy_server1", - translate("Socks5 Proxy Server"), - translate("The client can use the router's Socks5 proxy")) -o:value("nil", translate("Close")) -for _, key in pairs(key_table) do o:value(key, n[key]) end - -local socks5_proxy_server_num = uci:get(appname, "@global_other[0]", - "socks5_proxy_server_num") -if socks5_proxy_server_num and tonumber(socks5_proxy_server_num) >= 2 then - for i = 2, socks5_proxy_server_num, 1 do - o = s:option(ListValue, "socks5_proxy_server" .. i, - translate("Socks5 Proxy Server") .. " " .. i) +---- UDP Node +local udp_node_num = api.uci_get_type("global_other", "udp_node_num") +for i = 1, udp_node_num, 1 do + if i == 1 then + o = s:option(ListValue, "udp_node" .. i, translate("UDP Node"), + translate("For Game Mode or DNS resolution and more.") .. + translate("The selected server will not use Kcptun.")) + o:value("nil", translate("Close")) + o:value("default", translate("Same as the tcp node")) + else + o = s:option(ListValue, "udp_node" .. i, + translate("UDP Node") .. " " .. i) o:value("nil", translate("Close")) - for _, key in pairs(key_table) do o:value(key, n[key]) end end + for _, key in pairs(key_table) do o:value(key, n[key]) end +end + +---- Socks5 Node +local socks5_node_num = api.uci_get_type("global_other", "socks5_node_num") +for i = 1, socks5_node_num, 1 do + if i == 1 then + o = s:option(ListValue, "socks5_node" .. i, translate("Socks5 Node"), + translate("The client can use the router's Socks5 proxy")) + else + o = s:option(ListValue, "socks5_node" .. i, + translate("Socks5 Node") .. " " .. i) + end + o:value("nil", translate("Close")) + for _, key in pairs(key_table) do o:value(key, n[key]) end end ---- DNS Forward Mode diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/serverconfig.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua similarity index 74% rename from package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/serverconfig.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua index bdf2738b2c..ceba70d6f8 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/serverconfig.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua @@ -44,117 +44,109 @@ local v2ray_header_type_list = { "none", "srtp", "utp", "wechat-video", "dtls", "wireguard" } -m = Map(appname, translate("ShadowSocks Server Config"), - translate("TCP quick open server does not support do not open.") .. - translate("HAProxy cannot be used with KCP.")) +m = Map(appname, translate("Node Config")) m.redirect = d.build_url("admin", "vpn", "passwall") -s = m:section(NamedSection, arg[1], "servers", "") +s = m:section(NamedSection, arg[1], "nodes", "") s.addremove = false s.dynamic = false remarks = s:option(Value, "remarks", translate("Node Remarks")) -remarks.default = translate("Node Remarks") +remarks.default = translate("Remarks") remarks.rmempty = false -server_type = s:option(ListValue, "server_type", translate("Server Type")) +type = s:option(ListValue, "type", translate("Type")) if ((is_installed("redsocks2") or is_finded("redsocks2")) or (is_installed("ipt2socks") or is_finded("ipt2socks"))) then - server_type:value("Socks5", translate("Socks5 Server")) -end -if is_finded("ss-redir") then - server_type:value("SS", translate("Shadowsocks Server")) -end -if is_finded("ssr-redir") then - server_type:value("SSR", translate("ShadowsocksR Server")) -end -if is_installed("v2ray") then - server_type:value("V2ray", translate("V2ray Server")) + type:value("Socks5", translate("Socks5")) end +if is_finded("ss-redir") then type:value("SS", translate("Shadowsocks")) end +if is_finded("ssr-redir") then type:value("SSR", translate("ShadowsocksR")) end +if is_installed("v2ray") then type:value("V2ray", translate("V2ray")) end if is_installed("brook") or is_finded("brook") then - server_type:value("Brook", translate("Brook Server")) + type:value("Brook", translate("Brook")) end if is_installed("trojan") or is_finded("trojan") then - server_type:value("Trojan", translate("Trojan Server")) + type:value("Trojan", translate("Trojan")) end v2ray_protocol = s:option(ListValue, "v2ray_protocol", translate("V2ray Protocol")) v2ray_protocol:value("vmess", translate("Vmess")) -v2ray_protocol:depends("server_type", "V2ray") +v2ray_protocol:depends("type", "V2ray") -server = s:option(Value, "server", - translate("Server Address (Support Domain Name)")) -server.rmempty = false +address = s:option(Value, "address", translate("Address (Support Domain Name)")) +address.rmempty = false use_ipv6 = s:option(Flag, "use_ipv6", translate("Use IPv6")) use_ipv6.default = 0 -server_port = s:option(Value, "server_port", translate("Server Port")) -server_port.datatype = "port" -server_port.rmempty = false +port = s:option(Value, "port", translate("Port")) +port.datatype = "port" +port.rmempty = false username = s:option(Value, "username", translate("Username")) -username:depends("server_type", "Socks5") +username:depends("type", "Socks5") password = s:option(Value, "password", translate("Password")) password.password = true -password:depends("server_type", "Socks5") -password:depends("server_type", "SS") -password:depends("server_type", "SSR") -password:depends("server_type", "Brook") -password:depends("server_type", "Trojan") +password:depends("type", "Socks5") +password:depends("type", "SS") +password:depends("type", "SSR") +password:depends("type", "Brook") +password:depends("type", "Trojan") ss_encrypt_method = s:option(ListValue, "ss_encrypt_method", translate("Encrypt Method")) for a, t in ipairs(ss_encrypt_method_list) do ss_encrypt_method:value(t) end -ss_encrypt_method:depends("server_type", "SS") +ss_encrypt_method:depends("type", "SS") ssr_encrypt_method = s:option(ListValue, "ssr_encrypt_method", translate("Encrypt Method")) for a, t in ipairs(ssr_encrypt_method_list) do ssr_encrypt_method:value(t) end -ssr_encrypt_method:depends("server_type", "SSR") +ssr_encrypt_method:depends("type", "SSR") v2ray_security = s:option(ListValue, "v2ray_security", translate("Encrypt Method")) for a, t in ipairs(v2ray_security_list) do v2ray_security:value(t) end -v2ray_security:depends("server_type", "V2ray") +v2ray_security:depends("type", "V2ray") protocol = s:option(ListValue, "protocol", translate("Protocol")) for a, t in ipairs(ssr_protocol_list) do protocol:value(t) end -protocol:depends("server_type", "SSR") +protocol:depends("type", "SSR") protocol_param = s:option(Value, "protocol_param", translate("Protocol_param")) -protocol_param:depends("server_type", "SSR") +protocol_param:depends("type", "SSR") obfs = s:option(ListValue, "obfs", translate("Obfs")) for a, t in ipairs(ssr_obfs_list) do obfs:value(t) end -obfs:depends("server_type", "SSR") +obfs:depends("type", "SSR") obfs_param = s:option(Value, "obfs_param", translate("Obfs_param")) -obfs_param:depends("server_type", "SSR") +obfs_param:depends("type", "SSR") timeout = s:option(Value, "timeout", translate("Connection Timeout")) timeout.datatype = "uinteger" timeout.default = 300 -timeout:depends("server_type", "SS") -timeout:depends("server_type", "SSR") +timeout:depends("type", "SS") +timeout:depends("type", "SSR") -fast_open = s:option(ListValue, "fast_open", translate("Fast_open")) -fast_open:value("false") -fast_open:value("true") -fast_open:depends("server_type", "SS") -fast_open:depends("server_type", "SSR") -fast_open:depends("server_type", "Trojan") +tcp_fast_open = s:option(ListValue, "tcp_fast_open", translate("TCP Fast Open"), + translate("Need node support required")) +tcp_fast_open:value("false") +tcp_fast_open:value("true") +tcp_fast_open:depends("type", "SS") +tcp_fast_open:depends("type", "SSR") +tcp_fast_open:depends("type", "Trojan") use_kcp = s:option(Flag, "use_kcp", translate("Use Kcptun"), "" .. translate( "Please confirm whether the Kcptun is installed. If not, please go to Rule Update download installation.") .. "") use_kcp.default = 0 -use_kcp:depends("server_type", "SS") -use_kcp:depends("server_type", "SSR") -use_kcp:depends("server_type", "Brook") +use_kcp:depends("type", "SS") +use_kcp:depends("type", "SSR") +use_kcp:depends("type", "Brook") kcp_server = s:option(Value, "kcp_server", translate("Kcptun Server")) kcp_server.placeholder = translate("Default:Current Server") @@ -186,7 +178,7 @@ v2ray_VMess_alterId:depends("v2ray_protocol", "vmess") v2ray_VMess_level = s:option(Value, "v2ray_VMess_level", translate("User Level")) v2ray_VMess_level.default = 1 -v2ray_VMess_level:depends("server_type", "V2ray") +v2ray_VMess_level:depends("type", "V2ray") v2ray_stream_security = s:option(ListValue, "v2ray_stream_security", translate("Transport Layer Encryption"), @@ -194,7 +186,7 @@ v2ray_stream_security = s:option(ListValue, "v2ray_stream_security", 'Whether or not transport layer encryption is enabled, the supported options are "none" for unencrypted (default) and "TLS" for using TLS.')) v2ray_stream_security:value("none", "none") v2ray_stream_security:value("tls", "tls") -v2ray_stream_security:depends("server_type", "V2ray") +v2ray_stream_security:depends("type", "V2ray") -- [[ TLS部分 ]] -- tls_serverName = s:option(Value, "tls_serverName", translate("Domain")) @@ -214,7 +206,7 @@ v2ray_transport:value("ws", "WebSocket") v2ray_transport:value("h2", "HTTP/2") v2ray_transport:value("ds", "DomainSocket") v2ray_transport:value("quic", "QUIC") -v2ray_transport:depends("server_type", "V2ray") +v2ray_transport:depends("type", "V2ray") -- [[ TCP部分 ]]-- @@ -311,35 +303,75 @@ v2ray_quic_guise:depends("v2ray_transport", "quic") -- [[ 其它 ]]-- v2ray_mux = s:option(Flag, "v2ray_mux", translate("Mux")) -v2ray_mux:depends("server_type", "V2ray") +v2ray_mux:depends("type", "V2ray") v2ray_mux_concurrency = s:option(Value, "v2ray_mux_concurrency", translate("Mux Concurrency")) v2ray_mux_concurrency.default = 8 v2ray_mux_concurrency:depends("v2ray_mux", "1") +-- [[ 当作为TCP节点时，是否同时开启socks代理 ]] +v2ray_tcp_socks = s:option(Flag, "v2ray_tcp_socks", translate("TCP Open Socks"), + translate( + "When using this TCP node, whether to open the socks proxy at the same time")) +v2ray_tcp_socks.default = 0 +v2ray_tcp_socks:depends("type", "V2ray") + +v2ray_tcp_socks_port = s:option(Value, "v2ray_tcp_socks_port", + "Socks5 " .. translate("Port"), + translate("Do not conflict with other ports")) +v2ray_tcp_socks_port.datatype = "port" +v2ray_tcp_socks_port.default = 1080 +v2ray_tcp_socks_port:depends("v2ray_tcp_socks", "1") + +v2ray_tcp_socks_auth = s:option(ListValue, "v2ray_tcp_socks_auth", + translate("Socks for authentication"), + translate( + 'Socks protocol authentication, support anonymous and password.')) +v2ray_tcp_socks_auth:value("noauth", translate("anonymous")) +v2ray_tcp_socks_auth:value("password", translate("User Password")) +v2ray_tcp_socks_auth:depends("v2ray_tcp_socks", "1") + +v2ray_tcp_socks_auth_username = s:option(Value, "v2ray_tcp_socks_auth_username", + "Socks5 " .. translate("Username")) +v2ray_tcp_socks_auth_username:depends("v2ray_tcp_socks_auth", "password") + +v2ray_tcp_socks_auth_password = s:option(Value, "v2ray_tcp_socks_auth_password", + "Socks5 " .. translate("Password")) +v2ray_tcp_socks_auth_password:depends("v2ray_tcp_socks_auth", "password") + +-- [[ Trojan Cert ]]-- +trojan_verify_cert = s:option(Flag, "trojan_verify_cert", + translate("Trojan Verify Cert")) +trojan_verify_cert:depends("type", "Trojan") + +trojan_cert_path = s:option(Value, "trojan_cert_path", + translate("Trojan Cert Path")) +trojan_cert_path.default = "" +trojan_cert_path:depends("trojan_verify_cert", "1") + -- v2ray_insecure = s:option(Flag, "v2ray_insecure", translate("allowInsecure")) --- v2ray_insecure:depends("server_type", "V2ray") +-- v2ray_insecure:depends("type", "V2ray") function rmempty_restore() password.rmempty = true timeout.rmempty = true - fast_open.rmempty = true + tcp_fast_open.rmempty = true v2ray_protocol.rmempty = true v2ray_VMess_id.rmempty = true v2ray_VMess_alterId.rmempty = true end -server_type.validate = function(self, value) +type.validate = function(self, value) rmempty_restore() if value == "SS" then password.rmempty = false timeout.rmempty = false - fast_open.rmempty = false + tcp_fast_open.rmempty = false elseif value == "SSR" then password.rmempty = false timeout.rmempty = false - fast_open.rmempty = false + tcp_fast_open.rmempty = false elseif value == "V2ray" then v2ray_protocol.rmempty = false v2ray_VMess_id.rmempty = false @@ -348,7 +380,7 @@ server_type.validate = function(self, value) password.rmempty = false elseif value == "Trojan" then password.rmempty = false - fast_open.rmempty = false + tcp_fast_open.rmempty = false end return value end diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_list.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_list.lua new file mode 100644 index 0000000000..9e79332035 --- /dev/null +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_list.lua @@ -0,0 +1,99 @@ +local d = require "luci.dispatcher" +local fs = require "nixio.fs" +local sys = require "luci.sys" +local uci = require"luci.model.uci".cursor() +local api = require "luci.model.cbi.passwall.api.api" +local appname = "passwall" + +m = Map(appname) + +-- [[ Other Settings ]]-- +s = m:section(TypedSection, "global_other") +s.anonymous = true + +---- Auto Ping +o = s:option(Flag, "auto_ping", translate("Auto Ping"), + translate("This will automatically ping the node for latency")) +o.default = 0 + +-- [[ Add the node via the link ]]-- +s:append(Template("passwall/node_list/link_add_node")) + +-- [[ Node List ]]-- +s = m:section(TypedSection, "nodes") +s.anonymous = true +s.sortable = true +s.addremove = true +s.template = "cbi/tblsection" +s.extedit = d.build_url("admin", "vpn", "passwall", "node_config", "%s") +function s.create(e, t) + local e = TypedSection.create(e, t) + luci.http + .redirect(d.build_url("admin", "vpn", "passwall", "node_config", e)) +end + +function s.remove(t, a) + s.map.proceed = true + s.map:del(a) + luci.http.redirect(d.build_url("admin", "vpn", "passwall", "node_list")) +end + +---- Remarks +o = s:option(DummyValue, "remarks", translate("Remarks")) + +---- Add Mode +o = s:option(DummyValue, "add_mode", translate("Add Mode")) +o.cfgvalue = function(t, n) + local v = Value.cfgvalue(t, n) + if v and v ~= '' then + return v + else + return '手动' + end + return str +end + +---- Type +o = s:option(DummyValue, "type", translate("Type")) + +---- Address +o = s:option(DummyValue, "address", translate("Address")) + +---- Port +o = s:option(DummyValue, "port", translate("Port")) + +---- Encrypt Method +--[[ o = s:option(DummyValue, "encrypt_method", translate("Encrypt Method")) +o.width = "15%" +o.cfgvalue = function(t, n) + local str = "无" + local type = api.uci_get_type_id(n, "type") or "" + if type == "SSR" then + return api.uci_get_type_id(n, "ssr_encrypt_method") + elseif type == "SS" then + return api.uci_get_type_id(n, "ss_encrypt_method") + elseif type == "V2ray" then + return api.uci_get_type_id(n, "v2ray_security") + end + return str +end--]] + +---- Ping +o = s:option(DummyValue, "address", translate("Ping")) +if api.uci_get_type("global_other", "auto_ping") == "0" then + o.template = "passwall/node_list/ping" +else + o.template = "passwall/node_list/auto_ping" +end + +---- Apply +o = s:option(DummyValue, "apply", translate("Apply")) +o.template = "passwall/node_list/apply" + +m:append(Template("passwall/node_list/node_list")) + +if luci.http.formvalue("cbi.apply") then + luci.http.redirect(d.build_url("admin", "vpn", "passwall", "node_list")) +end + +return m diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/other.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/other.lua index cb95dafb46..f579d8092f 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/other.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/other.lua @@ -95,7 +95,9 @@ o:value("210.2.4.8", "210.2.4.8(CNNIC DNS2)") o:value("180.76.76.76", "180.76.76.76(" .. translate("Baidu") .. "DNS)") ---- DNS Export Of Multi WAN -o = s:option(ListValue, "dns_port", translate("DNS Export Of Multi WAN")) +o = s:option(ListValue, "dns_port", translate("DNS Export Of Multi WAN"), + translate( + "Only support Multi Wan. If no effect, please go to mwan3 to set.")) o.rmempty = false o.default = 0 o:value(0, translate("Auto")) @@ -109,8 +111,10 @@ for _, iface in ipairs(ifaces) do end end ----- Designated Export for Client -o = s:option(ListValue, "wan_port", translate("Designated Export for Client")) +---- Node Export Of Multi WAN +o = s:option(ListValue, "wan_port", translate("Node Export Of Multi WAN"), + translate( + "Only support Multi Wan. If no effect, please go to mwan3 to set.")) o.default = 0 o.rmempty = false o:value(0, translate("Auto")) @@ -200,11 +204,10 @@ s = m:section(TypedSection, "global_other", translate("Other Settings")) s.anonymous = true s.addremove = false ----- TCP Servers Number Option -o = s:option(ListValue, "tcp_redir_server_num", - translate("TCP Redir Server Number"), +---- TCP Node Number Option +o = s:option(ListValue, "tcp_node_num", "TCP" .. translate("Node Number"), translatef( - "You can only set up a maximum of %s servers for the time being", + "You can only set up a maximum of %s nodes for the time being", "3")) o.default = "1" o.rmempty = false @@ -212,11 +215,10 @@ o:value("1") o:value("2") o:value("3") ----- UDP Servers Number Option -o = s:option(ListValue, "udp_redir_server_num", - translate("UDP Redir Server Number"), +---- UDP Node Number Option +o = s:option(ListValue, "udp_node_num", "UDP" .. translate("Node Number"), translatef( - "You can only set up a maximum of %s servers for the time being", + "You can only set up a maximum of %s nodes for the time being", "3")) o.default = "1" o.rmempty = false @@ -224,11 +226,10 @@ o:value("1") o:value("2") o:value("3") ----- Socks5 Servers Number Option -o = s:option(ListValue, "socks5_proxy_server_num", - translate("Socks5 Proxy Server Number"), +---- Socks5 Node Number Option +o = s:option(ListValue, "socks5_node_num", "Socks5" .. translate("Node Number"), translatef( - "You can only set up a maximum of %s servers for the time being", + "You can only set up a maximum of %s nodes for the time being", "5")) o.default = "1" o.rmempty = false @@ -238,6 +239,11 @@ o:value("3") o:value("4") o:value("5") +---- 状态使用大图标 +o = s:option(Flag, "status_use_big_icon", translate("Status Use Big Icon")) +o.default = "0" +o.rmempty = false + ---- Hide Menu o = s:option(Button, "hide", translate("Hide Menu"), translate( "After the hidden to the display, type in the address bar enter the admin/vpn/passwall/show, such as: http://192.168.1.1/cgi-bin/luci/admin/vpn/passwall/show")) diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua index 29bd354e6b..de736c4e86 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua @@ -27,50 +27,14 @@ for e = 0, 23 do o:value(e, e .. translate("oclock")) end o.default = 0 o:depends("auto_update", 1) --- [[ V2ray Settings ]]-- -s = m:section(TypedSection, "global_app", translate("App Update"), - translate("Please confirm that your firmware supports FPU.")) -s.anonymous = true -s:append(Template("passwall/rule/v2ray_version")) -s:append(Template("passwall/rule/kcptun_version")) -s:append(Template("passwall/rule/brook_version")) - ----- V2ray client path -o = s:option(Value, "v2ray_client_file", translate("V2ray client path"), - translate( - "if you want to run from memory, change the path, such as /tmp/v2ray/, Then save the application and update it manually.")) -o.default = "/usr/bin/v2ray/" -o.rmempty = false - ----- Kcptun client path -o = s:option(Value, "kcptun_client_file", translate("Kcptun client path"), - translate( - "if you want to run from memory, change the path, such as /tmp/kcptun-client, Then save the application and update it manually.")) -o.default = "/usr/bin/kcptun-client" -o.rmempty = false - ---[[ -o = s:option(Button, "_check_kcptun", translate("Manually update"), translate("Make sure there is enough space to install Kcptun")) -o.template = "passwall/kcptun" -o.inputstyle = "apply" -o.btnclick = "onBtnClick_kcptun(this);" -o.id = "_kcptun-check_btn"]] -- - ----- Brook client path -o = s:option(Value, "brook_client_file", translate("Brook client path"), - translate( - "if you want to run from memory, change the path, such as /tmp/brook, Then save the application and update it manually.")) -o.default = "/usr/bin/brook" -o.rmempty = false - -- [[ Subscribe Settings ]]-- -s = m:section(TypedSection, "global_subscribe", translate("Server Subscribe")) +s = m:section(TypedSection, "global_subscribe", translate("Node Subscribe")) s.anonymous = true ---- Subscribe URL o = s:option(DynamicList, "subscribe_url", translate("Subscribe URL"), translate( - "Servers unsubscribed will be deleted in next update; Please summit the Subscribe URL first before manually update.")) + "Please input the subscription url first, save and submit before updating. If you subscribe to update, it is recommended to delete all subscriptions and then re-subscribe.")) ---- Subscribe Manually update o = s:option(Button, "_update", translate("Manually update")) @@ -83,7 +47,7 @@ function o.write(e, e) end ---- Subscribe Delete All -o = s:option(Button, "_stop", translate("Delete All Subscribe")) +o = s:option(Button, "_stop", translate("Delete All Subscribe Node")) o.inputstyle = "remove" function o.write(e, e) luci.sys.call( @@ -117,4 +81,38 @@ for e = 0, 23 do o:value(e, e .. translate("oclock")) end o.default = 0 o:depends("auto_update_subscribe", 1) +-- [[ App Settings ]]-- +s = m:section(TypedSection, "global_app", translate("App Update"), + translate("Please confirm that your firmware supports FPU.")) +s.anonymous = true +s:append(Template("passwall/rule/v2ray_version")) +s:append(Template("passwall/rule/kcptun_version")) +s:append(Template("passwall/rule/brook_version")) + +---- V2ray Path +o = s:option(Value, "v2ray_file", translate("V2ray Path"), translate( + "if you want to run from memory, change the path, such as /tmp/v2ray/, Then save the application and update it manually.")) +o.default = "/usr/bin/v2ray/" +o.rmempty = false + +---- Kcptun client Path +o = s:option(Value, "kcptun_client_file", translate("Kcptun Client Path"), + translate( + "if you want to run from memory, change the path, such as /tmp/kcptun-client, Then save the application and update it manually.")) +o.default = "/usr/bin/kcptun-client" +o.rmempty = false + +--[[ +o = s:option(Button, "_check_kcptun", translate("Manually update"), translate("Make sure there is enough space to install Kcptun")) +o.template = "passwall/kcptun" +o.inputstyle = "apply" +o.btnclick = "onBtnClick_kcptun(this);" +o.id = "_kcptun-check_btn"]] -- + +---- Brook Path +o = s:option(Value, "brook_file", translate("Brook Path"), translate( + "if you want to run from memory, change the path, such as /tmp/brook, Then save the application and update it manually.")) +o.default = "/usr/bin/brook" +o.rmempty = false + return m diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rulelist.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule_list.lua similarity index 100% rename from package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rulelist.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule_list.lua diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server_list.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server_list.lua deleted file mode 100644 index 3c9282eba8..0000000000 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server_list.lua +++ /dev/null @@ -1,92 +0,0 @@ -local d = require "luci.dispatcher" -local fs = require "nixio.fs" -local sys = require "luci.sys" -local uci = require "luci.model.uci".cursor() -local appname = "passwall" - -m = Map(appname) - --- [[ Other Settings ]]-- -s = m:section(TypedSection, "global_other") -s.anonymous = true - ----- Auto Ping -o = s:option(Flag, "auto_ping", translate("Auto Ping"), - translate("This will automatically ping the server for latency")) -o.default = 0 - --- [[ Add the server via the link ]]-- -s:append(Template("passwall/server_list/link_add_server")) - --- [[ Servers List ]]-- -s = m:section(TypedSection, "servers") -s.anonymous = true -s.sortable = true -s.addremove = true -s.template = "cbi/tblsection" -s.extedit = d.build_url("admin", "vpn", "passwall", "serverconfig", "%s") -function s.create(e, t) - local e = TypedSection.create(e, t) - luci.http.redirect( - d.build_url("admin", "vpn", "passwall", "serverconfig", e)) -end - -function s.remove(t, a) - s.map.proceed = true - s.map:del(a) - luci.http.redirect(d.build_url("admin", "vpn", "passwall", "server_list")) -end - ----- Node Remarks -o = s:option(DummyValue, "remarks", translate("Node Remarks")) -o.width = "20%" - ----- Server Type -o = s:option(DummyValue, "server_type", translate("Server Type")) -o.width = "10%" - ----- Server Address -o = s:option(DummyValue, "server", translate("Server Address")) -o.width = "15%" - ----- Server Port -o = s:option(DummyValue, "server_port", translate("Server Port")) -o.width = "10%" - ----- Encrypt Method ---[[o = s:option(DummyValue, "encrypt_method", translate("Encrypt Method")) -o.width="15%" -o.cfgvalue=function(t, n) -local str="无" -local type = m.uci:get(appname, n, "server_type") or "" -if type == "SSR" then - return m.uci:get(appname, n, "ssr_encrypt_method") -elseif type == "SS" then - return m.uci:get(appname, n, "ss_encrypt_method") -elseif type == "V2ray" then - return m.uci:get(appname, n, "v2ray_security") -end -return str -end--]] - ----- Ping -o = s:option(DummyValue, "server", translate("Ping")) -if uci:get(appname, "@global_other[0]", "auto_ping") == "0" then - o.template = "passwall/server_list/ping" -else - o.template = "passwall/server_list/auto_ping" -end -o.width = "10%" - ----- Apply -o = s:option(DummyValue, "apply", translate("Apply")) -o.width = "15%" -o.template = "passwall/server_list/apply" - -m:append(Template("passwall/server_list/server_list")) - -if luci.http.formvalue("cbi.apply") then - luci.http.redirect(d.build_url("admin", "vpn", "passwall", "server_list")) -end - -return m diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status.htm index 25a10410fd..39a4bb94df 100644 --- a/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status.htm +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status.htm @@ -1,6 +1,8 @@ <% +local api = require "luci.model.cbi.passwall.api.api" local dsp = require "luci.dispatcher" local ipkg = require "luci.model.ipkg" + local function is_finded(e) local result=luci.sys.exec("find /usr/*bin -iname "..e.." -type f") if result~="" then @@ -9,258 +11,398 @@ local function is_finded(e) return false end -local function has_udp_relay() - return luci.sys.call("lsmod | grep TPROXY >/dev/null") == 0 -end - -local tcp_redir_server_num = luci.sys.exec("echo -n `uci get passwall.@global_other[0].tcp_redir_server_num`") -local udp_redir_server_num = luci.sys.exec("echo -n `uci get passwall.@global_other[0].udp_redir_server_num`") -local socks5_proxy_num = luci.sys.exec("echo -n `uci get passwall.@global_other[0].socks5_proxy_server_num`") +local tcp_node_num = api.uci_get_type("global_other", "tcp_node_num") +local udp_node_num = api.uci_get_type("global_other", "udp_node_num") +local socks5_node_num = api.uci_get_type("global_other", "socks5_node_num") -%>
<%:Running Status%> -
- <% if tcp_redir_server_num and tonumber(tcp_redir_server_num) >= 1 then %> - <% for i = 1, tcp_redir_server_num, 1 do %> -
- -
- <%:Collecting data...%> -
-
- <% end %> - <% end %> - - <% if has_udp_relay() then %> - <% if udp_redir_server_num and tonumber(udp_redir_server_num) >= 1 then %> - <% for i = 1, udp_redir_server_num, 1 do %> -
- -
- <%:Collecting data...%> +
+
+
+
+

TCP
<%:NOT RUNNING%>

+
+
+
+
-
- <% end %> - <% end %> - <% end %> - - <% if socks5_proxy_num and tonumber(socks5_proxy_num) >= 1 then %> - <% for i = 1, socks5_proxy_num, 1 do %> -
- -
- <%:Collecting data...%> -
-
- <% end %> - <% end %> - -
- -
- <%:Collecting data...%> -
-
+
+
+
+
+
+
+
+

UDP
<%:NOT RUNNING%>

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

SOCKS5
<%:NOT RUNNING%>

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

DNS
<%:NOT RUNNING%>

+
+
+
+ +
+
+
+
<% if ipkg.installed("haproxy") or is_finded("haproxy*") then %> -
- -
- <%:Collecting data...%> -
-
+
+
+
+

<%:Load Balancing%>
<%:NOT RUNNING%>

+
+
+
+ +
+
+
+
<% end %> <% if ipkg.installed("kcptun") or is_finded("kcptun*") then %> -
- -
- <%:Collecting data...%> -
-
+
+
+
+

KcpTun
<%:NOT RUNNING%>

+
+
+
+ +
+
+
+
<% end %> -
- -
- - -
-
-
- -
- - -
-
-
- -
- - - -
-
-
- -
- -
-
-
-
- - \ No newline at end of file + function clear_check_port(btn) { + btn.style.display = 'none'; + var s = document.getElementById('_check_nodes_status'); + s.innerHTML = "<%:Touch Check%>"; + return false; + } +//]]> + + \ No newline at end of file diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status2.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status2.htm new file mode 100644 index 0000000000..43768a9877 --- /dev/null +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status2.htm @@ -0,0 +1,260 @@ +<% +local api = require "luci.model.cbi.passwall.api.api" +local dsp = require "luci.dispatcher" +local ipkg = require "luci.model.ipkg" + +local function is_finded(e) + local result=luci.sys.exec("find /usr/*bin -iname "..e.." -type f") + if result~="" then + return true + end + return false +end + +local tcp_node_num = api.uci_get_type("global_other", "tcp_node_num") +local udp_node_num = api.uci_get_type("global_other", "udp_node_num") +local socks5_node_num = api.uci_get_type("global_other", "socks5_node_num") +-%> + + + +
+ + <%:Running Status%> + +
+ <% if tcp_node_num and tonumber(tcp_node_num) >= 1 then %> + <% for i = 1, tcp_node_num, 1 do %> +
+ +
+ <%:Collecting data...%> +
+
+ <% end %> + <% end %> + + <% if udp_node_num and tonumber(udp_node_num) >= 1 then %> + <% for i = 1, udp_node_num, 1 do %> +
+ +
+ <%:Collecting data...%> +
+
+ <% end %> + <% end %> + + <% if socks5_node_num and tonumber(socks5_node_num) >= 1 then %> + <% for i = 1, socks5_node_num, 1 do %> +
+ +
+ <%:Collecting data...%> +
+
+ <% end %> + <% end %> + +
+ +
+ <%:Collecting data...%> +
+
+ <% if ipkg.installed("haproxy") or is_finded("haproxy*") then %> +
+ +
+ <%:Collecting data...%> +
+
+ <% end %> + <% if ipkg.installed("kcptun") or is_finded("kcptun*") then %> +
+ +
+ <%:Collecting data...%> +
+
+ <% end %> +
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/apply.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/apply.htm new file mode 100644 index 0000000000..92e773669a --- /dev/null +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/apply.htm @@ -0,0 +1,3 @@ +<%+cbi/valueheader%> + +<%+cbi/valuefooter%> \ No newline at end of file diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/auto_ping.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/auto_ping.htm similarity index 100% rename from package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/auto_ping.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/auto_ping.htm diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/link_add_server.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm similarity index 57% rename from package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/link_add_server.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm index e3d36aaec1..093382c587 100644 --- a/package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/link_add_server.htm +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm @@ -6,7 +6,7 @@ local dsp = require "luci.dispatcher" -%> + + + +
+
+ <% if tcp_node_num and tonumber(tcp_node_num) >= 1 then %> + <% for i = 1, tcp_node_num, 1 do %> + + <% end %> + <% end %> + + <% if udp_node_num and tonumber(udp_node_num) >= 1 then %> + <% for i = 1, udp_node_num, 1 do %> + + <% end %> + <% end %> + + <% if socks5_node_num and tonumber(socks5_node_num) >= 1 then %> + <% for i = 1, socks5_node_num, 1 do %> + + <% end %> + <% end %> + +
+
\ No newline at end of file diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/ping.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/ping.htm similarity index 55% rename from package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/ping.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/ping.htm index 9a756f964c..4edda6e4c3 100644 --- a/package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/ping.htm +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/ping.htm @@ -6,6 +6,6 @@ <%+cbi/valueheader%> - Ping + Ping <%+cbi/valuefooter%> diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm index 006e2f9b69..9a61a85801 100644 --- a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm @@ -1,7 +1,9 @@ <% -local brook_path = luci.sys.exec("echo -n `uci get passwall.@global_app[0].brook_client_file`") -local brook_version = luci.sys.exec("[ -f '" .. brook_path .. "' ] && " .. brook_path .. " -v | awk '{print $3}'") +local api = require "luci.model.cbi.passwall.api.api" local dsp = require "luci.dispatcher" + +local brook_path = api.uci_get_type("global_app", "brook_file") +local brook_version = luci.sys.exec("[ -f '" .. brook_path .. "' ] && " .. brook_path .. " -v | awk '{print $3}'") -%> \ No newline at end of file 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 f41c135d47..0cde04aaff 100644 --- a/package/lienol/luci-app-passwall/po/zh-cn/passwall.po +++ b/package/lienol/luci-app-passwall/po/zh-cn/passwall.po @@ -34,6 +34,12 @@ msgstr "连接正常" msgid "Problem detected!" msgstr "连接失败" +msgid "Touch Check" +msgstr "点我检测" + +msgid "Kernel Unsupported" +msgstr "内核不支持" + msgid "Use IPv6" msgstr "使用IPv6" @@ -46,11 +52,14 @@ msgstr "TCP服务器" msgid "UDP Server" msgstr "UDP服务器" +msgid "Global Settings" +msgstr "全局设置" + msgid "Basic Settings" msgstr "基本设置" -msgid "Server List" -msgstr "服务端列表" +msgid "Node List" +msgstr "节点列表" msgid "Other Settings" msgstr "高级设置" @@ -73,15 +82,12 @@ msgstr "白名单设置" msgid "Watch Logs" msgstr "查看日志" -msgid "ShadowSocks Server Config" -msgstr "服务器配置" +msgid "Node Config" +msgstr "节点配置" msgid "Running Status" msgstr "运行状态" -msgid "Kcptun Client" -msgstr "Kcptun客户端" - msgid "Baidu Connection" msgstr "百度连接" @@ -100,29 +106,17 @@ msgstr "清除" msgid "Global Setting" msgstr "全局配置" -msgid "TCP Redir Server" -msgstr "TCP转发服务器" +msgid "TCP Node" +msgstr "TCP节点" -msgid "UDP Redir Server" -msgstr "UDP转发服务器" +msgid "UDP Node" +msgstr "UDP节点" -msgid "Same as the tcp redir server" -msgstr "与TCP转发服务器相同" +msgid "Socks5 Node" +msgstr "Socks5节点" -msgid "Start the TCP redir" -msgstr "TCP转发" - -msgid "Start the UDP redir" -msgstr "UDP转发" - -msgid "Start the Socks5 Proxy" -msgstr "Socks5代理" - -msgid "The client can use the router's Socks5 proxy" -msgstr "客户端可以使用路由器的Socks5代理" - -msgid "Socks5 Proxy Server" -msgstr "Socks5代理服务器" +msgid "Same as the tcp node" +msgstr "与TCP节点相同" msgid "For used to surf the Internet." msgstr "用于科学上网。" @@ -133,6 +127,9 @@ msgstr "用于游戏模式或DNS解析等。" msgid "The selected server will not use Kcptun." msgstr "选中的服务器不会使用Kcptun。" +msgid "The client can use the router's Socks5 proxy" +msgstr "客户端可以使用路由器的Socks5代理" + msgid "Use Local 7913 Port" msgstr "使用本机7913端口" @@ -199,11 +196,11 @@ msgstr "本机" msgid "Danger" msgstr "危险" -msgid "Add Server" -msgstr "添加服务器" +msgid "Add Node" +msgstr "添加节点" -msgid "Add the server via the link" -msgstr "通过链接添加服务器" +msgid "Add the node via the link" +msgstr "通过链接添加节点" msgid "Please Enter The SS/SSR/V2ray Link" msgstr "请输入SS/SSR/V2ray链接" @@ -220,23 +217,26 @@ msgstr "服务器吗？" msgid "The server client can also use this rule to scientifically surf the Internet" msgstr "本机服务器的客户端也可以使用这个代理模式上网" -msgid "Servers List" -msgstr "服务器列表" - msgid "Node Remarks" msgstr "节点备注" -msgid "Server Type" +msgid "Add Mode" +msgstr "添加方式" + +msgid "Type" msgstr "类型" -msgid "Server Address" +msgid "Address" msgstr "地址" -msgid "Server Address (Support Domain Name)" +msgid "Address (Support Domain Name)" msgstr "地址（支持域名）" -msgid "Server Port" -msgstr "端口" +msgid "Trojan Verify Cert" +msgstr "验证证书" + +msgid "Trojan Cert Path" +msgstr "证书路径" msgid "Encrypt Method" msgstr "加密" @@ -253,12 +253,15 @@ msgstr "Ping值" msgid "Auto Ping" msgstr "自动Ping" -msgid "This will automatically ping the server for latency" -msgstr "选中后保存应用后刷新即可自动Ping服务器" +msgid "This will automatically ping the node for latency" +msgstr "选中后保存应用后刷新即可自动Ping节点" msgid "Apply" msgstr "应用" +msgid "Use" +msgstr "使用" + msgid "DNS Settings" msgstr "DNS配置" @@ -283,18 +286,21 @@ msgstr "百度" msgid "DNS Export Of Multi WAN" msgstr "国内DNS指定解析出口" +msgid "Node Export Of Multi WAN" +msgstr "节点指定出口" + +msgid "Only support Multi Wan. If no effect, please go to mwan3 to set." +msgstr "只有多线接入才有效，如果设置后还是无效，请到mwan3设置。" + msgid "Not Specify" msgstr "不指定" msgid "DNS Hijack" -msgstr "接管局域网DNS解析" +msgstr "DNS劫持" msgid "If the GFW mode cannot be used normally, please enable it" msgstr "如果GFW模式不能正常使用，请启用" -msgid "Designated Export for Client" -msgstr "客户端指定出口" - msgid "Delay Settings" msgstr "定时配置" @@ -326,10 +332,10 @@ msgid "Forwarding Settings" msgstr "转发配置" msgid "TCP Redir Ports" -msgstr "TCP代理转发端口" +msgstr "TCP转发端口" msgid "UDP Redir Ports" -msgstr "UDP代理转发端口" +msgstr "UDP转发端口" msgid "All" msgstr "所有" @@ -367,9 +373,6 @@ msgstr "自定义Dnsmasq设置" msgid "Setting a parameter error will cause dnsmasq fail to start." msgstr "参数设置错误将会导致Dnsmasq无法启动。" -msgid "Click here to setting your Load Balancing" -msgstr "点击这里查看负载均衡设置教程。" - msgid "Auto Switch" msgstr "自动切换" @@ -388,50 +391,53 @@ msgstr "备用TCP转发服务器的列表" msgid "Load Balancing Setting" msgstr "负载均衡设置" -msgid "Enable or Disable Load Balancing" -msgstr "开启或关闭负载均衡" +msgid "Click here to setting your Load Balancing" +msgstr "点击这里查看负载均衡设置教程。" -msgid "Haproxy port setting" -msgstr "负载均衡服务器端口" +msgid "Enable Load Balancing" +msgstr "开启负载均衡" -msgid "Admin Status" -msgstr "负载均衡控制台" +msgid "Console Username" +msgstr "控制台账号" + +msgid "Console Password" +msgstr "控制台密码" + +msgid "Console Port" +msgstr "控制台端口" msgid "In the browser input routing IP plus port access, such as:192.168.1.1:1188" msgstr "在浏览器输入路由IP加端口访问，如：192.168.1.1:1188" -msgid "Enable Admin Status" -msgstr "开启控制台" +msgid "Haproxy Port" +msgstr "负载均衡端口" -msgid "Admin Status port setting" -msgstr "控制台端口" +msgid "Load Balancing Setting" +msgstr "负载均衡设置" -msgid "Admin Status User" -msgstr "登陆用户名" +msgid "Add a node, Export Of Multi WAN Only support Multi Wan. If no effect, please go to mwan3 to set. Load specific gravity range 1-256. Multiple primary servers can be load balanced, standby will only be enabled when the primary server is offline!" +msgstr "添加节点，指定出口功能是为多WAN用户准备的，如果设置后还是无效，请到mwan3设置。负载比重范围1-256。多个主服务器可以负载均衡，备用只有在主服务器离线时才会启用！" -msgid "Admin Status Password" -msgstr "登陆密码" +msgid "Node Address" +msgstr "节点地址" -msgid "Load Balancing Server Setting" -msgstr "负载均衡服务器设置" +msgid "Node Port" +msgstr "节点端口" -msgid "Add a load balancing server, note reading above requirements." -msgstr "添加负载均衡服务器，指定出口功能是为多WAN用户准备的。负载比重范围1-256。多个主服务器可以负载均衡，备服务器只有在主服务器离线时才会启用！" - -msgid "Server weight" +msgid "Node Weight" msgstr "负载比重" msgid "Export Of Multi WAN" msgstr "多WAN指定出口" -msgid "Server Mode" -msgstr "服务器模式" +msgid "Mode" +msgstr "模式" -msgid "Primary Server" -msgstr "主服务器" +msgid "Primary" +msgstr "主要" -msgid "Standby Server" -msgstr "备服务器" +msgid "Standby" +msgstr "备用" msgid "Manually update" msgstr "手动更新" @@ -496,13 +502,13 @@ msgstr "更新主程序" msgid "Please confirm that your firmware supports FPU." msgstr "请确认你的固件支持FPU。" -msgid "V2ray client path" -msgstr "V2ray客户端路径" +msgid "V2ray Path" +msgstr "V2ray路径" msgid "if you want to run from memory, change the path, such as /tmp/v2ray/, Then save the application and update it manually." msgstr "如果你希望从内存中运行，请更改路径，例如/tmp/v2ray/，然后保存应用后，再手动更新。" -msgid "Kcptun client path" +msgid "Kcptun Client Path" msgstr "Kcptun客户端路径" msgid "if you want to run from memory, change the path, such as /tmp/kcptun-client, Then save the application and update it manually." @@ -511,23 +517,23 @@ msgstr "如果你希望从内存中运行，请更改路径，例如/tmp/kcptun- msgid "Make sure there is enough space to install Kcptun" msgstr "确保有足够的空间安装Kcptun" -msgid "Brook client path" -msgstr "Brook客户端路径" +msgid "Brook Path" +msgstr "Brook路径" msgid "if you want to run from memory, change the path, such as /tmp/brook, Then save the application and update it manually." msgstr "如果你希望从内存中运行，请更改路径，例如/tmp/brook，然后保存应用后，再手动更新。" -msgid "Server Subscribe" -msgstr "服务器订阅" +msgid "Node Subscribe" +msgstr "节点订阅" msgid "Subscribe URL" msgstr "订阅网址" -msgid "Servers unsubscribed will be deleted in next update; Please summit the Subscribe URL first before manually update." -msgstr "取消订阅的服务器将在下次更新时删除，请先输入订阅网址保存提交之后再更新。" +msgid "Please input the subscription url first, save and submit before updating. If you subscribe to update, it is recommended to delete all subscriptions and then re-subscribe." +msgstr "请输入订阅网址保存应用后再更新，如果订阅节点更新了，建议删除所有订阅，然后重新订阅。" -msgid "Delete All Subscribe" -msgstr "删除所有订阅" +msgid "Delete All Subscribe Node" +msgstr "删除所有订阅节点" msgid "Subscribe via proxy" msgstr "通过代理订阅" @@ -541,17 +547,11 @@ msgstr "添加" msgid "ACLs" msgstr "访问控制" -msgid "ACLs is a tools which used to designate specific IP proxy mode" +msgid "ACLs is a tools which used to designate specific IP proxy mode, IP or MAC address can be entered." msgstr "访问控制列表是用于指定特殊IP代理模式的工具。IP、MAC地址可只填写一项。" -msgid "ACL Remarks" -msgstr "主机备注" - -msgid "IP Address" -msgstr "内部IP地址" - -msgid "MAC Address" -msgstr "MAC地址" +msgid "Remarks" +msgstr "备注" msgid "Set Blacklist And Whitelist" msgstr "黑白名单" @@ -592,8 +592,8 @@ msgstr "这里显示的是最近的日志。" msgid "Clear logs" msgstr "清空日志" -msgid "TCP quick open server does not support do not open." -msgstr "TCP快速打开服务器不支持不要打开。" +msgid "Need node support required" +msgstr "需要节点支持" msgid "HAProxy cannot be used with KCP." msgstr "HAProxy不能和KCP一起使用" @@ -607,9 +607,12 @@ msgstr "连接超时时间" msgid "Local Port" msgstr "本地端口" -msgid "Fast_open" +msgid "TCP Fast Open" msgstr "TCP快速打开" +msgid "Need node support required" +msgstr "需要节点支持" + msgid "Protocol" msgstr "协议名称" @@ -673,6 +676,9 @@ msgstr "传输层加密" msgid "Whether or not transport layer encryption is enabled, the supported options are \"none\" for unencrypted (default) and \"TLS\" for using TLS." msgstr "是否启入传输层加密，支持的选项有 \"none\" 表示不加密（默认值），\"tls\" 表示使用 TLS。" +msgid "Domain" +msgstr "域名" + msgid "Whether unsafe connections are allowed. When checked, V2Ray does not check the validity of the TLS certificate provided by the remote host." msgstr "是否允许不安全连接。当勾选时，V2Ray 不会检查远端主机所提供的 TLS 证书的有效性。" @@ -682,17 +688,35 @@ msgstr "
none：默认值，不进行伪装，发送的数据是没有特征 msgid "A legal file path. This file must not exist before running V2Ray." msgstr "一个合法的文件路径。在运行 V2Ray 之前，这个文件必须不存在。" -msgid "TCP Redir Server Number" -msgstr "TCP转发服务器数量" +msgid "TCP Open Socks" +msgstr "开启Socks" -msgid "UDP Redir Server Number" -msgstr "UDP转发服务器数量" +msgid "When using this TCP node, whether to open the socks proxy at the same time" +msgstr "使用此TCP节点时，是否同时打开socks代理" -msgid "Socks5 Proxy Server Number" -msgstr "Socks5代理服务器数量" +msgid "Do not conflict with other ports" +msgstr "端口不能冲突" -msgid "You can only set up a maximum of %s servers for the time being" -msgstr "目前最多只能设置%s个服务器" +msgid "Socks for authentication" +msgstr "Socks认证方式" + +msgid "Socks protocol authentication, support anonymous and password." +msgstr "Socks 协议的认证方式，支持匿名方式和账号密码方式。" + +msgid "anonymous" +msgstr "匿名" + +msgid "User Password" +msgstr "账号密码" + +msgid "Node Number" +msgstr "节点数量" + +msgid "You can only set up a maximum of %s nodes for the time being" +msgstr "目前最多只能设置%s个节点" + +msgid "Status Use Big Icon" +msgstr "状态信息使用大图标" msgid "Hide Menu" msgstr "隐藏菜单" @@ -729,9 +753,3 @@ msgstr "客户端文件不适合当前设备。" msgid "Can't move new file to path: %s" msgstr "无法移动新文件到：%s" - -msgid "NOT RUNNING" -msgstr "未运行" - -msgid "RUNNING" -msgstr "运行中" \ No newline at end of file diff --git a/package/lienol/luci-app-passwall/root/etc/config/passwall b/package/lienol/luci-app-passwall/root/etc/config/passwall index 415eac9a04..17ac24ab1f 100644 --- a/package/lienol/luci-app-passwall/root/etc/config/passwall +++ b/package/lienol/luci-app-passwall/root/etc/config/passwall @@ -1,15 +1,14 @@ config global - option proxy_mode 'chnroute' + option tcp_node1 'nil' + option udp_node1 'nil' + option socks5_node1 'nil' option dns_mode 'chinadns' option up_chinadns_mode 'OpenDNS_1' - option socks5_proxy_server1 'nil' - option udp_redir_server1 'nil' - option tcp_redir_server1 'nil' + option proxy_mode 'chnroute' option localhost_proxy_mode 'default' config global_haproxy - option admin_enable '0' option balancing_enable '0' config global_delay @@ -27,7 +26,7 @@ config global_dns config global_forwarding option udp_redir_ports '1:65535' - option tcp_redir_ports '1:65535' + option tcp_redir_ports '80,443' option process '1' config global_proxy @@ -39,23 +38,22 @@ config global_proxy config global_other option auto_ping '1' - option tcp_redir_server_num '1' - option udp_redir_server_num '1' - option socks5_proxy_server_num '1' + option tcp_node_num '1' + option udp_node_num '1' + option socks5_node_num '1' + option status_use_big_icon '1' config global_rules + option auto_update '0' option gfwlist_update '1' option chnroute_update '1' - option Pcap_Routing_update '0' - option Pcap_WhiteList_update '0' - option auto_update '0' option chnroute_version '2019-10-18' - option gfwlist_version '2019-11-16' + option gfwlist_version '2019-11-27' config global_app - option v2ray_client_file '/usr/bin/v2ray/' + option v2ray_file '/usr/bin/v2ray/' option kcptun_client_file '/usr/bin/kcptun-client' - option brook_client_file '/usr/bin/brook' + option brook_file '/usr/bin/brook' config global_subscribe option subscribe_by_ss '0' 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 5a574f0b61..3c1abf0f7c 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh @@ -117,35 +117,35 @@ get_not_exists_port_after() { fi } -TCP_REDIR_SERVER_NUM=$(config_t_get global_other tcp_redir_server_num 1) -for i in $(seq 1 $TCP_REDIR_SERVER_NUM); do - eval TCP_REDIR_SERVER$i=$(config_t_get global tcp_redir_server$i nil) +TCP_NODE_NUM=$(config_t_get global_other tcp_node_num 1) +for i in $(seq 1 $TCP_NODE_NUM); do + eval TCP_NODE$i=$(config_t_get global tcp_node$i nil) done -UDP_REDIR_SERVER_NUM=$(config_t_get global_other udp_redir_server_num 1) -for i in $(seq 1 $UDP_REDIR_SERVER_NUM); do - eval UDP_REDIR_SERVER$i=$(config_t_get global udp_redir_server$i nil) +UDP_NODE_NUM=$(config_t_get global_other udp_node_num 1) +for i in $(seq 1 $UDP_NODE_NUM); do + eval UDP_NODE$i=$(config_t_get global udp_node$i nil) done -SOCKS5_PROXY_SERVER_NUM=$(config_t_get global_other socks5_proxy_server_num 1) -for i in $(seq 1 $SOCKS5_PROXY_SERVER_NUM); do - eval SOCKS5_PROXY_SERVER$i=$(config_t_get global socks5_proxy_server$i nil) +SOCKS5_NODE_NUM=$(config_t_get global_other socks5_node_num 1) +for i in $(seq 1 $SOCKS5_NODE_NUM); do + eval SOCKS5_NODE$i=$(config_t_get global socks5_node$i nil) done -[ "$UDP_REDIR_SERVER1" == "default" ] && UDP_REDIR_SERVER1=$TCP_REDIR_SERVER1 +[ "$UDP_NODE1" == "default" ] && UDP_NODE1=$TCP_NODE1 -TCP_REDIR_SERVER1_IP="" -UDP_REDIR_SERVER1_IP="" -SOCKS5_PROXY_SERVER1_IP="" -TCP_REDIR_SERVER1_IPV6="" -UDP_REDIR_SERVER1_IPV6="" -SOCKS5_PROXY_SERVER1_IPV6="" -TCP_REDIR_SERVER1_PORT="" -UDP_REDIR_SERVER1_PORT="" -SOCKS5_PROXY_SERVER1_PORT="" -TCP_REDIR_SERVER1_TYPE="" -UDP_REDIR_SERVER1_TYPE="" -SOCKS5_PROXY_SERVER1_TYPE="" +TCP_NODE1_IP="" +UDP_NODE1_IP="" +SOCKS5_NODE1_IP="" +TCP_NODE1_IPV6="" +UDP_NODE1_IPV6="" +SOCKS5_NODE1_IPV6="" +TCP_NODE1_PORT="" +UDP_NODE1_PORT="" +SOCKS5_NODE1_PORT="" +TCP_NODE1_TYPE="" +UDP_NODE1_TYPE="" +SOCKS5_NODE1_TYPE="" BROOK_SOCKS5_CMD="" BROOK_TCP_CMD="" @@ -157,7 +157,7 @@ KCPTUN_REDIR_PORT=$(config_t_get global_proxy kcptun_port 11183) PROXY_MODE=$(config_t_get global proxy_mode gfwlist) load_config() { - [ "$TCP_REDIR_SERVER1" == "nil" -a "$UDP_REDIR_SERVER1" == "nil" -a "$SOCKS5_PROXY_SERVER1" == "nil" ] && { + [ "$TCP_NODE1" == "nil" -a "$UDP_NODE1" == "nil" -a "$SOCKS5_NODE1" == "nil" ] && { echolog "没有选择服务器！" return 1 } @@ -191,115 +191,115 @@ load_config() { } gen_ss_ssr_config_file() { - local server_type local_port kcptun server configfile - server_type=$1 + local type local_port kcptun node configfile + type=$1 local_port=$2 kcptun=$3 - server=$4 + node=$4 configfile=$5 - local server_port encrypt_method - server_port=$(config_get $server server_port) - encrypt_method=$(config_get $server ss_encrypt_method) - [ "$server_type" == "ssr" ] && encrypt_method=$(config_get $server ssr_encrypt_method) + local port encrypt_method + port=$(config_n_get $node port) + encrypt_method=$(config_n_get $node ss_encrypt_method) + [ "$type" == "ssr" ] && encrypt_method=$(config_n_get $node ssr_encrypt_method) [ "$kcptun" == "1" ] && { server_ip=127.0.0.1 server_host=127.0.0.1 - server_port=$KCPTUN_REDIR_PORT + port=$KCPTUN_REDIR_PORT } cat <<-EOF >$configfile { "server": "$server_host", "_comment": "$server_ip", - "server_port": $server_port, + "server_port": $port, "local_address": "0.0.0.0", "local_port": $local_port, - "password": "$(config_get $server password)", - "timeout": $(config_get $server timeout), + "password": "$(config_n_get $node password)", + "timeout": $(config_n_get $node timeout), "method": "$encrypt_method", - "fast_open": $(config_get $server fast_open), + "fast_open": $(config_n_get $node tcp_fast_open false), "reuse_port": true, EOF [ "$1" == "ssr" ] && { cat <<-EOF >>$configfile - "protocol": "$(config_get $server protocol)", - "protocol_param": "$(config_get $server protocol_param)", - "obfs": "$(config_get $server obfs)", - "obfs_param": "$(config_get $server obfs_param)" + "protocol": "$(config_n_get $node protocol)", + "protocol_param": "$(config_n_get $node protocol_param)", + "obfs": "$(config_n_get $node obfs)", + "obfs_param": "$(config_n_get $node obfs_param)" EOF } echo -e "}" >>$configfile } gen_config_file() { - local server local_port redir_type config_file_path server_host server_ip server_port server_type use_ipv6 network_type - server=$1 + local node local_port redir_type config_file_path server_host server_ip port type use_ipv6 network_type + node=$1 local_port=$2 redir_type=$3 config_file_path=$4 - server_host=$(config_get $server server) - use_ipv6=$(config_get $server use_ipv6) + server_host=$(config_n_get $node address) + use_ipv6=$(config_n_get $node use_ipv6) network_type="ipv4" [ "$use_ipv6" == "1" ] && network_type="ipv6" server_ip=$(get_host_ip $network_type $server_host) - server_port=$(config_get $server server_port) - server_type=$(echo $(config_get $server server_type) | tr 'A-Z' 'a-z') + port=$(config_n_get $node port) + type=$(echo $(config_n_get $node type) | tr 'A-Z' 'a-z') echolog "$redir_type服务器IP地址:$server_ip" if [ "$redir_type" == "Socks5" ]; then if [ "$network_type" == "ipv6" ]; then - SOCKS5_PROXY_SERVER1_IPV6=$server_ip + SOCKS5_NODE1_IPV6=$server_ip else - SOCKS5_PROXY_SERVER1_IP=$server_ip + SOCKS5_NODE1_IP=$server_ip fi - SOCKS5_PROXY_SERVER1_PORT=$server_port - if [ "$server_type" == "ss" -o "$server_type" == "ssr" ]; then - gen_ss_ssr_config_file $server_type $local_port 0 $server $config_file_path - elif [ "$server_type" == "v2ray" ]; then - lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_v2ray_client_config_file.lua $server nil nil $local_port >$config_file_path - elif [ "$server_type" == "brook" ]; then - BROOK_SOCKS5_CMD="client -l 0.0.0.0:$local_port -i 0.0.0.0 -s $server_ip:$server_port -p $(config_get $server password)" - elif [ "$server_type" == "trojan" ]; then - lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_trojan_client_config_file.lua $server client $local_port >$config_file_path + SOCKS5_NODE1_PORT=$port + if [ "$type" == "ss" -o "$type" == "ssr" ]; then + gen_ss_ssr_config_file $type $local_port 0 $node $config_file_path + elif [ "$type" == "v2ray" ]; then + lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_v2ray_client_config_file.lua $node nil nil $local_port >$config_file_path + elif [ "$type" == "brook" ]; then + BROOK_SOCKS5_CMD="client -l 0.0.0.0:$local_port -i 0.0.0.0 -s $server_ip:$port -p $(config_n_get $node password)" + elif [ "$type" == "trojan" ]; then + lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_trojan_client_config_file.lua $node client $local_port >$config_file_path fi fi if [ "$redir_type" == "UDP" ]; then if [ "$network_type" == "ipv6" ]; then - UDP_REDIR_SERVER1_IPV6=$server_ip + UDP_NODE1_IPV6=$server_ip else - UDP_REDIR_SERVER1_IP=$server_ip + UDP_NODE1_IP=$server_ip fi - UDP_REDIR_SERVER1_PORT=$server_port - if [ "$server_type" == "ss" -o "$server_type" == "ssr" ]; then - gen_ss_ssr_config_file $server_type $local_port 0 $server $config_file_path - elif [ "$server_type" == "v2ray" ]; then - lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_v2ray_client_config_file.lua $server udp $local_port nil >$config_file_path - elif [ "$server_type" == "brook" ]; then - BROOK_UDP_CMD="tproxy -l 0.0.0.0:$local_port -s $server_ip:$server_port -p $(config_get $server password)" - elif [ "$server_type" == "trojan" ]; then + UDP_NODE1_PORT=$port + if [ "$type" == "ss" -o "$type" == "ssr" ]; then + gen_ss_ssr_config_file $type $local_port 0 $node $config_file_path + elif [ "$type" == "v2ray" ]; then + lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_v2ray_client_config_file.lua $node udp $local_port nil >$config_file_path + elif [ "$type" == "brook" ]; then + BROOK_UDP_CMD="tproxy -l 0.0.0.0:$local_port -s $server_ip:$port -p $(config_n_get $node password)" + elif [ "$type" == "trojan" ]; then local_port=$(get_not_exists_port_after $SOCKS5_PROXY_PORT1 tcp) socks5_port=$local_port - lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_trojan_client_config_file.lua $server client $socks5_port >$config_file_path + lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_trojan_client_config_file.lua $node client $socks5_port >$config_file_path fi fi if [ "$redir_type" == "TCP" ]; then if [ "$network_type" == "ipv6" ]; then - TCP_REDIR_SERVER1_IPV6=$server_ip + TCP_NODE1_IPV6=$server_ip else - TCP_REDIR_SERVER1_IP=$server_ip + TCP_NODE1_IP=$server_ip fi - TCP_REDIR_SERVER1_PORT=$server_port - if [ "$server_type" == "v2ray" ]; then - lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_v2ray_client_config_file.lua $server tcp $local_port nil >$config_file_path - elif [ "$server_type" == "trojan" ]; then - lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_trojan_client_config_file.lua $server nat $local_port >$config_file_path + TCP_NODE1_PORT=$port + if [ "$type" == "v2ray" ]; then + lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_v2ray_client_config_file.lua $node tcp $local_port nil >$config_file_path + elif [ "$type" == "trojan" ]; then + lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_trojan_client_config_file.lua $node nat $local_port >$config_file_path else local kcptun_use kcptun_server_host kcptun_port kcptun_config - kcptun_use=$(config_get $server use_kcp) - kcptun_server_host=$(config_get $server kcp_server) - kcptun_port=$(config_get $server kcp_port) - kcptun_config=$(config_get $server kcp_opts) + kcptun_use=$(config_n_get $node use_kcp) + kcptun_server_host=$(config_n_get $node kcp_server) + kcptun_port=$(config_n_get $node kcp_port) + kcptun_config=$(config_n_get $node kcp_opts) kcptun_path="" lbenabled=$(config_t_get global_haproxy balancing_enable 0) if [ "$kcptun_use" == "1" ] && ([ -z "$kcptun_port" ] || [ -z "$kcptun_config" ]); then @@ -326,26 +326,26 @@ gen_config_file() { if [ -z "$kcptun_server_host" ]; then start_kcptun "$kcptun_path" $server_ip $kcptun_port "$kcptun_config" else - kcptun_use_ipv6=$(config_get $server kcp_use_ipv6) + kcptun_use_ipv6=$(config_n_get $node kcp_use_ipv6) network_type="ipv4" [ "$kcptun_use_ipv6" == "1" ] && network_type="ipv6" kcptun_server_ip=$(get_host_ip $network_type $kcptun_server_host) echolog "KCP服务器IP地址:$kcptun_server_ip" - TCP_REDIR_SERVER1_IP=$kcptun_server_ip + TCP_NODE1_IP=$kcptun_server_ip start_kcptun "$kcptun_path" $kcptun_server_ip $kcptun_port "$kcptun_config" fi echolog "运行Kcptun..." - if [ "$server_type" == "ss" -o "$server_type" == "ssr" ]; then - gen_ss_ssr_config_file $server_type $local_port 1 $server $config_file_path + if [ "$type" == "ss" -o "$type" == "ssr" ]; then + gen_ss_ssr_config_file $type $local_port 1 $node $config_file_path fi - if [ "$server_type" == "brook" ]; then - BROOK_TCP_CMD="tproxy -l 0.0.0.0:$local_port -s 127.0.0.1:$KCPTUN_REDIR_PORT -p $(config_get $server password)" + if [ "$type" == "brook" ]; then + BROOK_TCP_CMD="tproxy -l 0.0.0.0:$local_port -s 127.0.0.1:$KCPTUN_REDIR_PORT -p $(config_n_get $node password)" fi else - if [ "$server_type" == "ss" -o "$server_type" == "ssr" ]; then - gen_ss_ssr_config_file $server_type $local_port 0 $server $config_file_path - elif [ "$server_type" == "brook" ]; then - BROOK_TCP_CMD="tproxy -l 0.0.0.0:$local_port -s $server_ip:$server_port -p $(config_get $server password)" + if [ "$type" == "ss" -o "$type" == "ssr" ]; then + gen_ss_ssr_config_file $type $local_port 0 $node $config_file_path + elif [ "$type" == "brook" ]; then + BROOK_TCP_CMD="tproxy -l 0.0.0.0:$local_port -s $server_ip:$port -p $(config_n_get $node password)" fi fi fi @@ -363,17 +363,17 @@ start_kcptun() { } start_tcp_redir() { - for i in $(seq 1 $TCP_REDIR_SERVER_NUM); do - eval temp_server=\$TCP_REDIR_SERVER$i + for i in $(seq 1 $TCP_NODE_NUM); do + eval temp_server=\$TCP_NODE$i [ "$temp_server" != "nil" ] && { - TYPE=$(echo $(config_get $temp_server server_type) | tr 'A-Z' 'a-z') + TYPE=$(echo $(config_n_get $temp_server type) | tr 'A-Z' 'a-z') local config_file=$CONFIG_PATH/TCP_$i.json eval current_port=\$TCP_REDIR_PORT$i local port=$(echo $(get_not_exists_port_after $current_port tcp)) eval TCP_REDIR_PORT$i=$port gen_config_file $temp_server $port TCP $config_file if [ "$TYPE" == "v2ray" ]; then - v2ray_path=$(config_t_get global_v2ray v2ray_client_file) + v2ray_path=$(config_t_get global_app v2ray_file) if [ -f "${v2ray_path}/v2ray" ]; then ${v2ray_path}/v2ray -config=$config_file >/dev/null & else @@ -381,24 +381,29 @@ start_tcp_redir() { [ -n "$v2ray_bin" ] && $v2ray_bin -config=$config_file >/dev/null & fi elif [ "$TYPE" == "brook" ]; then - brook_bin=$(find_bin Brook) - [ -n "$brook_bin" ] && $brook_bin $BROOK_TCP_CMD &>/dev/null & + brook_bin=$(config_t_get global_app brook_file) + if [ -f "$brook_bin" ]; then + $brook_bin $BROOK_TCP_CMD &>/dev/null & + else + brook_bin=$(find_bin Brook) + [ -n "$brook_bin" ] && $brook_bin $BROOK_TCP_CMD &>/dev/null & + fi elif [ "$TYPE" == "trojan" ]; then trojan_bin=$(find_bin trojan) [ -n "$trojan_bin" ] && $trojan_bin -c $config_file >/dev/null 2>&1 & elif [ "$TYPE" == "socks5" ]; then - local server=$(config_get $temp_server server) - local server_port=$(config_get $temp_server server_port) - local server_username=$(config_get $temp_server username) - local server_password=$(config_get $temp_server password) + local address=$(config_n_get $temp_server address) + local port=$(config_n_get $temp_server port) + local server_username=$(config_n_get $temp_server username) + local server_password=$(config_n_get $temp_server password) #ipt2socks_bin=$(find_bin ipt2socks) #[ -n "$ipt2socks_bin" ] && { - # $ipt2socks_bin -T -l $port -b 0.0.0.0 -s $server -p $server_port -R >/dev/null & + # $ipt2socks_bin -T -l $port -b 0.0.0.0 -s $address -p $port -R >/dev/null & #} redsocks_bin=$(find_bin redsocks2) [ -n "$redsocks_bin" ] && { local redsocks_config_file=$CONFIG_PATH/TCP_$i.conf - gen_redsocks_config $redsocks_config_file tcp $port $server $server_port $server_username $server_password + gen_redsocks_config $redsocks_config_file tcp $port $address $port $server_username $server_password $redsocks_bin -c $redsocks_config_file >/dev/null & } elif [ "$TYPE" == "ss" -o "$TYPE" == "ssr" ]; then @@ -415,17 +420,17 @@ start_tcp_redir() { } start_udp_redir() { - for i in $(seq 1 $UDP_REDIR_SERVER_NUM); do - eval temp_server=\$UDP_REDIR_SERVER$i + for i in $(seq 1 $UDP_NODE_NUM); do + eval temp_server=\$UDP_NODE$i [ "$temp_server" != "nil" ] && { - TYPE=$(echo $(config_get $temp_server server_type) | tr 'A-Z' 'a-z') + TYPE=$(echo $(config_n_get $temp_server type) | tr 'A-Z' 'a-z') local config_file=$CONFIG_PATH/UDP_$i.json eval current_port=\$UDP_REDIR_PORT$i local port=$(echo $(get_not_exists_port_after $current_port udp)) eval UDP_REDIR_PORT$i=$port gen_config_file $temp_server $port UDP $config_file if [ "$TYPE" == "v2ray" ]; then - v2ray_path=$(config_t_get global_v2ray v2ray_client_file) + v2ray_path=$(config_t_get global_app v2ray_file) if [ -f "${v2ray_path}/v2ray" ]; then ${v2ray_path}/v2ray -config=$config_file >/dev/null & else @@ -433,15 +438,20 @@ start_udp_redir() { [ -n "$v2ray_bin" ] && $v2ray_bin -config=$config_file >/dev/null & fi elif [ "$TYPE" == "brook" ]; then - brook_bin=$(find_bin brook) - [ -n "$brook_bin" ] && $brook_bin $BROOK_UDP_CMD >/dev/null & + brook_bin=$(config_t_get global_app brook_file) + if [ -f "$brook_bin" ]; then + $brook_bin $BROOK_UDP_CMD >/dev/null & + else + brook_bin=$(find_bin Brook) + [ -n "$brook_bin" ] && $brook_bin $BROOK_UDP_CMD >/dev/null & + fi elif [ "$TYPE" == "trojan" ]; then trojan_bin=$(find_bin trojan) [ -n "$trojan_bin" ] && $trojan_bin -c $config_file >/dev/null 2>&1 & - local server=$(config_get $temp_server server) - local server_port=$(config_get $temp_server server_port) - local server_username=$(config_get $temp_server username) - local server_password=$(config_get $temp_server password) + local address=$(config_n_get $temp_server address) + local port=$(config_n_get $temp_server port) + local server_username=$(config_n_get $temp_server username) + local server_password=$(config_n_get $temp_server password) #ipt2socks_bin=$(find_bin ipt2socks) #[ -n "$ipt2socks_bin" ] && { # $ipt2socks_bin -U -l $port -b 0.0.0.0 -s 127.0.0.1 -p $socks5_port -R >/dev/null & @@ -454,19 +464,19 @@ start_udp_redir() { $redsocks_bin -c $redsocks_config_file >/dev/null & } elif [ "$TYPE" == "socks5" ]; then - local server=$(config_get $temp_server server) - local server_port=$(config_get $temp_server server_port) - local server_username=$(config_get $temp_server username) - local server_password=$(config_get $temp_server password) + local address=$(config_n_get $temp_server address) + local port=$(config_n_get $temp_server port) + local server_username=$(config_n_get $temp_server username) + local server_password=$(config_n_get $temp_server password) #ipt2socks_bin=$(find_bin ipt2socks) #[ -n "$ipt2socks_bin" ] && { - # $ipt2socks_bin -U -l $port -b 0.0.0.0 -s $server -p $server_port -R >/dev/null & + # $ipt2socks_bin -U -l $port -b 0.0.0.0 -s $address -p $port -R >/dev/null & #} redsocks_bin=$(find_bin redsocks2) [ -n "$redsocks_bin" ] && { local redsocks_config_file=$CONFIG_PATH/UDP_$i.conf - gen_redsocks_config $redsocks_config_file udp $port $server $server_port $server_username $server_password + gen_redsocks_config $redsocks_config_file udp $port $address $port $server_username $server_password $redsocks_bin -c $redsocks_config_file >/dev/null & } elif [ "$TYPE" == "ss" -o "$TYPE" == "ssr" ]; then @@ -481,17 +491,17 @@ start_udp_redir() { } start_socks5_proxy() { - for i in $(seq 1 $SOCKS5_PROXY_SERVER_NUM); do - eval temp_server=\$SOCKS5_PROXY_SERVER$i + for i in $(seq 1 $SOCKS5_NODE_NUM); do + eval temp_server=\$SOCKS5_NODE$i if [ "$temp_server" != "nil" ]; then - TYPE=$(echo $(config_get $temp_server server_type) | tr 'A-Z' 'a-z') + TYPE=$(echo $(config_n_get $temp_server type) | tr 'A-Z' 'a-z') local config_file=$CONFIG_PATH/Socks5_$i.json eval current_port=\$SOCKS5_PROXY_PORT$i local port=$(get_not_exists_port_after $current_port tcp) eval SOCKS5_PROXY_PORT$i=$port gen_config_file $temp_server $port Socks5 $config_file if [ "$TYPE" == "v2ray" ]; then - v2ray_path=$(config_t_get global_v2ray v2ray_client_file) + v2ray_path=$(config_t_get global_app v2ray_file) if [ -f "${v2ray_path}/v2ray" ]; then ${v2ray_path}/v2ray -config=$config_file >/dev/null & else @@ -499,8 +509,13 @@ start_socks5_proxy() { [ -n "$v2ray_bin" ] && $v2ray_bin -config=$config_file >/dev/null & fi elif [ "$TYPE" == "brook" ]; then - brook_bin=$(find_bin brook) - [ -n "$brook_bin" ] && $brook_bin $BROOK_SOCKS5_CMD >/dev/null & + brook_bin=$(config_t_get global_app brook_file) + if [ -f "$brook_bin" ]; then + $brook_bin $BROOK_SOCKS5_CMD >/dev/null & + else + brook_bin=$(find_bin Brook) + [ -n "$brook_bin" ] && $brook_bin $BROOK_SOCKS5_CMD >/dev/null & + fi elif [ "$TYPE" == "trojan" ]; then trojan_bin=$(find_bin trojan) [ -n "$trojan_bin" ] && $trojan_bin -c $config_file >/dev/null 2>&1 & @@ -603,7 +618,7 @@ stop_crontab() { start_dns() { case "$DNS_MODE" in dns2socks) - if [ -n "$SOCKS5_PROXY_SERVER1" -a "$SOCKS5_PROXY_SERVER1" != "nil" ]; then + if [ -n "$SOCKS5_NODE1" -a "$SOCKS5_NODE1" != "nil" ]; then dns2socks_bin=$(find_bin dns2socks) [ -n "$dns2socks_bin" ] && { nohup $dns2socks_bin 127.0.0.1:$SOCKS5_PROXY_PORT1 $DNS_FORWARD 127.0.0.1:7913 >/dev/null 2>&1 & @@ -957,7 +972,7 @@ gen_pdnsd_config() { } stop_dnsmasq() { - if [ "$TCP_REDIR_SERVER1" == "nil" ]; then + if [ "$TCP_NODE1" == "nil" ]; then rm -rf /var/dnsmasq.d/dnsmasq-$CONFIG.conf rm -rf $DNSMASQ_PATH/dnsmasq-$CONFIG.conf rm -rf $TMP_DNSMASQ_PATH @@ -1048,23 +1063,20 @@ start_haproxy() { fi done #生成负载均衡控制台 - adminstatus=$(config_t_get global_haproxy admin_enable) - if [ "$adminstatus" = "1" ]; then - adminport=$(config_t_get global_haproxy admin_port) - adminuser=$(config_t_get global_haproxy admin_user) - adminpassword=$(config_t_get global_haproxy admin_password) - cat <<-EOF >>$HAPROXY_FILE - - listen status - bind 0.0.0.0:$adminport - mode http - stats refresh 30s - stats uri / - stats auth $adminuser:$adminpassword - #stats hide-version - stats admin if TRUE - EOF - fi + console_port=$(config_t_get global_haproxy console_port) + console_user=$(config_t_get global_haproxy console_user) + console_password=$(config_t_get global_haproxy console_password) + cat <<-EOF >>$HAPROXY_FILE + + listen status + bind 0.0.0.0:$console_port + mode http + stats refresh 30s + stats uri / + stats auth $console_user:$console_password + #stats hide-version + stats admin if TRUE + EOF nohup $haproxy_bin -f $HAPROXY_FILE 2>&1 echolog "负载均衡服务运行成功！" } @@ -1083,11 +1095,11 @@ add_vps_port() { [ "$failcount" -ge 10 ] && exit 0 sleep 1m else - route add -host ${TCP_REDIR_SERVER1_IP} dev ${multiwan} - route add -host ${UDP_REDIR_SERVER1_IP} dev ${multiwan} + route add -host ${TCP_NODE1_IP} dev ${multiwan} + route add -host ${UDP_NODE1_IP} dev ${multiwan} echolog "添加SS出口路由表：$multiwan" - echo "$TCP_REDIR_SERVER1_IP" >$CONFIG_PATH/tcp_ip - echo "$UDP_REDIR_SERVER1_IP" >$CONFIG_PATH/udp_ip + echo "$TCP_NODE1_IP" >$CONFIG_PATH/tcp_ip + echo "$UDP_NODE1_IP" >$CONFIG_PATH/udp_ip break fi done @@ -1108,7 +1120,7 @@ kill_all() { boot() { local delay=$(config_t_get global_delay start_delay 0) if [ "$delay" -gt 0 ]; then - [ "$TCP_REDIR_SERVER1" != "nil" -o "$UDP_REDIR_SERVER1" != "nil" ] && { + [ "$TCP_NODE1" != "nil" -o "$UDP_NODE1" != "nil" ] && { echolog "执行启动延时 $delay 秒后再启动!" sleep $delay && start >/dev/null 2>&1 & } diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/gfwlist.conf b/package/lienol/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/gfwlist.conf index 5438ce58c8..d7c4e90030 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/gfwlist.conf +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/gfwlist.conf @@ -2,10 +2,6 @@ server=/.030buy.com/127.0.0.1#7913 ipset=/.030buy.com/gfwlist server=/.0rz.tw/127.0.0.1#7913 ipset=/.0rz.tw/gfwlist -server=/.1-apple.com.tw/127.0.0.1#7913 -ipset=/.1-apple.com.tw/gfwlist -server=/.10.tt/127.0.0.1#7913 -ipset=/.10.tt/gfwlist server=/.1000giri.net/127.0.0.1#7913 ipset=/.1000giri.net/gfwlist server=/.100ke.org/127.0.0.1#7913 @@ -14,6 +10,8 @@ server=/.10conditionsoflove.com/127.0.0.1#7913 ipset=/.10conditionsoflove.com/gfwlist server=/.10musume.com/127.0.0.1#7913 ipset=/.10musume.com/gfwlist +server=/.10.tt/127.0.0.1#7913 +ipset=/.10.tt/gfwlist server=/.123rf.com/127.0.0.1#7913 ipset=/.123rf.com/gfwlist server=/.12bet.com/127.0.0.1#7913 @@ -60,6 +58,8 @@ server=/.1991way.com/127.0.0.1#7913 ipset=/.1991way.com/gfwlist server=/.1998cdp.org/127.0.0.1#7913 ipset=/.1998cdp.org/gfwlist +server=/.1-apple.com.tw/127.0.0.1#7913 +ipset=/.1-apple.com.tw/gfwlist server=/.1bao.org/127.0.0.1#7913 ipset=/.1bao.org/gfwlist server=/.1dumb.com/127.0.0.1#7913 @@ -74,10 +74,6 @@ server=/.1mobile.tw/127.0.0.1#7913 ipset=/.1mobile.tw/gfwlist server=/.1pondo.tv/127.0.0.1#7913 ipset=/.1pondo.tv/gfwlist -server=/.2-hand.info/127.0.0.1#7913 -ipset=/.2-hand.info/gfwlist -server=/.2.bahamut.com.tw/127.0.0.1#7913 -ipset=/.2.bahamut.com.tw/gfwlist server=/.2000fun.com/127.0.0.1#7913 ipset=/.2000fun.com/gfwlist server=/.2008xianzhang.info/127.0.0.1#7913 @@ -102,14 +98,16 @@ server=/.24smile.org/127.0.0.1#7913 ipset=/.24smile.org/gfwlist server=/.25u.com/127.0.0.1#7913 ipset=/.25u.com/gfwlist +server=/.2.bahamut.com.tw/127.0.0.1#7913 +ipset=/.2.bahamut.com.tw/gfwlist +server=/.2-hand.info/127.0.0.1#7913 +ipset=/.2-hand.info/gfwlist server=/.2lipstube.com/127.0.0.1#7913 ipset=/.2lipstube.com/gfwlist server=/.2shared.com/127.0.0.1#7913 ipset=/.2shared.com/gfwlist server=/.2waky.com/127.0.0.1#7913 ipset=/.2waky.com/gfwlist -server=/.3-a.net/127.0.0.1#7913 -ipset=/.3-a.net/gfwlist server=/.30boxes.com/127.0.0.1#7913 ipset=/.30boxes.com/gfwlist server=/.315lz.com/127.0.0.1#7913 @@ -120,6 +118,8 @@ server=/.36rain.com/127.0.0.1#7913 ipset=/.36rain.com/gfwlist server=/.3a5a.com/127.0.0.1#7913 ipset=/.3a5a.com/gfwlist +server=/.3-a.net/127.0.0.1#7913 +ipset=/.3-a.net/gfwlist server=/.3arabtv.com/127.0.0.1#7913 ipset=/.3arabtv.com/gfwlist server=/.3boys2girls.com/127.0.0.1#7913 @@ -184,10 +184,10 @@ server=/.64tianwang.com/127.0.0.1#7913 ipset=/.64tianwang.com/gfwlist server=/.64wiki.com/127.0.0.1#7913 ipset=/.64wiki.com/gfwlist -server=/.66.ca/127.0.0.1#7913 -ipset=/.66.ca/gfwlist server=/.666kb.com/127.0.0.1#7913 ipset=/.666kb.com/gfwlist +server=/.66.ca/127.0.0.1#7913 +ipset=/.66.ca/gfwlist server=/.6park.com/127.0.0.1#7913 ipset=/.6park.com/gfwlist server=/.6parker.com/127.0.0.1#7913 @@ -198,8 +198,6 @@ server=/.7capture.com/127.0.0.1#7913 ipset=/.7capture.com/gfwlist server=/.7cow.com/127.0.0.1#7913 ipset=/.7cow.com/gfwlist -server=/.8-d.com/127.0.0.1#7913 -ipset=/.8-d.com/gfwlist server=/.85cc.net/127.0.0.1#7913 ipset=/.85cc.net/gfwlist server=/.85cc.us/127.0.0.1#7913 @@ -212,10 +210,12 @@ server=/.888.com/127.0.0.1#7913 ipset=/.888.com/gfwlist server=/.888poker.com/127.0.0.1#7913 ipset=/.888poker.com/gfwlist -server=/.89-64.org/127.0.0.1#7913 -ipset=/.89-64.org/gfwlist server=/.89.64.charter.constitutionalism.solutions/127.0.0.1#7913 ipset=/.89.64.charter.constitutionalism.solutions/gfwlist +server=/.89-64.org/127.0.0.1#7913 +ipset=/.89-64.org/gfwlist +server=/.8-d.com/127.0.0.1#7913 +ipset=/.8-d.com/gfwlist server=/.8news.com.tw/127.0.0.1#7913 ipset=/.8news.com.tw/gfwlist server=/.8z1.net/127.0.0.1#7913 @@ -242,8 +242,6 @@ server=/.9bis.net/127.0.0.1#7913 ipset=/.9bis.net/gfwlist server=/.9gag.com/127.0.0.1#7913 ipset=/.9gag.com/gfwlist -server=/.a-normal-day.com/127.0.0.1#7913 -ipset=/.a-normal-day.com/gfwlist server=/.a248.e.akamai.net/127.0.0.1#7913 ipset=/.a248.e.akamai.net/gfwlist server=/.a5.com.ru/127.0.0.1#7913 @@ -252,16 +250,16 @@ server=/.aamacau.com/127.0.0.1#7913 ipset=/.aamacau.com/gfwlist server=/.abc.com/127.0.0.1#7913 ipset=/.abc.com/gfwlist +server=/.abchinese.com/127.0.0.1#7913 +ipset=/.abchinese.com/gfwlist +server=/.abclite.net/127.0.0.1#7913 +ipset=/.abclite.net/gfwlist server=/.abc.net.au/127.0.0.1#7913 ipset=/.abc.net.au/gfwlist server=/.abc.pp.ru/127.0.0.1#7913 ipset=/.abc.pp.ru/gfwlist server=/.abc.xyz/127.0.0.1#7913 ipset=/.abc.xyz/gfwlist -server=/.abchinese.com/127.0.0.1#7913 -ipset=/.abchinese.com/gfwlist -server=/.abclite.net/127.0.0.1#7913 -ipset=/.abclite.net/gfwlist server=/.abebooks.com/127.0.0.1#7913 ipset=/.abebooks.com/gfwlist server=/.abematv.akamaized.net/127.0.0.1#7913 @@ -272,14 +270,12 @@ server=/.ablwang.com/127.0.0.1#7913 ipset=/.ablwang.com/gfwlist server=/.aboluowang.com/127.0.0.1#7913 ipset=/.aboluowang.com/gfwlist -server=/.about.google/127.0.0.1#7913 -ipset=/.about.google/gfwlist server=/.aboutgfw.com/127.0.0.1#7913 ipset=/.aboutgfw.com/gfwlist +server=/.about.google/127.0.0.1#7913 +ipset=/.about.google/gfwlist server=/.abs.edu/127.0.0.1#7913 ipset=/.abs.edu/gfwlist -server=/.ac.jiruan.net/127.0.0.1#7913 -ipset=/.ac.jiruan.net/gfwlist server=/.accim.org/127.0.0.1#7913 ipset=/.accim.org/gfwlist server=/.aceros-de-hispania.com/127.0.0.1#7913 @@ -290,6 +286,8 @@ server=/.acg18.me/127.0.0.1#7913 ipset=/.acg18.me/gfwlist server=/.acgkj.com/127.0.0.1#7913 ipset=/.acgkj.com/gfwlist +server=/.ac.jiruan.net/127.0.0.1#7913 +ipset=/.ac.jiruan.net/gfwlist server=/.acmedia365.com/127.0.0.1#7913 ipset=/.acmedia365.com/gfwlist server=/.acmetoy.com/127.0.0.1#7913 @@ -316,48 +314,46 @@ server=/.admob.com/127.0.0.1#7913 ipset=/.admob.com/gfwlist server=/.adpl.org.hk/127.0.0.1#7913 ipset=/.adpl.org.hk/gfwlist -server=/.ads-twitter.com/127.0.0.1#7913 -ipset=/.ads-twitter.com/gfwlist server=/.adsense.com/127.0.0.1#7913 ipset=/.adsense.com/gfwlist -server=/.adult-sex-games.com/127.0.0.1#7913 -ipset=/.adult-sex-games.com/gfwlist +server=/.ads-twitter.com/127.0.0.1#7913 +ipset=/.ads-twitter.com/gfwlist server=/.adult.friendfinder.com/127.0.0.1#7913 -ipset=/.adult.friendfinder.com/gfwlist server=/.adultfriendfinder.com/127.0.0.1#7913 +ipset=/.adult.friendfinder.com/gfwlist ipset=/.adultfriendfinder.com/gfwlist server=/.adultkeep.net/127.0.0.1#7913 ipset=/.adultkeep.net/gfwlist +server=/.adult-sex-games.com/127.0.0.1#7913 +ipset=/.adult-sex-games.com/gfwlist server=/.advanscene.com/127.0.0.1#7913 ipset=/.advanscene.com/gfwlist server=/.advertfan.com/127.0.0.1#7913 ipset=/.advertfan.com/gfwlist server=/.ae.hao123.com/127.0.0.1#7913 ipset=/.ae.hao123.com/gfwlist -server=/.ae.org/127.0.0.1#7913 -ipset=/.ae.org/gfwlist server=/.aenhancers.com/127.0.0.1#7913 ipset=/.aenhancers.com/gfwlist +server=/.ae.org/127.0.0.1#7913 +ipset=/.ae.org/gfwlist server=/.aex.com/127.0.0.1#7913 ipset=/.aex.com/gfwlist -server=/.af.mil/127.0.0.1#7913 -ipset=/.af.mil/gfwlist server=/.afantibbs.com/127.0.0.1#7913 ipset=/.afantibbs.com/gfwlist +server=/.af.mil/127.0.0.1#7913 +ipset=/.af.mil/gfwlist server=/.agnesb.fr/127.0.0.1#7913 ipset=/.agnesb.fr/gfwlist server=/.agoogleaday.com/127.0.0.1#7913 ipset=/.agoogleaday.com/gfwlist server=/.agro.hk/127.0.0.1#7913 ipset=/.agro.hk/gfwlist -server=/.ai-kan.net/127.0.0.1#7913 -ipset=/.ai-kan.net/gfwlist -server=/.ai-wen.net/127.0.0.1#7913 -ipset=/.ai-wen.net/gfwlist server=/.ai.binwang.me/127.0.0.1#7913 ipset=/.ai.binwang.me/gfwlist server=/.ai.google/127.0.0.1#7913 ipset=/.ai.google/gfwlist +server=/.ai-kan.net/127.0.0.1#7913 +ipset=/.ai-kan.net/gfwlist server=/.aiph.net/127.0.0.1#7913 ipset=/.aiph.net/gfwlist server=/.airasia.com/127.0.0.1#7913 @@ -372,10 +368,12 @@ server=/.aiss.anws.gov.tw/127.0.0.1#7913 ipset=/.aiss.anws.gov.tw/gfwlist server=/.ait.org.tw/127.0.0.1#7913 ipset=/.ait.org.tw/gfwlist -server=/.aiweiwei.com/127.0.0.1#7913 -ipset=/.aiweiwei.com/gfwlist server=/.aiweiweiblog.com/127.0.0.1#7913 ipset=/.aiweiweiblog.com/gfwlist +server=/.aiweiwei.com/127.0.0.1#7913 +ipset=/.aiweiwei.com/gfwlist +server=/.ai-wen.net/127.0.0.1#7913 +ipset=/.ai-wen.net/gfwlist server=/.akademiye.org/127.0.0.1#7913 ipset=/.akademiye.org/gfwlist server=/.akamaihd.net/127.0.0.1#7913 @@ -386,10 +384,6 @@ server=/.akiba-web.com/127.0.0.1#7913 ipset=/.akiba-web.com/gfwlist server=/.akow.org/127.0.0.1#7913 ipset=/.akow.org/gfwlist -server=/.al-islam.com/127.0.0.1#7913 -ipset=/.al-islam.com/gfwlist -server=/.al-qimmah.net/127.0.0.1#7913 -ipset=/.al-qimmah.net/gfwlist server=/.alabout.com/127.0.0.1#7913 ipset=/.alabout.com/gfwlist server=/.alanhou.com/127.0.0.1#7913 @@ -408,6 +402,8 @@ server=/.alicejapan.co.jp/127.0.0.1#7913 ipset=/.alicejapan.co.jp/gfwlist server=/.aliengu.com/127.0.0.1#7913 ipset=/.aliengu.com/gfwlist +server=/.al-islam.com/127.0.0.1#7913 +ipset=/.al-islam.com/gfwlist server=/.alkasir.com/127.0.0.1#7913 ipset=/.alkasir.com/gfwlist server=/.allcoin.com/127.0.0.1#7913 @@ -442,6 +438,8 @@ server=/.almostmy.com/127.0.0.1#7913 ipset=/.almostmy.com/gfwlist server=/.alphaporno.com/127.0.0.1#7913 ipset=/.alphaporno.com/gfwlist +server=/.al-qimmah.net/127.0.0.1#7913 +ipset=/.al-qimmah.net/gfwlist server=/.alternate-tools.com/127.0.0.1#7913 ipset=/.alternate-tools.com/gfwlist server=/.alternativeto.net/127.0.0.1#7913 @@ -474,10 +472,10 @@ server=/.amigobbs.net/127.0.0.1#7913 ipset=/.amigobbs.net/gfwlist server=/.amitabhafoundation.us/127.0.0.1#7913 ipset=/.amitabhafoundation.us/gfwlist -server=/.amnesty.org.hk/127.0.0.1#7913 -ipset=/.amnesty.org.hk/gfwlist server=/.amnesty.org/127.0.0.1#7913 ipset=/.amnesty.org/gfwlist +server=/.amnesty.org.hk/127.0.0.1#7913 +ipset=/.amnesty.org.hk/gfwlist server=/.amnesty.tw/127.0.0.1#7913 ipset=/.amnesty.tw/gfwlist server=/.amnestyusa.org/127.0.0.1#7913 @@ -496,8 +494,6 @@ server=/.ancsconf.org/127.0.0.1#7913 ipset=/.ancsconf.org/gfwlist server=/.andfaraway.net/127.0.0.1#7913 ipset=/.andfaraway.net/gfwlist -server=/.android-x86.org/127.0.0.1#7913 -ipset=/.android-x86.org/gfwlist server=/.android.com/127.0.0.1#7913 ipset=/.android.com/gfwlist server=/.androidify.com/127.0.0.1#7913 @@ -506,6 +502,8 @@ server=/.androidplus.co/127.0.0.1#7913 ipset=/.androidplus.co/gfwlist server=/.androidtv.com/127.0.0.1#7913 ipset=/.androidtv.com/gfwlist +server=/.android-x86.org/127.0.0.1#7913 +ipset=/.android-x86.org/gfwlist server=/.andygod.com/127.0.0.1#7913 ipset=/.andygod.com/gfwlist server=/.angela-merkel.de/127.0.0.1#7913 @@ -536,6 +534,8 @@ server=/.anonymizer.com/127.0.0.1#7913 ipset=/.anonymizer.com/gfwlist server=/.anonymouse.org/127.0.0.1#7913 ipset=/.anonymouse.org/gfwlist +server=/.a-normal-day.com/127.0.0.1#7913 +ipset=/.a-normal-day.com/gfwlist server=/.anpopo.com/127.0.0.1#7913 ipset=/.anpopo.com/gfwlist server=/.answering-islam.org/127.0.0.1#7913 @@ -554,9 +554,9 @@ server=/.anysex.com/127.0.0.1#7913 ipset=/.anysex.com/gfwlist server=/.aobo.com.au/127.0.0.1#7913 ipset=/.aobo.com.au/gfwlist +server=/.aofriend.com/127.0.0.1#7913 server=/.aofriend.com.au/127.0.0.1#7913 ipset=/.aofriend.com.au/gfwlist -server=/.aofriend.com/127.0.0.1#7913 ipset=/.aofriend.com/gfwlist server=/.aojiao.org/127.0.0.1#7913 ipset=/.aojiao.org/gfwlist @@ -570,14 +570,16 @@ server=/.apartments.com/127.0.0.1#7913 ipset=/.apartments.com/gfwlist server=/.apetube.com/127.0.0.1#7913 ipset=/.apetube.com/gfwlist -server=/.api-secure.recaptcha.net/127.0.0.1#7913 -ipset=/.api-secure.recaptcha.net/gfwlist -server=/.api-verify.recaptcha.net/127.0.0.1#7913 -ipset=/.api-verify.recaptcha.net/gfwlist server=/.api.ai/127.0.0.1#7913 ipset=/.api.ai/gfwlist +server=/.apiary.io/127.0.0.1#7913 +ipset=/.apiary.io/gfwlist +server=/.apidocs.linksalpha.com/127.0.0.1#7913 +ipset=/.apidocs.linksalpha.com/gfwlist server=/.api.dropboxapi.com/127.0.0.1#7913 ipset=/.api.dropboxapi.com/gfwlist +server=/.apigee.com/127.0.0.1#7913 +ipset=/.apigee.com/gfwlist server=/.api.linksalpha.com/127.0.0.1#7913 ipset=/.api.linksalpha.com/gfwlist server=/.api.proxlet.com/127.0.0.1#7913 @@ -586,12 +588,10 @@ server=/.api.pureapk.com/127.0.0.1#7913 ipset=/.api.pureapk.com/gfwlist server=/.api.recaptcha.net/127.0.0.1#7913 ipset=/.api.recaptcha.net/gfwlist -server=/.apiary.io/127.0.0.1#7913 -ipset=/.apiary.io/gfwlist -server=/.apidocs.linksalpha.com/127.0.0.1#7913 -ipset=/.apidocs.linksalpha.com/gfwlist -server=/.apigee.com/127.0.0.1#7913 -ipset=/.apigee.com/gfwlist +server=/.api-secure.recaptcha.net/127.0.0.1#7913 +ipset=/.api-secure.recaptcha.net/gfwlist +server=/.api-verify.recaptcha.net/127.0.0.1#7913 +ipset=/.api-verify.recaptcha.net/gfwlist server=/.apk-dl.com/127.0.0.1#7913 ipset=/.apk-dl.com/gfwlist server=/.apkdler.com/127.0.0.1#7913 @@ -608,32 +608,30 @@ server=/.aplusvpn.com/127.0.0.1#7913 ipset=/.aplusvpn.com/gfwlist server=/.app.box.com/127.0.0.1#7913 ipset=/.app.box.com/gfwlist -server=/.app.heywire.com/127.0.0.1#7913 -ipset=/.app.heywire.com/gfwlist -server=/.app.smartmailcloud.com/127.0.0.1#7913 -ipset=/.app.smartmailcloud.com/gfwlist -server=/.app.tutanota.com/127.0.0.1#7913 -ipset=/.app.tutanota.com/gfwlist server=/.appdownloader.net/127.0.0.1#7913 ipset=/.appdownloader.net/gfwlist +server=/.app.heywire.com/127.0.0.1#7913 +ipset=/.app.heywire.com/gfwlist +server=/.appledaily.com/127.0.0.1#7913 +ipset=/.appledaily.com/gfwlist server=/.appledaily.com.hk/127.0.0.1#7913 ipset=/.appledaily.com.hk/gfwlist server=/.appledaily.com.tw/127.0.0.1#7913 ipset=/.appledaily.com.tw/gfwlist -server=/.appledaily.com/127.0.0.1#7913 -ipset=/.appledaily.com/gfwlist server=/.appshopper.com/127.0.0.1#7913 ipset=/.appshopper.com/gfwlist +server=/.app.smartmailcloud.com/127.0.0.1#7913 +ipset=/.app.smartmailcloud.com/gfwlist server=/.appsocks.net/127.0.0.1#7913 ipset=/.appsocks.net/gfwlist server=/.appspot.com/127.0.0.1#7913 ipset=/.appspot.com/gfwlist server=/.appsto.re/127.0.0.1#7913 ipset=/.appsto.re/gfwlist +server=/.app.tutanota.com/127.0.0.1#7913 +ipset=/.app.tutanota.com/gfwlist server=/.aptoide.com/127.0.0.1#7913 ipset=/.aptoide.com/gfwlist -server=/.ar.hao123.com/127.0.0.1#7913 -ipset=/.ar.hao123.com/gfwlist server=/.archive.fo/127.0.0.1#7913 ipset=/.archive.fo/gfwlist server=/.archive.is/127.0.0.1#7913 @@ -642,12 +640,12 @@ server=/.archive.li/127.0.0.1#7913 ipset=/.archive.li/gfwlist server=/.archive.org/127.0.0.1#7913 ipset=/.archive.org/gfwlist -server=/.archive.today/127.0.0.1#7913 -ipset=/.archive.today/gfwlist -server=/.archives.gov.tw/127.0.0.1#7913 -ipset=/.archives.gov.tw/gfwlist server=/.archives.gov/127.0.0.1#7913 ipset=/.archives.gov/gfwlist +server=/.archives.gov.tw/127.0.0.1#7913 +ipset=/.archives.gov.tw/gfwlist +server=/.archive.today/127.0.0.1#7913 +ipset=/.archive.today/gfwlist server=/.arctosia.com/127.0.0.1#7913 ipset=/.arctosia.com/gfwlist server=/.areca-backup.org/127.0.0.1#7913 @@ -656,6 +654,8 @@ server=/.arena.taipei/127.0.0.1#7913 ipset=/.arena.taipei/gfwlist server=/.arethusa.su/127.0.0.1#7913 ipset=/.arethusa.su/gfwlist +server=/.ar.hao123.com/127.0.0.1#7913 +ipset=/.ar.hao123.com/gfwlist server=/.arlingtoncemetery.mil/127.0.0.1#7913 ipset=/.arlingtoncemetery.mil/gfwlist server=/.army.mil/127.0.0.1#7913 @@ -704,10 +704,10 @@ server=/.assimp.org/127.0.0.1#7913 ipset=/.assimp.org/gfwlist server=/.astrill.com/127.0.0.1#7913 ipset=/.astrill.com/gfwlist -server=/.atc.org.au/127.0.0.1#7913 -ipset=/.atc.org.au/gfwlist server=/.atchinese.com/127.0.0.1#7913 ipset=/.atchinese.com/gfwlist +server=/.atc.org.au/127.0.0.1#7913 +ipset=/.atc.org.au/gfwlist server=/.atdmt.com/127.0.0.1#7913 ipset=/.atdmt.com/gfwlist server=/.atgfw.org/127.0.0.1#7913 @@ -728,26 +728,22 @@ server=/.authorizeddns.us/127.0.0.1#7913 ipset=/.authorizeddns.us/gfwlist server=/.autodraw.com/127.0.0.1#7913 ipset=/.autodraw.com/gfwlist -server=/.av-e-body.com/127.0.0.1#7913 -ipset=/.av-e-body.com/gfwlist -server=/.av.com/127.0.0.1#7913 -ipset=/.av.com/gfwlist -server=/.av.movie/127.0.0.1#7913 -ipset=/.av.movie/gfwlist -server=/.av.nightlife141.com/127.0.0.1#7913 -ipset=/.av.nightlife141.com/gfwlist server=/.avaaz.org/127.0.0.1#7913 ipset=/.avaaz.org/gfwlist server=/.avbody.tv/127.0.0.1#7913 ipset=/.avbody.tv/gfwlist server=/.avcity.tv/127.0.0.1#7913 ipset=/.avcity.tv/gfwlist +server=/.av.com/127.0.0.1#7913 +ipset=/.av.com/gfwlist server=/.avcool.com/127.0.0.1#7913 ipset=/.avcool.com/gfwlist server=/.avdb.in/127.0.0.1#7913 ipset=/.avdb.in/gfwlist server=/.avdb.tv/127.0.0.1#7913 ipset=/.avdb.tv/gfwlist +server=/.av-e-body.com/127.0.0.1#7913 +ipset=/.av-e-body.com/gfwlist server=/.avfantasy.com/127.0.0.1#7913 ipset=/.avfantasy.com/gfwlist server=/.avg.com/127.0.0.1#7913 @@ -756,14 +752,18 @@ server=/.avgle.com/127.0.0.1#7913 ipset=/.avgle.com/gfwlist server=/.avidemux.org/127.0.0.1#7913 ipset=/.avidemux.org/gfwlist -server=/.avmo.pw/127.0.0.1#7913 -ipset=/.avmo.pw/gfwlist server=/.avmoo.com/127.0.0.1#7913 ipset=/.avmoo.com/gfwlist server=/.avmoo.net/127.0.0.1#7913 ipset=/.avmoo.net/gfwlist server=/.avmoo.pw/127.0.0.1#7913 ipset=/.avmoo.pw/gfwlist +server=/.avmo.pw/127.0.0.1#7913 +ipset=/.avmo.pw/gfwlist +server=/.av.movie/127.0.0.1#7913 +ipset=/.av.movie/gfwlist +server=/.av.nightlife141.com/127.0.0.1#7913 +ipset=/.av.nightlife141.com/gfwlist server=/.avoision.com/127.0.0.1#7913 ipset=/.avoision.com/gfwlist server=/.avyahoo.com/127.0.0.1#7913 @@ -842,36 +842,36 @@ server=/.bastillepost.com/127.0.0.1#7913 ipset=/.bastillepost.com/gfwlist server=/.bayvoice.net/127.0.0.1#7913 ipset=/.bayvoice.net/gfwlist -server=/.bb-chat.tv/127.0.0.1#7913 -ipset=/.bb-chat.tv/gfwlist -server=/.bb.ttv.com.tw/127.0.0.1#7913 -ipset=/.bb.ttv.com.tw/gfwlist -server=/.bbc.co.uk/127.0.0.1#7913 -ipset=/.bbc.co.uk/gfwlist -server=/.bbc.com/127.0.0.1#7913 -ipset=/.bbc.com/gfwlist -server=/.bbc.in/127.0.0.1#7913 -ipset=/.bbc.in/gfwlist server=/.bbcchinese.com/127.0.0.1#7913 ipset=/.bbcchinese.com/gfwlist +server=/.bbc.com/127.0.0.1#7913 +ipset=/.bbc.com/gfwlist +server=/.bbc.co.uk/127.0.0.1#7913 +ipset=/.bbc.co.uk/gfwlist +server=/.bb-chat.tv/127.0.0.1#7913 server=/.bbchat.tv/127.0.0.1#7913 +ipset=/.bb-chat.tv/gfwlist ipset=/.bbchat.tv/gfwlist server=/.bbci.co.uk/127.0.0.1#7913 ipset=/.bbci.co.uk/gfwlist +server=/.bbc.in/127.0.0.1#7913 +ipset=/.bbc.in/gfwlist server=/.bbg.gov/127.0.0.1#7913 ipset=/.bbg.gov/gfwlist server=/.bbkz.com/127.0.0.1#7913 ipset=/.bbkz.com/gfwlist server=/.bbnradio.org/127.0.0.1#7913 ipset=/.bbnradio.org/gfwlist -server=/.bbs-tw.com/127.0.0.1#7913 -ipset=/.bbs-tw.com/gfwlist server=/.bbs.brockbbs.com/127.0.0.1#7913 ipset=/.bbs.brockbbs.com/gfwlist server=/.bbs.cantonese.asia/127.0.0.1#7913 ipset=/.bbs.cantonese.asia/gfwlist +server=/.bbsdigest.com/127.0.0.1#7913 +ipset=/.bbsdigest.com/gfwlist server=/.bbs.ecstart.com/127.0.0.1#7913 ipset=/.bbs.ecstart.com/gfwlist +server=/.bbsfeed.com/127.0.0.1#7913 +ipset=/.bbsfeed.com/gfwlist server=/.bbs.hanminzu.org/127.0.0.1#7913 ipset=/.bbs.hanminzu.org/gfwlist server=/.bbs.hasi.wang/127.0.0.1#7913 @@ -882,14 +882,20 @@ server=/.bbs.junglobal.net/127.0.0.1#7913 ipset=/.bbs.junglobal.net/gfwlist server=/.bbs.kimy.com.tw/127.0.0.1#7913 ipset=/.bbs.kimy.com.tw/gfwlist +server=/.bbsland.com/127.0.0.1#7913 +ipset=/.bbsland.com/gfwlist server=/.bbs.mikocon.com/127.0.0.1#7913 ipset=/.bbs.mikocon.com/gfwlist +server=/.bbsmo.com/127.0.0.1#7913 +ipset=/.bbsmo.com/gfwlist server=/.bbs.morbell.com/127.0.0.1#7913 ipset=/.bbs.morbell.com/gfwlist server=/.bbs.mychat.to/127.0.0.1#7913 ipset=/.bbs.mychat.to/gfwlist server=/.bbs.netbig.com/127.0.0.1#7913 ipset=/.bbs.netbig.com/gfwlist +server=/.bbsone.com/127.0.0.1#7913 +ipset=/.bbsone.com/gfwlist server=/.bbs.ozchinese.com/127.0.0.1#7913 ipset=/.bbs.ozchinese.com/gfwlist server=/.bbs.qmzdd.com/127.0.0.1#7913 @@ -902,18 +908,12 @@ server=/.bbs.sou-tong.org/127.0.0.1#7913 ipset=/.bbs.sou-tong.org/gfwlist server=/.bbs.tuitui.info/127.0.0.1#7913 ipset=/.bbs.tuitui.info/gfwlist -server=/.bbsdigest.com/127.0.0.1#7913 -ipset=/.bbsdigest.com/gfwlist -server=/.bbsfeed.com/127.0.0.1#7913 -ipset=/.bbsfeed.com/gfwlist -server=/.bbsland.com/127.0.0.1#7913 -ipset=/.bbsland.com/gfwlist -server=/.bbsmo.com/127.0.0.1#7913 -ipset=/.bbsmo.com/gfwlist -server=/.bbsone.com/127.0.0.1#7913 -ipset=/.bbsone.com/gfwlist +server=/.bbs-tw.com/127.0.0.1#7913 +ipset=/.bbs-tw.com/gfwlist server=/.bbtoystore.com/127.0.0.1#7913 ipset=/.bbtoystore.com/gfwlist +server=/.bb.ttv.com.tw/127.0.0.1#7913 +ipset=/.bb.ttv.com.tw/gfwlist server=/.bcast.co.nz/127.0.0.1#7913 ipset=/.bcast.co.nz/gfwlist server=/.bcc.com.tw/127.0.0.1#7913 @@ -962,10 +962,10 @@ server=/.bestgore.com/127.0.0.1#7913 ipset=/.bestgore.com/gfwlist server=/.bestpornstardb.com/127.0.0.1#7913 ipset=/.bestpornstardb.com/gfwlist -server=/.bestvpn.com/127.0.0.1#7913 -ipset=/.bestvpn.com/gfwlist server=/.bestvpnanalysis.com/127.0.0.1#7913 ipset=/.bestvpnanalysis.com/gfwlist +server=/.bestvpn.com/127.0.0.1#7913 +ipset=/.bestvpn.com/gfwlist server=/.bestvpnserver.com/127.0.0.1#7913 ipset=/.bestvpnserver.com/gfwlist server=/.bestvpnservice.com/127.0.0.1#7913 @@ -1006,8 +1006,6 @@ server=/.bibox.com/127.0.0.1#7913 ipset=/.bibox.com/gfwlist server=/.bic2011.org/127.0.0.1#7913 ipset=/.bic2011.org/gfwlist -server=/.big.one/127.0.0.1#7913 -ipset=/.big.one/gfwlist server=/.bigfools.com/127.0.0.1#7913 ipset=/.bigfools.com/gfwlist server=/.bigjapanesesex.com/127.0.0.1#7913 @@ -1016,6 +1014,8 @@ server=/.bigmoney.biz/127.0.0.1#7913 ipset=/.bigmoney.biz/gfwlist server=/.bignews.org/127.0.0.1#7913 ipset=/.bignews.org/gfwlist +server=/.big.one/127.0.0.1#7913 +ipset=/.big.one/gfwlist server=/.bigsound.org/127.0.0.1#7913 ipset=/.bigsound.org/gfwlist server=/.biliworld.com/127.0.0.1#7913 @@ -1030,24 +1030,22 @@ server=/.bipic.net/127.0.0.1#7913 ipset=/.bipic.net/gfwlist server=/.bird.so/127.0.0.1#7913 ipset=/.bird.so/gfwlist -server=/.bit-z.com/127.0.0.1#7913 -ipset=/.bit-z.com/gfwlist -server=/.bit.do/127.0.0.1#7913 -ipset=/.bit.do/gfwlist -server=/.bit.ly/127.0.0.1#7913 -ipset=/.bit.ly/gfwlist server=/.bitc.bme.emory.edu/127.0.0.1#7913 ipset=/.bitc.bme.emory.edu/gfwlist server=/.bitcointalk.org/127.0.0.1#7913 ipset=/.bitcointalk.org/gfwlist server=/.bitcoinworld.com/127.0.0.1#7913 ipset=/.bitcoinworld.com/gfwlist +server=/.bit.do/127.0.0.1#7913 +ipset=/.bit.do/gfwlist server=/.bitfinex.com/127.0.0.1#7913 ipset=/.bitfinex.com/gfwlist server=/.bithumb.com/127.0.0.1#7913 ipset=/.bithumb.com/gfwlist server=/.bitinka.com.ar/127.0.0.1#7913 ipset=/.bitinka.com.ar/gfwlist +server=/.bit.ly/127.0.0.1#7913 +ipset=/.bit.ly/gfwlist server=/.bitmex.com/127.0.0.1#7913 ipset=/.bitmex.com/gfwlist server=/.bitshare.com/127.0.0.1#7913 @@ -1056,6 +1054,8 @@ server=/.bitsnoop.com/127.0.0.1#7913 ipset=/.bitsnoop.com/gfwlist server=/.bitvise.com/127.0.0.1#7913 ipset=/.bitvise.com/gfwlist +server=/.bit-z.com/127.0.0.1#7913 +ipset=/.bit-z.com/gfwlist server=/.bizhat.com/127.0.0.1#7913 ipset=/.bizhat.com/gfwlist server=/.bjnewlife.org/127.0.0.1#7913 @@ -1064,12 +1064,12 @@ server=/.bjs.org/127.0.0.1#7913 ipset=/.bjs.org/gfwlist server=/.bjzc.org/127.0.0.1#7913 ipset=/.bjzc.org/gfwlist -server=/.bl-doujinsouko.com/127.0.0.1#7913 -ipset=/.bl-doujinsouko.com/gfwlist server=/.blacklogic.com/127.0.0.1#7913 ipset=/.blacklogic.com/gfwlist server=/.blackvpn.com/127.0.0.1#7913 ipset=/.blackvpn.com/gfwlist +server=/.bl-doujinsouko.com/127.0.0.1#7913 +ipset=/.bl-doujinsouko.com/gfwlist server=/.blewpass.com/127.0.0.1#7913 ipset=/.blewpass.com/gfwlist server=/.blinkx.com/127.0.0.1#7913 @@ -1082,14 +1082,22 @@ server=/.blockcn.com/127.0.0.1#7913 ipset=/.blockcn.com/gfwlist server=/.blockless.com/127.0.0.1#7913 ipset=/.blockless.com/gfwlist +server=/.blogblog.com/127.0.0.1#7913 +ipset=/.blogblog.com/gfwlist server=/.blog.calibre-ebook.com/127.0.0.1#7913 ipset=/.blog.calibre-ebook.com/gfwlist +server=/.blogcatalog.com/127.0.0.1#7913 +ipset=/.blogcatalog.com/gfwlist +server=/.blogcity.me/127.0.0.1#7913 +ipset=/.blogcity.me/gfwlist server=/.blog.cnyes.com/127.0.0.1#7913 ipset=/.blog.cnyes.com/gfwlist server=/.blog.daum.net/127.0.0.1#7913 ipset=/.blog.daum.net/gfwlist server=/.blog.de/127.0.0.1#7913 ipset=/.blog.de/gfwlist +server=/.blogdns.org/127.0.0.1#7913 +ipset=/.blogdns.org/gfwlist server=/.blog.exblog.co.jp/127.0.0.1#7913 ipset=/.blog.exblog.co.jp/gfwlist server=/.blog.excite.co.jp/127.0.0.1#7913 @@ -1102,10 +1110,14 @@ server=/.blog.foolsmountain.com/127.0.0.1#7913 ipset=/.blog.foolsmountain.com/gfwlist server=/.blog.fuckgfw233.org/127.0.0.1#7913 ipset=/.blog.fuckgfw233.org/gfwlist -server=/.blog.goo.ne.jp/127.0.0.1#7913 -ipset=/.blog.goo.ne.jp/gfwlist +server=/.blogger.com/127.0.0.1#7913 +ipset=/.blogger.com/gfwlist server=/.blog.google/127.0.0.1#7913 ipset=/.blog.google/gfwlist +server=/.blog.goo.ne.jp/127.0.0.1#7913 +ipset=/.blog.goo.ne.jp/gfwlist +server=/.blogimg.jp/127.0.0.1#7913 +ipset=/.blogimg.jp/gfwlist server=/.blog.inoreader.com/127.0.0.1#7913 ipset=/.blog.inoreader.com/gfwlist server=/.blog.istef.info/127.0.0.1#7913 @@ -1118,6 +1130,10 @@ server=/.blog.kangye.org/127.0.0.1#7913 ipset=/.blog.kangye.org/gfwlist server=/.blog.lester850.info/127.0.0.1#7913 ipset=/.blog.lester850.info/gfwlist +server=/.bloglines.com/127.0.0.1#7913 +ipset=/.bloglines.com/gfwlist +server=/.bloglovin.com/127.0.0.1#7913 +ipset=/.bloglovin.com/gfwlist server=/.blog.martinoei.com/127.0.0.1#7913 ipset=/.blog.martinoei.com/gfwlist server=/.blog.pathtosharepoint.com/127.0.0.1#7913 @@ -1128,18 +1144,38 @@ server=/.blog.qooza.hk/127.0.0.1#7913 ipset=/.blog.qooza.hk/gfwlist server=/.blog.ranxiang.com/127.0.0.1#7913 ipset=/.blog.ranxiang.com/gfwlist +server=/.blogs.icerocket.com/127.0.0.1#7913 +ipset=/.blogs.icerocket.com/gfwlist server=/.blog.sina.com.tw/127.0.0.1#7913 ipset=/.blog.sina.com.tw/gfwlist +server=/.blogs.libraryinformationtechnology.com/127.0.0.1#7913 +ipset=/.blogs.libraryinformationtechnology.com/gfwlist server=/.blog.sogoo.org/127.0.0.1#7913 ipset=/.blog.sogoo.org/gfwlist server=/.blog.soylent.com/127.0.0.1#7913 ipset=/.blog.soylent.com/gfwlist +server=/.blogspot.com/127.0.0.1#7913 +ipset=/.blogspot.com/gfwlist +server=/.blogspot.hk/127.0.0.1#7913 +ipset=/.blogspot.hk/gfwlist +server=/.blogspot.jp/127.0.0.1#7913 +ipset=/.blogspot.jp/gfwlist +server=/.blogspot.tw/127.0.0.1#7913 +ipset=/.blogspot.tw/gfwlist +server=/.blogs.tampabay.com/127.0.0.1#7913 +ipset=/.blogs.tampabay.com/gfwlist +server=/.blogs.yahoo.co.jp/127.0.0.1#7913 +ipset=/.blogs.yahoo.co.jp/gfwlist server=/.blog.syx86.cn/127.0.0.1#7913 ipset=/.blog.syx86.cn/gfwlist server=/.blog.syx86.com/127.0.0.1#7913 ipset=/.blog.syx86.com/gfwlist server=/.blog.taragana.com/127.0.0.1#7913 ipset=/.blog.taragana.com/gfwlist +server=/.blogtd.net/127.0.0.1#7913 +ipset=/.blogtd.net/gfwlist +server=/.blogtd.org/127.0.0.1#7913 +ipset=/.blogtd.org/gfwlist server=/.blog.tiney.com/127.0.0.1#7913 ipset=/.blog.tiney.com/gfwlist server=/.blog.workflow.is/127.0.0.1#7913 @@ -1150,42 +1186,6 @@ server=/.blog.youthwant.com.tw/127.0.0.1#7913 ipset=/.blog.youthwant.com.tw/gfwlist server=/.blog.youxu.info/127.0.0.1#7913 ipset=/.blog.youxu.info/gfwlist -server=/.blogblog.com/127.0.0.1#7913 -ipset=/.blogblog.com/gfwlist -server=/.blogcatalog.com/127.0.0.1#7913 -ipset=/.blogcatalog.com/gfwlist -server=/.blogcity.me/127.0.0.1#7913 -ipset=/.blogcity.me/gfwlist -server=/.blogdns.org/127.0.0.1#7913 -ipset=/.blogdns.org/gfwlist -server=/.blogger.com/127.0.0.1#7913 -ipset=/.blogger.com/gfwlist -server=/.blogimg.jp/127.0.0.1#7913 -ipset=/.blogimg.jp/gfwlist -server=/.bloglines.com/127.0.0.1#7913 -ipset=/.bloglines.com/gfwlist -server=/.bloglovin.com/127.0.0.1#7913 -ipset=/.bloglovin.com/gfwlist -server=/.blogs.icerocket.com/127.0.0.1#7913 -ipset=/.blogs.icerocket.com/gfwlist -server=/.blogs.libraryinformationtechnology.com/127.0.0.1#7913 -ipset=/.blogs.libraryinformationtechnology.com/gfwlist -server=/.blogs.tampabay.com/127.0.0.1#7913 -ipset=/.blogs.tampabay.com/gfwlist -server=/.blogs.yahoo.co.jp/127.0.0.1#7913 -ipset=/.blogs.yahoo.co.jp/gfwlist -server=/.blogspot.com/127.0.0.1#7913 -ipset=/.blogspot.com/gfwlist -server=/.blogspot.hk/127.0.0.1#7913 -ipset=/.blogspot.hk/gfwlist -server=/.blogspot.jp/127.0.0.1#7913 -ipset=/.blogspot.jp/gfwlist -server=/.blogspot.tw/127.0.0.1#7913 -ipset=/.blogspot.tw/gfwlist -server=/.blogtd.net/127.0.0.1#7913 -ipset=/.blogtd.net/gfwlist -server=/.blogtd.org/127.0.0.1#7913 -ipset=/.blogtd.org/gfwlist server=/.bloodshed.net/127.0.0.1#7913 ipset=/.bloodshed.net/gfwlist server=/.bloomberg.cn/127.0.0.1#7913 @@ -1230,32 +1230,32 @@ server=/.boobstagram.com/127.0.0.1#7913 ipset=/.boobstagram.com/gfwlist server=/.book.com.tw/127.0.0.1#7913 ipset=/.book.com.tw/gfwlist -server=/.book.zi5.me/127.0.0.1#7913 -ipset=/.book.zi5.me/gfwlist server=/.bookepub.com/127.0.0.1#7913 ipset=/.bookepub.com/gfwlist server=/.books.com.tw/127.0.0.1#7913 ipset=/.books.com.tw/gfwlist server=/.booktopia.com.au/127.0.0.1#7913 ipset=/.booktopia.com.au/gfwlist +server=/.book.zi5.me/127.0.0.1#7913 +ipset=/.book.zi5.me/gfwlist server=/.boomssr.com/127.0.0.1#7913 ipset=/.boomssr.com/gfwlist -server=/.bot.nu/127.0.0.1#7913 -ipset=/.bot.nu/gfwlist server=/.botanwang.com/127.0.0.1#7913 ipset=/.botanwang.com/gfwlist +server=/.bot.nu/127.0.0.1#7913 +ipset=/.bot.nu/gfwlist server=/.bowenpress.com/127.0.0.1#7913 ipset=/.bowenpress.com/gfwlist server=/.boxpn.com/127.0.0.1#7913 ipset=/.boxpn.com/gfwlist -server=/.boxun.com/127.0.0.1#7913 -ipset=/.boxun.com/gfwlist -server=/.boxun.tv/127.0.0.1#7913 -ipset=/.boxun.tv/gfwlist server=/.boxunblog.com/127.0.0.1#7913 ipset=/.boxunblog.com/gfwlist server=/.boxunclub.com/127.0.0.1#7913 ipset=/.boxunclub.com/gfwlist +server=/.boxun.com/127.0.0.1#7913 +ipset=/.boxun.com/gfwlist +server=/.boxun.tv/127.0.0.1#7913 +ipset=/.boxun.tv/gfwlist server=/.boyangu.com/127.0.0.1#7913 ipset=/.boyangu.com/gfwlist server=/.boyfriendtv.com/127.0.0.1#7913 @@ -1264,10 +1264,6 @@ server=/.boysfood.com/127.0.0.1#7913 ipset=/.boysfood.com/gfwlist server=/.boysmaster.com/127.0.0.1#7913 ipset=/.boysmaster.com/gfwlist -server=/.br.hao123.com/127.0.0.1#7913 -ipset=/.br.hao123.com/gfwlist -server=/.br.st/127.0.0.1#7913 -ipset=/.br.st/gfwlist server=/.brainyquote.com/127.0.0.1#7913 ipset=/.brainyquote.com/gfwlist server=/.brandonhutchinson.com/127.0.0.1#7913 @@ -1288,6 +1284,8 @@ server=/.breakingtweets.com/127.0.0.1#7913 ipset=/.breakingtweets.com/gfwlist server=/.breakwall.net/127.0.0.1#7913 ipset=/.breakwall.net/gfwlist +server=/.br.hao123.com/127.0.0.1#7913 +ipset=/.br.hao123.com/gfwlist server=/.briefdream.com/127.0.0.1#7913 ipset=/.briefdream.com/gfwlist server=/.briian.com/127.0.0.1#7913 @@ -1300,6 +1298,8 @@ server=/.broadbook.com/127.0.0.1#7913 ipset=/.broadbook.com/gfwlist server=/.broadpressinc.com/127.0.0.1#7913 ipset=/.broadpressinc.com/gfwlist +server=/.br.st/127.0.0.1#7913 +ipset=/.br.st/gfwlist server=/.brucewang.net/127.0.0.1#7913 ipset=/.brucewang.net/gfwlist server=/.brutaltgp.com/127.0.0.1#7913 @@ -1336,10 +1336,10 @@ server=/.buddhistchannel.tv/127.0.0.1#7913 ipset=/.buddhistchannel.tv/gfwlist server=/.buffered.com/127.0.0.1#7913 ipset=/.buffered.com/gfwlist -server=/.bullog.org/127.0.0.1#7913 -ipset=/.bullog.org/gfwlist server=/.bullogger.com/127.0.0.1#7913 ipset=/.bullogger.com/gfwlist +server=/.bullog.org/127.0.0.1#7913 +ipset=/.bullog.org/gfwlist server=/.bunbunhk.com/127.0.0.1#7913 ipset=/.bunbunhk.com/gfwlist server=/.busayari.com/127.0.0.1#7913 @@ -1378,10 +1378,6 @@ server=/.bx.tl/127.0.0.1#7913 ipset=/.bx.tl/gfwlist server=/.bynet.co.il/127.0.0.1#7913 ipset=/.bynet.co.il/gfwlist -server=/.c-est-simple.com/127.0.0.1#7913 -ipset=/.c-est-simple.com/gfwlist -server=/.c-spanvideo.org/127.0.0.1#7913 -ipset=/.c-spanvideo.org/gfwlist server=/.c100tibet.org/127.0.0.1#7913 ipset=/.c100tibet.org/gfwlist server=/.c1522.mooo.com/127.0.0.1#7913 @@ -1428,12 +1424,12 @@ server=/.canalporno.com/127.0.0.1#7913 ipset=/.canalporno.com/gfwlist server=/.canyu.org/127.0.0.1#7913 ipset=/.canyu.org/gfwlist -server=/.cao.im/127.0.0.1#7913 -ipset=/.cao.im/gfwlist server=/.caobian.info/127.0.0.1#7913 ipset=/.caobian.info/gfwlist server=/.caochangqing.com/127.0.0.1#7913 ipset=/.caochangqing.com/gfwlist +server=/.cao.im/127.0.0.1#7913 +ipset=/.cao.im/gfwlist server=/.cap.org.hk/127.0.0.1#7913 ipset=/.cap.org.hk/gfwlist server=/.carabinasypistolas.com/127.0.0.1#7913 @@ -1442,10 +1438,10 @@ server=/.cardinalkungfoundation.org/127.0.0.1#7913 ipset=/.cardinalkungfoundation.org/gfwlist server=/.carfax.com/127.0.0.1#7913 ipset=/.carfax.com/gfwlist -server=/.cari.com.my/127.0.0.1#7913 -ipset=/.cari.com.my/gfwlist server=/.caribbeancom.com/127.0.0.1#7913 ipset=/.caribbeancom.com/gfwlist +server=/.cari.com.my/127.0.0.1#7913 +ipset=/.cari.com.my/gfwlist server=/.carmotorshow.com/127.0.0.1#7913 ipset=/.carmotorshow.com/gfwlist server=/.cartoonmovement.com/127.0.0.1#7913 @@ -1454,14 +1450,14 @@ server=/.casadeltibetbcn.org/127.0.0.1#7913 ipset=/.casadeltibetbcn.org/gfwlist server=/.casatibet.org.mx/127.0.0.1#7913 ipset=/.casatibet.org.mx/gfwlist -server=/.casino.williamhill.com/127.0.0.1#7913 -ipset=/.casino.williamhill.com/gfwlist server=/.casinobellini.com/127.0.0.1#7913 ipset=/.casinobellini.com/gfwlist server=/.casinoking.com/127.0.0.1#7913 ipset=/.casinoking.com/gfwlist server=/.casinoriva.com/127.0.0.1#7913 ipset=/.casinoriva.com/gfwlist +server=/.casino.williamhill.com/127.0.0.1#7913 +ipset=/.casino.williamhill.com/gfwlist server=/.castbox.fm/127.0.0.1#7913 ipset=/.castbox.fm/gfwlist server=/.catch22.net/127.0.0.1#7913 @@ -1480,10 +1476,10 @@ server=/.cattt.com/127.0.0.1#7913 ipset=/.cattt.com/gfwlist server=/.cbc.ca/127.0.0.1#7913 ipset=/.cbc.ca/gfwlist -server=/.cbs.ntu.edu.tw/127.0.0.1#7913 -ipset=/.cbs.ntu.edu.tw/gfwlist server=/.cbsnews.com/127.0.0.1#7913 ipset=/.cbsnews.com/gfwlist +server=/.cbs.ntu.edu.tw/127.0.0.1#7913 +ipset=/.cbs.ntu.edu.tw/gfwlist server=/.cbtc.org.hk/127.0.0.1#7913 ipset=/.cbtc.org.hk/gfwlist server=/.cccat.cc/127.0.0.1#7913 @@ -1498,10 +1494,10 @@ server=/.ccim.org/127.0.0.1#7913 ipset=/.ccim.org/gfwlist server=/.cclife.ca/127.0.0.1#7913 ipset=/.cclife.ca/gfwlist -server=/.cclife.org/127.0.0.1#7913 -ipset=/.cclife.org/gfwlist server=/.cclifefl.org/127.0.0.1#7913 ipset=/.cclifefl.org/gfwlist +server=/.cclife.org/127.0.0.1#7913 +ipset=/.cclife.org/gfwlist server=/.ccthere.com/127.0.0.1#7913 ipset=/.ccthere.com/gfwlist server=/.ccthere.net/127.0.0.1#7913 @@ -1528,26 +1524,26 @@ server=/.cdig.info/127.0.0.1#7913 ipset=/.cdig.info/gfwlist server=/.cdjp.org/127.0.0.1#7913 ipset=/.cdjp.org/gfwlist +server=/.cdn1.lp.saboom.com/127.0.0.1#7913 +ipset=/.cdn1.lp.saboom.com/gfwlist server=/.cdn-apple.com/127.0.0.1#7913 ipset=/.cdn-apple.com/gfwlist -server=/.cdn-images.mailchimp.com/127.0.0.1#7913 -ipset=/.cdn-images.mailchimp.com/gfwlist server=/.cdn.assets.lfpcontent.com/127.0.0.1#7913 ipset=/.cdn.assets.lfpcontent.com/gfwlist +server=/.cdnews.com.tw/127.0.0.1#7913 +ipset=/.cdnews.com.tw/gfwlist server=/.cdn.helixstudios.net/127.0.0.1#7913 ipset=/.cdn.helixstudios.net/gfwlist +server=/.cdn-images.mailchimp.com/127.0.0.1#7913 +ipset=/.cdn-images.mailchimp.com/gfwlist +server=/.cdninstagram.com/127.0.0.1#7913 +ipset=/.cdninstagram.com/gfwlist server=/.cdn.printfriendly.com/127.0.0.1#7913 ipset=/.cdn.printfriendly.com/gfwlist server=/.cdn.seatguru.com/127.0.0.1#7913 ipset=/.cdn.seatguru.com/gfwlist server=/.cdn.softlayer.net/127.0.0.1#7913 ipset=/.cdn.softlayer.net/gfwlist -server=/.cdn1.lp.saboom.com/127.0.0.1#7913 -ipset=/.cdn1.lp.saboom.com/gfwlist -server=/.cdnews.com.tw/127.0.0.1#7913 -ipset=/.cdnews.com.tw/gfwlist -server=/.cdninstagram.com/127.0.0.1#7913 -ipset=/.cdninstagram.com/gfwlist server=/.cdp1989.org/127.0.0.1#7913 ipset=/.cdp1989.org/gfwlist server=/.cdp1998.org/127.0.0.1#7913 @@ -1580,10 +1576,12 @@ server=/.centralnation.com/127.0.0.1#7913 ipset=/.centralnation.com/gfwlist server=/.centurys.net/127.0.0.1#7913 ipset=/.centurys.net/gfwlist -server=/.certificate-transparency.org/127.0.0.1#7913 -ipset=/.certificate-transparency.org/gfwlist server=/.certificate.revocationcheck.com/127.0.0.1#7913 ipset=/.certificate.revocationcheck.com/gfwlist +server=/.certificate-transparency.org/127.0.0.1#7913 +ipset=/.certificate-transparency.org/gfwlist +server=/.c-est-simple.com/127.0.0.1#7913 +ipset=/.c-est-simple.com/gfwlist server=/.cfhks.org.hk/127.0.0.1#7913 ipset=/.cfhks.org.hk/gfwlist server=/.cfos.de/127.0.0.1#7913 @@ -1594,16 +1592,14 @@ server=/.cgdepot.org/127.0.0.1#7913 ipset=/.cgdepot.org/gfwlist server=/.cgst.edu/127.0.0.1#7913 ipset=/.cgst.edu/gfwlist -server=/.ch.shvoong.com/127.0.0.1#7913 -ipset=/.ch.shvoong.com/gfwlist -server=/.change.org/127.0.0.1#7913 -ipset=/.change.org/gfwlist server=/.changeip.name/127.0.0.1#7913 ipset=/.changeip.name/gfwlist server=/.changeip.net/127.0.0.1#7913 ipset=/.changeip.net/gfwlist server=/.changeip.org/127.0.0.1#7913 ipset=/.changeip.org/gfwlist +server=/.change.org/127.0.0.1#7913 +ipset=/.change.org/gfwlist server=/.changp.com/127.0.0.1#7913 ipset=/.changp.com/gfwlist server=/.changsa.net/127.0.0.1#7913 @@ -1634,20 +1630,6 @@ server=/.chhongbi.org/127.0.0.1#7913 ipset=/.chhongbi.org/gfwlist server=/.chicagoncmtv.com/127.0.0.1#7913 ipset=/.chicagoncmtv.com/gfwlist -server=/.china-mmm.jp.net/127.0.0.1#7913 -ipset=/.china-mmm.jp.net/gfwlist -server=/.china-mmm.net/127.0.0.1#7913 -ipset=/.china-mmm.net/gfwlist -server=/.china-mmm.sa.com/127.0.0.1#7913 -ipset=/.china-mmm.sa.com/gfwlist -server=/.china-review.com.ua/127.0.0.1#7913 -ipset=/.china-review.com.ua/gfwlist -server=/.china-week.com/127.0.0.1#7913 -ipset=/.china-week.com/gfwlist -server=/.china.hket.com/127.0.0.1#7913 -ipset=/.china.hket.com/gfwlist -server=/.china.ucanews.com/127.0.0.1#7913 -ipset=/.china.ucanews.com/gfwlist server=/.china101.com/127.0.0.1#7913 ipset=/.china101.com/gfwlist server=/.china18.org/127.0.0.1#7913 @@ -1696,6 +1678,8 @@ server=/.chinagonet.com/127.0.0.1#7913 ipset=/.chinagonet.com/gfwlist server=/.chinagreenparty.org/127.0.0.1#7913 ipset=/.chinagreenparty.org/gfwlist +server=/.china.hket.com/127.0.0.1#7913 +ipset=/.china.hket.com/gfwlist server=/.chinahorizon.org/127.0.0.1#7913 ipset=/.chinahorizon.org/gfwlist server=/.chinahush.com/127.0.0.1#7913 @@ -1710,6 +1694,12 @@ server=/.chinalawandpolicy.com/127.0.0.1#7913 ipset=/.chinalawandpolicy.com/gfwlist server=/.chinalawtranslate.com/127.0.0.1#7913 ipset=/.chinalawtranslate.com/gfwlist +server=/.china-mmm.jp.net/127.0.0.1#7913 +ipset=/.china-mmm.jp.net/gfwlist +server=/.china-mmm.net/127.0.0.1#7913 +ipset=/.china-mmm.net/gfwlist +server=/.china-mmm.sa.com/127.0.0.1#7913 +ipset=/.china-mmm.sa.com/gfwlist server=/.chinamule.com/127.0.0.1#7913 ipset=/.chinamule.com/gfwlist server=/.chinamz.org/127.0.0.1#7913 @@ -1720,6 +1710,8 @@ server=/.chinapost.com.tw/127.0.0.1#7913 ipset=/.chinapost.com.tw/gfwlist server=/.chinapress.com.my/127.0.0.1#7913 ipset=/.chinapress.com.my/gfwlist +server=/.china-review.com.ua/127.0.0.1#7913 +ipset=/.china-review.com.ua/gfwlist server=/.chinarightsia.org/127.0.0.1#7913 ipset=/.chinarightsia.org/gfwlist server=/.chinasmile.net/127.0.0.1#7913 @@ -1738,10 +1730,14 @@ server=/.chinatown.com.au/127.0.0.1#7913 ipset=/.chinatown.com.au/gfwlist server=/.chinatweeps.com/127.0.0.1#7913 ipset=/.chinatweeps.com/gfwlist +server=/.china.ucanews.com/127.0.0.1#7913 +ipset=/.china.ucanews.com/gfwlist server=/.chinaview.wordpress.com/127.0.0.1#7913 ipset=/.chinaview.wordpress.com/gfwlist server=/.chinaway.org/127.0.0.1#7913 ipset=/.chinaway.org/gfwlist +server=/.china-week.com/127.0.0.1#7913 +ipset=/.china-week.com/gfwlist server=/.chinaworker.info/127.0.0.1#7913 ipset=/.chinaworker.info/gfwlist server=/.chinaxchina.com/127.0.0.1#7913 @@ -1750,34 +1746,34 @@ server=/.chinayouth.org.hk/127.0.0.1#7913 ipset=/.chinayouth.org.hk/gfwlist server=/.chinayuanmin.org/127.0.0.1#7913 ipset=/.chinayuanmin.org/gfwlist -server=/.chinese-hermit.net/127.0.0.1#7913 -ipset=/.chinese-hermit.net/gfwlist -server=/.chinese-leaders.org/127.0.0.1#7913 -ipset=/.chinese-leaders.org/gfwlist -server=/.chinese-memorial.org/127.0.0.1#7913 -ipset=/.chinese-memorial.org/gfwlist -server=/.chinese.donga.com/127.0.0.1#7913 -ipset=/.chinese.donga.com/gfwlist -server=/.chinese.engadget.com/127.0.0.1#7913 -ipset=/.chinese.engadget.com/gfwlist -server=/.chinese.irib.ir/127.0.0.1#7913 -ipset=/.chinese.irib.ir/gfwlist -server=/.chinese.soifind.com/127.0.0.1#7913 -ipset=/.chinese.soifind.com/gfwlist server=/.chinesedaily.com/127.0.0.1#7913 ipset=/.chinesedaily.com/gfwlist server=/.chinesedailynews.com/127.0.0.1#7913 ipset=/.chinesedailynews.com/gfwlist server=/.chinesedemocracy.com/127.0.0.1#7913 ipset=/.chinesedemocracy.com/gfwlist +server=/.chinese.donga.com/127.0.0.1#7913 +ipset=/.chinese.donga.com/gfwlist +server=/.chinese.engadget.com/127.0.0.1#7913 +ipset=/.chinese.engadget.com/gfwlist server=/.chinesegay.org/127.0.0.1#7913 ipset=/.chinesegay.org/gfwlist +server=/.chinese-hermit.net/127.0.0.1#7913 +ipset=/.chinese-hermit.net/gfwlist +server=/.chinese.irib.ir/127.0.0.1#7913 +ipset=/.chinese.irib.ir/gfwlist +server=/.chinese-leaders.org/127.0.0.1#7913 +ipset=/.chinese-leaders.org/gfwlist +server=/.chinese-memorial.org/127.0.0.1#7913 +ipset=/.chinese-memorial.org/gfwlist server=/.chinesen.de/127.0.0.1#7913 ipset=/.chinesen.de/gfwlist server=/.chinesenews.net.au/127.0.0.1#7913 ipset=/.chinesenews.net.au/gfwlist server=/.chinesepen.org/127.0.0.1#7913 ipset=/.chinesepen.org/gfwlist +server=/.chinese.soifind.com/127.0.0.1#7913 +ipset=/.chinese.soifind.com/gfwlist server=/.chinesetalks.net/127.0.0.1#7913 ipset=/.chinesetalks.net/gfwlist server=/.chineseupress.com/127.0.0.1#7913 @@ -1804,10 +1800,10 @@ server=/.christusrex.org/127.0.0.1#7913 ipset=/.christusrex.org/gfwlist server=/.chrlawyers.hk/127.0.0.1#7913 ipset=/.chrlawyers.hk/gfwlist -server=/.chrome.com/127.0.0.1#7913 -ipset=/.chrome.com/gfwlist server=/.chromecast.com/127.0.0.1#7913 ipset=/.chromecast.com/gfwlist +server=/.chrome.com/127.0.0.1#7913 +ipset=/.chrome.com/gfwlist server=/.chromeexperiments.com/127.0.0.1#7913 ipset=/.chromeexperiments.com/gfwlist server=/.chromercise.com/127.0.0.1#7913 @@ -1816,6 +1812,8 @@ server=/.chromestatus.com/127.0.0.1#7913 ipset=/.chromestatus.com/gfwlist server=/.chromium.org/127.0.0.1#7913 ipset=/.chromium.org/gfwlist +server=/.ch.shvoong.com/127.0.0.1#7913 +ipset=/.ch.shvoong.com/gfwlist server=/.chuang-yen.org/127.0.0.1#7913 ipset=/.chuang-yen.org/gfwlist server=/.chubold.com/127.0.0.1#7913 @@ -1866,14 +1864,14 @@ server=/.civilmedia.tw/127.0.0.1#7913 ipset=/.civilmedia.tw/gfwlist server=/.ck101.com/127.0.0.1#7913 ipset=/.ck101.com/gfwlist -server=/.cl.d0z.net/127.0.0.1#7913 -ipset=/.cl.d0z.net/gfwlist server=/.clarionproject.org/127.0.0.1#7913 ipset=/.clarionproject.org/gfwlist server=/.classicalguitarblog.net/127.0.0.1#7913 ipset=/.classicalguitarblog.net/gfwlist server=/.clb.org.hk/127.0.0.1#7913 ipset=/.clb.org.hk/gfwlist +server=/.cl.d0z.net/127.0.0.1#7913 +ipset=/.cl.d0z.net/gfwlist server=/.cldr.unicode.org/127.0.0.1#7913 ipset=/.cldr.unicode.org/gfwlist server=/.cleansite.biz/127.0.0.1#7913 @@ -1920,12 +1918,24 @@ server=/.cmule.org/127.0.0.1#7913 ipset=/.cmule.org/gfwlist server=/.cmx.im/127.0.0.1#7913 ipset=/.cmx.im/gfwlist -server=/.cn-proxy.com/127.0.0.1#7913 -ipset=/.cn-proxy.com/gfwlist +server=/.cn2.streetvoice.com/127.0.0.1#7913 +ipset=/.cn2.streetvoice.com/gfwlist +server=/.cn6.eu/127.0.0.1#7913 +ipset=/.cn6.eu/gfwlist +server=/.cnabc.com/127.0.0.1#7913 +ipset=/.cnabc.com/gfwlist +server=/.cna.com.tw/127.0.0.1#7913 +ipset=/.cna.com.tw/gfwlist +server=/.cnbbnews.wordpress.com/127.0.0.1#7913 +ipset=/.cnbbnews.wordpress.com/gfwlist server=/.cn.calameo.com/127.0.0.1#7913 ipset=/.cn.calameo.com/gfwlist server=/.cn.dayabook.com/127.0.0.1#7913 ipset=/.cn.dayabook.com/gfwlist +server=/.cnd.org/127.0.0.1#7913 +ipset=/.cnd.org/gfwlist +server=/.cnex.org.cn/127.0.0.1#7913 +ipset=/.cnex.org.cn/gfwlist server=/.cn.fmnnow.com/127.0.0.1#7913 ipset=/.cn.fmnnow.com/gfwlist server=/.cn.freeones.com/127.0.0.1#7913 @@ -1934,8 +1944,20 @@ server=/.cn.giganews.com/127.0.0.1#7913 ipset=/.cn.giganews.com/gfwlist server=/.cn.ibtimes.com/127.0.0.1#7913 ipset=/.cn.ibtimes.com/gfwlist +server=/.cnineu.com/127.0.0.1#7913 +ipset=/.cnineu.com/gfwlist +server=/.cnn.com/127.0.0.1#7913 +ipset=/.cnn.com/gfwlist +server=/.cnnews.chosun.com/127.0.0.1#7913 +ipset=/.cnnews.chosun.com/gfwlist server=/.cn.nytstyle.com/127.0.0.1#7913 ipset=/.cn.nytstyle.com/gfwlist +server=/.cnpolitics.org/127.0.0.1#7913 +ipset=/.cnpolitics.org/gfwlist +server=/.cn-proxy.com/127.0.0.1#7913 +server=/.cnproxy.com/127.0.0.1#7913 +ipset=/.cn-proxy.com/gfwlist +ipset=/.cnproxy.com/gfwlist server=/.cn.sandscotaicentral.com/127.0.0.1#7913 ipset=/.cn.sandscotaicentral.com/gfwlist server=/.cn.shafaqna.com/127.0.0.1#7913 @@ -1950,32 +1972,6 @@ server=/.cn.uptodown.com/127.0.0.1#7913 ipset=/.cn.uptodown.com/gfwlist server=/.cn.voa.mobi/127.0.0.1#7913 ipset=/.cn.voa.mobi/gfwlist -server=/.cn2.streetvoice.com/127.0.0.1#7913 -ipset=/.cn2.streetvoice.com/gfwlist -server=/.cn6.eu/127.0.0.1#7913 -ipset=/.cn6.eu/gfwlist -server=/.cna.com.tw/127.0.0.1#7913 -ipset=/.cna.com.tw/gfwlist -server=/.cnabc.com/127.0.0.1#7913 -ipset=/.cnabc.com/gfwlist -server=/.cnbbnews.wordpress.com/127.0.0.1#7913 -ipset=/.cnbbnews.wordpress.com/gfwlist -server=/.cnd.org/127.0.0.1#7913 -ipset=/.cnd.org/gfwlist -server=/.cnex.org.cn/127.0.0.1#7913 -ipset=/.cnex.org.cn/gfwlist -server=/.cnineu.com/127.0.0.1#7913 -ipset=/.cnineu.com/gfwlist -server=/.cnn.com/127.0.0.1#7913 -ipset=/.cnn.com/gfwlist -server=/.cnnews.chosun.com/127.0.0.1#7913 -ipset=/.cnnews.chosun.com/gfwlist -server=/.cnpolitics.org/127.0.0.1#7913 -ipset=/.cnpolitics.org/gfwlist -server=/.cnproxy.com/127.0.0.1#7913 -ipset=/.cnproxy.com/gfwlist -server=/.co.ng.mil/127.0.0.1#7913 -ipset=/.co.ng.mil/gfwlist server=/.coat.co.jp/127.0.0.1#7913 ipset=/.coat.co.jp/gfwlist server=/.cobinhood.com/127.0.0.1#7913 @@ -2012,10 +2008,10 @@ server=/.collateralmurder.com/127.0.0.1#7913 ipset=/.collateralmurder.com/gfwlist server=/.collateralmurder.org/127.0.0.1#7913 ipset=/.collateralmurder.org/gfwlist -server=/.com.google/127.0.0.1#7913 -ipset=/.com.google/gfwlist server=/.comefromchina.com/127.0.0.1#7913 ipset=/.comefromchina.com/gfwlist +server=/.com.google/127.0.0.1#7913 +ipset=/.com.google/gfwlist server=/.comic-mega.me/127.0.0.1#7913 ipset=/.comic-mega.me/gfwlist server=/.commandarms.com/127.0.0.1#7913 @@ -2024,14 +2020,16 @@ server=/.commentshk.com/127.0.0.1#7913 ipset=/.commentshk.com/gfwlist server=/.communistcrimes.org/127.0.0.1#7913 ipset=/.communistcrimes.org/gfwlist -server=/.community.windy.com/127.0.0.1#7913 -ipset=/.community.windy.com/gfwlist server=/.communitychoicecu.com/127.0.0.1#7913 ipset=/.communitychoicecu.com/gfwlist +server=/.community.windy.com/127.0.0.1#7913 +ipset=/.community.windy.com/gfwlist server=/.compileheart.com/127.0.0.1#7913 ipset=/.compileheart.com/gfwlist server=/.compress.to/127.0.0.1#7913 ipset=/.compress.to/gfwlist +server=/.co.ng.mil/127.0.0.1#7913 +ipset=/.co.ng.mil/gfwlist server=/.connect.facebook.net/127.0.0.1#7913 ipset=/.connect.facebook.net/gfwlist server=/.conoha.jp/127.0.0.1#7913 @@ -2056,10 +2054,10 @@ server=/.coolstuffinc.com/127.0.0.1#7913 ipset=/.coolstuffinc.com/gfwlist server=/.corumcollege.com/127.0.0.1#7913 ipset=/.corumcollege.com/gfwlist -server=/.cos-moe.com/127.0.0.1#7913 -ipset=/.cos-moe.com/gfwlist server=/.cosmic.monar.ch/127.0.0.1#7913 ipset=/.cosmic.monar.ch/gfwlist +server=/.cos-moe.com/127.0.0.1#7913 +ipset=/.cos-moe.com/gfwlist server=/.cosplayjav.pl/127.0.0.1#7913 ipset=/.cosplayjav.pl/gfwlist server=/.costco.com/127.0.0.1#7913 @@ -2087,9 +2085,9 @@ ipset=/.crchina.org/gfwlist server=/.crd-net.org/127.0.0.1#7913 ipset=/.crd-net.org/gfwlist server=/.creaders.net/127.0.0.1#7913 -ipset=/.creaders.net/gfwlist server=/.creadersnet.com/127.0.0.1#7913 ipset=/.creadersnet.com/gfwlist +ipset=/.creaders.net/gfwlist server=/.creativelab5.com/127.0.0.1#7913 ipset=/.creativelab5.com/gfwlist server=/.crisisresponse.google/127.0.0.1#7913 @@ -2110,14 +2108,14 @@ server=/.crucial.com/127.0.0.1#7913 ipset=/.crucial.com/gfwlist server=/.csdparty.com/127.0.0.1#7913 ipset=/.csdparty.com/gfwlist +server=/.c-spanvideo.org/127.0.0.1#7913 +ipset=/.c-spanvideo.org/gfwlist server=/.css.pixnet.in/127.0.0.1#7913 ipset=/.css.pixnet.in/gfwlist server=/.csuchen.de/127.0.0.1#7913 ipset=/.csuchen.de/gfwlist server=/.csw.org.uk/127.0.0.1#7913 ipset=/.csw.org.uk/gfwlist -server=/.ct.org.tw/127.0.0.1#7913 -ipset=/.ct.org.tw/gfwlist server=/.ctao.org/127.0.0.1#7913 ipset=/.ctao.org/gfwlist server=/.ctfriend.net/127.0.0.1#7913 @@ -2126,6 +2124,8 @@ server=/.cthlo.github.io/127.0.0.1#7913 ipset=/.cthlo.github.io/gfwlist server=/.ctitv.com.tw/127.0.0.1#7913 ipset=/.ctitv.com.tw/gfwlist +server=/.ct.org.tw/127.0.0.1#7913 +ipset=/.ct.org.tw/gfwlist server=/.cts.com.tw/127.0.0.1#7913 ipset=/.cts.com.tw/gfwlist server=/.cuhkacs.org/127.0.0.1#7913 @@ -2154,8 +2154,6 @@ server=/.cynscribe.com/127.0.0.1#7913 ipset=/.cynscribe.com/gfwlist server=/.cytode.us/127.0.0.1#7913 ipset=/.cytode.us/gfwlist -server=/.d-fukyu.com/127.0.0.1#7913 -ipset=/.d-fukyu.com/gfwlist server=/.d100.net/127.0.0.1#7913 ipset=/.d100.net/gfwlist server=/.d1b183sg0nvnuh.cloudfront.net/127.0.0.1#7913 @@ -2214,20 +2212,14 @@ server=/.dajiyuan.eu/127.0.0.1#7913 ipset=/.dajiyuan.eu/gfwlist server=/.dajusha.baywords.com/127.0.0.1#7913 ipset=/.dajusha.baywords.com/gfwlist -server=/.dalailama-archives.org/127.0.0.1#7913 -ipset=/.dalailama-archives.org/gfwlist -server=/.dalailama.com/127.0.0.1#7913 -ipset=/.dalailama.com/gfwlist -server=/.dalailama.mn/127.0.0.1#7913 -ipset=/.dalailama.mn/gfwlist -server=/.dalailama.ru/127.0.0.1#7913 -ipset=/.dalailama.ru/gfwlist -server=/.dalailama.usc.edu/127.0.0.1#7913 -ipset=/.dalailama.usc.edu/gfwlist server=/.dalailama80.org/127.0.0.1#7913 ipset=/.dalailama80.org/gfwlist +server=/.dalailama-archives.org/127.0.0.1#7913 +ipset=/.dalailama-archives.org/gfwlist server=/.dalailamacenter.org/127.0.0.1#7913 ipset=/.dalailamacenter.org/gfwlist +server=/.dalailama.com/127.0.0.1#7913 +ipset=/.dalailama.com/gfwlist server=/.dalailamafellows.org/127.0.0.1#7913 ipset=/.dalailamafellows.org/gfwlist server=/.dalailamafilm.com/127.0.0.1#7913 @@ -2240,12 +2232,18 @@ server=/.dalailamainaustralia.org/127.0.0.1#7913 ipset=/.dalailamainaustralia.org/gfwlist server=/.dalailamajapanese.com/127.0.0.1#7913 ipset=/.dalailamajapanese.com/gfwlist +server=/.dalailama.mn/127.0.0.1#7913 +ipset=/.dalailama.mn/gfwlist server=/.dalailamaprotesters.info/127.0.0.1#7913 ipset=/.dalailamaprotesters.info/gfwlist server=/.dalailamaquotes.org/127.0.0.1#7913 ipset=/.dalailamaquotes.org/gfwlist +server=/.dalailama.ru/127.0.0.1#7913 +ipset=/.dalailama.ru/gfwlist server=/.dalailamatrust.org/127.0.0.1#7913 ipset=/.dalailamatrust.org/gfwlist +server=/.dalailama.usc.edu/127.0.0.1#7913 +ipset=/.dalailama.usc.edu/gfwlist server=/.dalailamavisit.org.nz/127.0.0.1#7913 ipset=/.dalailamavisit.org.nz/gfwlist server=/.dalailamaworld.com/127.0.0.1#7913 @@ -2274,12 +2272,12 @@ server=/.darpa.mil/127.0.0.1#7913 ipset=/.darpa.mil/gfwlist server=/.dastrassi.org/127.0.0.1#7913 ipset=/.dastrassi.org/gfwlist -server=/.data-vocabulary.org/127.0.0.1#7913 -ipset=/.data-vocabulary.org/gfwlist server=/.data.flurry.com/127.0.0.1#7913 ipset=/.data.flurry.com/gfwlist server=/.data.gov.tw/127.0.0.1#7913 ipset=/.data.gov.tw/gfwlist +server=/.data-vocabulary.org/127.0.0.1#7913 +ipset=/.data-vocabulary.org/gfwlist server=/.daum.net/127.0.0.1#7913 ipset=/.daum.net/gfwlist server=/.david-kilgour.com/127.0.0.1#7913 @@ -2290,10 +2288,10 @@ server=/.daxa.cn/127.0.0.1#7913 ipset=/.daxa.cn/gfwlist server=/.daylife.com/127.0.0.1#7913 ipset=/.daylife.com/gfwlist -server=/.db.tt/127.0.0.1#7913 -ipset=/.db.tt/gfwlist server=/.dbc.hk/127.0.0.1#7913 ipset=/.dbc.hk/gfwlist +server=/.db.tt/127.0.0.1#7913 +ipset=/.db.tt/gfwlist server=/.dcard.tw/127.0.0.1#7913 ipset=/.dcard.tw/gfwlist server=/.dcmilitary.com/127.0.0.1#7913 @@ -2316,8 +2314,6 @@ server=/.ddns.net/127.0.0.1#7913 ipset=/.ddns.net/gfwlist server=/.ddns.us/127.0.0.1#7913 ipset=/.ddns.us/gfwlist -server=/.de-sci.org/127.0.0.1#7913 -ipset=/.de-sci.org/gfwlist server=/.deaftone.com/127.0.0.1#7913 ipset=/.deaftone.com/gfwlist server=/.debug.com/127.0.0.1#7913 @@ -2338,16 +2334,18 @@ server=/.delcamp.net/127.0.0.1#7913 ipset=/.delcamp.net/gfwlist server=/.delicious.com/127.0.0.1#7913 ipset=/.delicious.com/gfwlist -server=/.demo.opera-mini.net/127.0.0.1#7913 -ipset=/.demo.opera-mini.net/gfwlist server=/.democrats.org/127.0.0.1#7913 ipset=/.democrats.org/gfwlist +server=/.demo.opera-mini.net/127.0.0.1#7913 +ipset=/.demo.opera-mini.net/gfwlist server=/.demosisto.hk/127.0.0.1#7913 ipset=/.demosisto.hk/gfwlist server=/.depositphotos.com/127.0.0.1#7913 ipset=/.depositphotos.com/gfwlist server=/.derekhsu.homeip.net/127.0.0.1#7913 ipset=/.derekhsu.homeip.net/gfwlist +server=/.de-sci.org/127.0.0.1#7913 +ipset=/.de-sci.org/gfwlist server=/.desc.se/127.0.0.1#7913 ipset=/.desc.se/gfwlist server=/.design.google/127.0.0.1#7913 @@ -2372,6 +2370,8 @@ server=/.dfas.mil/127.0.0.1#7913 ipset=/.dfas.mil/gfwlist server=/.dfn.org/127.0.0.1#7913 ipset=/.dfn.org/gfwlist +server=/.d-fukyu.com/127.0.0.1#7913 +ipset=/.d-fukyu.com/gfwlist server=/.dharamsalanet.com/127.0.0.1#7913 ipset=/.dharamsalanet.com/gfwlist server=/.dharmakara.net/127.0.0.1#7913 @@ -2408,10 +2408,10 @@ server=/.discordapp.com/127.0.0.1#7913 ipset=/.discordapp.com/gfwlist server=/.discordapp.net/127.0.0.1#7913 ipset=/.discordapp.net/gfwlist -server=/.discuss.com.hk/127.0.0.1#7913 -ipset=/.discuss.com.hk/gfwlist server=/.discuss4u.com/127.0.0.1#7913 ipset=/.discuss4u.com/gfwlist +server=/.discuss.com.hk/127.0.0.1#7913 +ipset=/.discuss.com.hk/gfwlist server=/.dish.com/127.0.0.1#7913 ipset=/.dish.com/gfwlist server=/.disp.cc/127.0.0.1#7913 @@ -2428,10 +2428,10 @@ server=/.djangosnippets.org/127.0.0.1#7913 ipset=/.djangosnippets.org/gfwlist server=/.djorz.com/127.0.0.1#7913 ipset=/.djorz.com/gfwlist -server=/.dl-laby.jp/127.0.0.1#7913 -ipset=/.dl-laby.jp/gfwlist server=/.dl.box.net/127.0.0.1#7913 ipset=/.dl.box.net/gfwlist +server=/.dl-laby.jp/127.0.0.1#7913 +ipset=/.dl-laby.jp/gfwlist server=/.dlsite.com/127.0.0.1#7913 ipset=/.dlsite.com/gfwlist server=/.dlyoutube.com/127.0.0.1#7913 @@ -2444,30 +2444,30 @@ server=/.dmhy.org/127.0.0.1#7913 ipset=/.dmhy.org/gfwlist server=/.dmm.co.jp/127.0.0.1#7913 ipset=/.dmm.co.jp/gfwlist -server=/.dns-dns.com/127.0.0.1#7913 -ipset=/.dns-dns.com/gfwlist -server=/.dns-stuff.com/127.0.0.1#7913 -ipset=/.dns-stuff.com/gfwlist -server=/.dns.google/127.0.0.1#7913 -ipset=/.dns.google/gfwlist server=/.dns04.com/127.0.0.1#7913 ipset=/.dns04.com/gfwlist server=/.dns05.com/127.0.0.1#7913 ipset=/.dns05.com/gfwlist server=/.dns1.us/127.0.0.1#7913 ipset=/.dns1.us/gfwlist -server=/.dns2.us/127.0.0.1#7913 -ipset=/.dns2.us/gfwlist server=/.dns2go.com/127.0.0.1#7913 ipset=/.dns2go.com/gfwlist +server=/.dns2.us/127.0.0.1#7913 +ipset=/.dns2.us/gfwlist server=/.dnscrypt.org/127.0.0.1#7913 ipset=/.dnscrypt.org/gfwlist +server=/.dns-dns.com/127.0.0.1#7913 +ipset=/.dns-dns.com/gfwlist server=/.dnset.com/127.0.0.1#7913 ipset=/.dnset.com/gfwlist +server=/.dns.google/127.0.0.1#7913 +ipset=/.dns.google/gfwlist server=/.dnsrd.com/127.0.0.1#7913 ipset=/.dnsrd.com/gfwlist server=/.dnssec.net/127.0.0.1#7913 ipset=/.dnssec.net/gfwlist +server=/.dns-stuff.com/127.0.0.1#7913 +ipset=/.dns-stuff.com/gfwlist server=/.dnvod.tv/127.0.0.1#7913 ipset=/.dnvod.tv/gfwlist server=/.doctorvoice.org/127.0.0.1#7913 @@ -2512,10 +2512,10 @@ server=/.dotsub.com/127.0.0.1#7913 ipset=/.dotsub.com/gfwlist server=/.dotvpn.com/127.0.0.1#7913 ipset=/.dotvpn.com/gfwlist -server=/.doub.io/127.0.0.1#7913 -ipset=/.doub.io/gfwlist server=/.doubibackup.com/127.0.0.1#7913 ipset=/.doubibackup.com/gfwlist +server=/.doub.io/127.0.0.1#7913 +ipset=/.doub.io/gfwlist server=/.doubmirror.cf/127.0.0.1#7913 ipset=/.doubmirror.cf/gfwlist server=/.dougscripts.com/127.0.0.1#7913 @@ -2580,20 +2580,20 @@ server=/.duck.com/127.0.0.1#7913 ipset=/.duck.com/gfwlist server=/.duckdns.org/127.0.0.1#7913 ipset=/.duckdns.org/gfwlist -server=/.duckduckgo-owned-server.yahoo.net/127.0.0.1#7913 -ipset=/.duckduckgo-owned-server.yahoo.net/gfwlist server=/.duckduckgo.com/127.0.0.1#7913 ipset=/.duckduckgo.com/gfwlist +server=/.duckduckgo-owned-server.yahoo.net/127.0.0.1#7913 +ipset=/.duckduckgo-owned-server.yahoo.net/gfwlist server=/.duckload.com/127.0.0.1#7913 ipset=/.duckload.com/gfwlist server=/.duckmylife.com/127.0.0.1#7913 ipset=/.duckmylife.com/gfwlist server=/.duga.jp/127.0.0.1#7913 ipset=/.duga.jp/gfwlist -server=/.duihua.org/127.0.0.1#7913 -ipset=/.duihua.org/gfwlist server=/.duihuahrjournal.org/127.0.0.1#7913 ipset=/.duihuahrjournal.org/gfwlist +server=/.duihua.org/127.0.0.1#7913 +ipset=/.duihua.org/gfwlist server=/.dumb1.com/127.0.0.1#7913 ipset=/.dumb1.com/gfwlist server=/.dunyabulteni.net/127.0.0.1#7913 @@ -2614,10 +2614,6 @@ server=/.dvdpac.com/127.0.0.1#7913 ipset=/.dvdpac.com/gfwlist server=/.dvorak.org/127.0.0.1#7913 ipset=/.dvorak.org/gfwlist -server=/.dw-world.com/127.0.0.1#7913 -ipset=/.dw-world.com/gfwlist -server=/.dw-world.de/127.0.0.1#7913 -ipset=/.dw-world.de/gfwlist server=/.dw.com/127.0.0.1#7913 ipset=/.dw.com/gfwlist server=/.dw.de/127.0.0.1#7913 @@ -2626,24 +2622,28 @@ server=/.dwnews.com/127.0.0.1#7913 ipset=/.dwnews.com/gfwlist server=/.dwnews.net/127.0.0.1#7913 ipset=/.dwnews.net/gfwlist -server=/.dynamic-dns.net/127.0.0.1#7913 -ipset=/.dynamic-dns.net/gfwlist +server=/.dw-world.com/127.0.0.1#7913 +ipset=/.dw-world.com/gfwlist +server=/.dw-world.de/127.0.0.1#7913 +ipset=/.dw-world.de/gfwlist server=/.dynamicdns.biz/127.0.0.1#7913 ipset=/.dynamicdns.biz/gfwlist server=/.dynamicdns.co.uk/127.0.0.1#7913 ipset=/.dynamicdns.co.uk/gfwlist server=/.dynamicdns.me.uk/127.0.0.1#7913 ipset=/.dynamicdns.me.uk/gfwlist +server=/.dynamic-dns.net/127.0.0.1#7913 +ipset=/.dynamic-dns.net/gfwlist server=/.dynamicdns.org.uk/127.0.0.1#7913 ipset=/.dynamicdns.org.uk/gfwlist server=/.dynawebinc.com/127.0.0.1#7913 ipset=/.dynawebinc.com/gfwlist server=/.dyndns-ip.com/127.0.0.1#7913 ipset=/.dyndns-ip.com/gfwlist -server=/.dyndns-pics.com/127.0.0.1#7913 -ipset=/.dyndns-pics.com/gfwlist server=/.dyndns.org/127.0.0.1#7913 ipset=/.dyndns.org/gfwlist +server=/.dyndns-pics.com/127.0.0.1#7913 +ipset=/.dyndns-pics.com/gfwlist server=/.dyndns.pro/127.0.0.1#7913 ipset=/.dyndns.pro/gfwlist server=/.dynssl.com/127.0.0.1#7913 @@ -2658,20 +2658,6 @@ server=/.dysfz.cc/127.0.0.1#7913 ipset=/.dysfz.cc/gfwlist server=/.dzze.com/127.0.0.1#7913 ipset=/.dzze.com/gfwlist -server=/.e-classical.com.tw/127.0.0.1#7913 -ipset=/.e-classical.com.tw/gfwlist -server=/.e-gold.com/127.0.0.1#7913 -ipset=/.e-gold.com/gfwlist -server=/.e-hentai.org/127.0.0.1#7913 -ipset=/.e-hentai.org/gfwlist -server=/.e-hentaidb.com/127.0.0.1#7913 -ipset=/.e-hentaidb.com/gfwlist -server=/.e-info.org.tw/127.0.0.1#7913 -ipset=/.e-info.org.tw/gfwlist -server=/.e-traderland.net/127.0.0.1#7913 -ipset=/.e-traderland.net/gfwlist -server=/.e-zone.com.hk/127.0.0.1#7913 -ipset=/.e-zone.com.hk/gfwlist server=/.e123.hk/127.0.0.1#7913 ipset=/.e123.hk/gfwlist server=/.earlytibet.com/127.0.0.1#7913 @@ -2686,24 +2672,24 @@ server=/.easternlightning.org/127.0.0.1#7913 ipset=/.easternlightning.org/gfwlist server=/.eastturkestan.com/127.0.0.1#7913 ipset=/.eastturkestan.com/gfwlist -server=/.eastturkistan-gov.org/127.0.0.1#7913 -ipset=/.eastturkistan-gov.org/gfwlist server=/.eastturkistancc.org/127.0.0.1#7913 ipset=/.eastturkistancc.org/gfwlist server=/.eastturkistangovernmentinexile.us/127.0.0.1#7913 ipset=/.eastturkistangovernmentinexile.us/gfwlist +server=/.eastturkistan-gov.org/127.0.0.1#7913 +ipset=/.eastturkistan-gov.org/gfwlist server=/.easyca.ca/127.0.0.1#7913 ipset=/.easyca.ca/gfwlist server=/.easypic.com/127.0.0.1#7913 ipset=/.easypic.com/gfwlist server=/.ebony-beauty.com/127.0.0.1#7913 ipset=/.ebony-beauty.com/gfwlist -server=/.ebook.hyread.com.tw/127.0.0.1#7913 -ipset=/.ebook.hyread.com.tw/gfwlist server=/.ebookbrowse.com/127.0.0.1#7913 ipset=/.ebookbrowse.com/gfwlist server=/.ebookee.com/127.0.0.1#7913 ipset=/.ebookee.com/gfwlist +server=/.ebook.hyread.com.tw/127.0.0.1#7913 +ipset=/.ebook.hyread.com.tw/gfwlist server=/.ebtcbank.com/127.0.0.1#7913 ipset=/.ebtcbank.com/gfwlist server=/.ecfa.org.tw/127.0.0.1#7913 @@ -2712,6 +2698,8 @@ server=/.echofon.com/127.0.0.1#7913 ipset=/.echofon.com/gfwlist server=/.ecimg.tw/127.0.0.1#7913 ipset=/.ecimg.tw/gfwlist +server=/.e-classical.com.tw/127.0.0.1#7913 +ipset=/.e-classical.com.tw/gfwlist server=/.ecministry.net/127.0.0.1#7913 ipset=/.ecministry.net/gfwlist server=/.economist.com/127.0.0.1#7913 @@ -2748,8 +2736,16 @@ server=/.efksoft.com/127.0.0.1#7913 ipset=/.efksoft.com/gfwlist server=/.efukt.com/127.0.0.1#7913 ipset=/.efukt.com/gfwlist +server=/.e-gold.com/127.0.0.1#7913 +ipset=/.e-gold.com/gfwlist +server=/.e-hentaidb.com/127.0.0.1#7913 +ipset=/.e-hentaidb.com/gfwlist +server=/.e-hentai.org/127.0.0.1#7913 +ipset=/.e-hentai.org/gfwlist server=/.eic-av.com/127.0.0.1#7913 ipset=/.eic-av.com/gfwlist +server=/.e-info.org.tw/127.0.0.1#7913 +ipset=/.e-info.org.tw/gfwlist server=/.eireinikotaerukai.com/127.0.0.1#7913 ipset=/.eireinikotaerukai.com/gfwlist server=/.eisbb.com/127.0.0.1#7913 @@ -2782,10 +2778,6 @@ server=/.emulefans.com/127.0.0.1#7913 ipset=/.emulefans.com/gfwlist server=/.emuparadise.me/127.0.0.1#7913 ipset=/.emuparadise.me/gfwlist -server=/.en.favotter.net/127.0.0.1#7913 -ipset=/.en.favotter.net/gfwlist -server=/.en.hao123.com/127.0.0.1#7913 -ipset=/.en.hao123.com/gfwlist server=/.enanyang.my/127.0.0.1#7913 ipset=/.enanyang.my/gfwlist server=/.encyclopedia.com/127.0.0.1#7913 @@ -2794,6 +2786,8 @@ server=/.enewstree.com/127.0.0.1#7913 ipset=/.enewstree.com/gfwlist server=/.enfal.de/127.0.0.1#7913 ipset=/.enfal.de/gfwlist +server=/.en.favotter.net/127.0.0.1#7913 +ipset=/.en.favotter.net/gfwlist server=/.engagedaily.org/127.0.0.1#7913 ipset=/.engagedaily.org/gfwlist server=/.englishforeveryone.org/127.0.0.1#7913 @@ -2802,6 +2796,8 @@ server=/.englishfromengland.co.uk/127.0.0.1#7913 ipset=/.englishfromengland.co.uk/gfwlist server=/.englishpen.org/127.0.0.1#7913 ipset=/.englishpen.org/gfwlist +server=/.en.hao123.com/127.0.0.1#7913 +ipset=/.en.hao123.com/gfwlist server=/.enlighten.org.tw/127.0.0.1#7913 ipset=/.enlighten.org.tw/gfwlist server=/.entermap.com/127.0.0.1#7913 @@ -2810,18 +2806,16 @@ server=/.entnt.com/127.0.0.1#7913 ipset=/.entnt.com/gfwlist server=/.environment.google/127.0.0.1#7913 ipset=/.environment.google/gfwlist -server=/.epa.gov.tw/127.0.0.1#7913 -ipset=/.epa.gov.tw/gfwlist server=/.epac.to/127.0.0.1#7913 ipset=/.epac.to/gfwlist +server=/.epa.gov.tw/127.0.0.1#7913 +ipset=/.epa.gov.tw/gfwlist server=/.episcopalchurch.org/127.0.0.1#7913 ipset=/.episcopalchurch.org/gfwlist server=/.epochhk.com/127.0.0.1#7913 ipset=/.epochhk.com/gfwlist server=/.epochtimes-bg.com/127.0.0.1#7913 ipset=/.epochtimes-bg.com/gfwlist -server=/.epochtimes-romania.com/127.0.0.1#7913 -ipset=/.epochtimes-romania.com/gfwlist server=/.epochtimes.co.il/127.0.0.1#7913 ipset=/.epochtimes.co.il/gfwlist server=/.epochtimes.co.kr/127.0.0.1#7913 @@ -2840,6 +2834,8 @@ server=/.epochtimes.it/127.0.0.1#7913 ipset=/.epochtimes.it/gfwlist server=/.epochtimes.jp/127.0.0.1#7913 ipset=/.epochtimes.jp/gfwlist +server=/.epochtimes-romania.com/127.0.0.1#7913 +ipset=/.epochtimes-romania.com/gfwlist server=/.epochtimes.ru/127.0.0.1#7913 ipset=/.epochtimes.ru/gfwlist server=/.epochtimes.se/127.0.0.1#7913 @@ -2876,10 +2872,10 @@ server=/.erodoujinlog.com/127.0.0.1#7913 ipset=/.erodoujinlog.com/gfwlist server=/.erodoujinworld.com/127.0.0.1#7913 ipset=/.erodoujinworld.com/gfwlist -server=/.eromanga-kingdom.com/127.0.0.1#7913 -ipset=/.eromanga-kingdom.com/gfwlist server=/.eromangadouzin.com/127.0.0.1#7913 ipset=/.eromangadouzin.com/gfwlist +server=/.eromanga-kingdom.com/127.0.0.1#7913 +ipset=/.eromanga-kingdom.com/gfwlist server=/.eromon.net/127.0.0.1#7913 ipset=/.eromon.net/gfwlist server=/.eroprofile.com/127.0.0.1#7913 @@ -2910,16 +2906,18 @@ server=/.etowns.net/127.0.0.1#7913 ipset=/.etowns.net/gfwlist server=/.etowns.org/127.0.0.1#7913 ipset=/.etowns.org/gfwlist +server=/.e-traderland.net/127.0.0.1#7913 +ipset=/.e-traderland.net/gfwlist server=/.ettoday.net/127.0.0.1#7913 ipset=/.ettoday.net/gfwlist server=/.etvonline.hk/127.0.0.1#7913 ipset=/.etvonline.hk/gfwlist -server=/.eu.org/127.0.0.1#7913 -ipset=/.eu.org/gfwlist server=/.eucasino.com/127.0.0.1#7913 ipset=/.eucasino.com/gfwlist server=/.eulam.com/127.0.0.1#7913 ipset=/.eulam.com/gfwlist +server=/.eu.org/127.0.0.1#7913 +ipset=/.eu.org/gfwlist server=/.eurekavpt.com/127.0.0.1#7913 ipset=/.eurekavpt.com/gfwlist server=/.euronews.com/127.0.0.1#7913 @@ -2960,14 +2958,14 @@ server=/.eyevio.jp/127.0.0.1#7913 ipset=/.eyevio.jp/gfwlist server=/.eyny.com/127.0.0.1#7913 ipset=/.eyny.com/gfwlist +server=/.e-zone.com.hk/127.0.0.1#7913 +ipset=/.e-zone.com.hk/gfwlist server=/.ezpc.tk/127.0.0.1#7913 ipset=/.ezpc.tk/gfwlist server=/.ezpeer.com/127.0.0.1#7913 ipset=/.ezpeer.com/gfwlist server=/.ezua.com/127.0.0.1#7913 ipset=/.ezua.com/gfwlist -server=/.fa.gov.tw/127.0.0.1#7913 -ipset=/.fa.gov.tw/gfwlist server=/.facebook.br/127.0.0.1#7913 ipset=/.facebook.br/gfwlist server=/.facebook.com/127.0.0.1#7913 @@ -2978,20 +2976,22 @@ server=/.facebook.hu/127.0.0.1#7913 ipset=/.facebook.hu/gfwlist server=/.facebook.in/127.0.0.1#7913 ipset=/.facebook.in/gfwlist -server=/.facebook.nl/127.0.0.1#7913 -ipset=/.facebook.nl/gfwlist -server=/.facebook.se/127.0.0.1#7913 -ipset=/.facebook.se/gfwlist server=/.facebookmail.com/127.0.0.1#7913 ipset=/.facebookmail.com/gfwlist +server=/.facebook.nl/127.0.0.1#7913 +ipset=/.facebook.nl/gfwlist server=/.facebookquotes4u.com/127.0.0.1#7913 ipset=/.facebookquotes4u.com/gfwlist +server=/.facebook.se/127.0.0.1#7913 +ipset=/.facebook.se/gfwlist server=/.faceless.me/127.0.0.1#7913 ipset=/.faceless.me/gfwlist server=/.facesofnyfw.com/127.0.0.1#7913 ipset=/.facesofnyfw.com/gfwlist server=/.facesoftibetanselfimmolators.info/127.0.0.1#7913 ipset=/.facesoftibetanselfimmolators.info/gfwlist +server=/.fa.gov.tw/127.0.0.1#7913 +ipset=/.fa.gov.tw/gfwlist server=/.fail.hk/127.0.0.1#7913 ipset=/.fail.hk/gfwlist server=/.faith100.org/127.0.0.1#7913 @@ -3004,12 +3004,6 @@ server=/.fakku.net/127.0.0.1#7913 ipset=/.fakku.net/gfwlist server=/.falsefire.com/127.0.0.1#7913 ipset=/.falsefire.com/gfwlist -server=/.falun-co.org/127.0.0.1#7913 -ipset=/.falun-co.org/gfwlist -server=/.falun-ny.net/127.0.0.1#7913 -ipset=/.falun-ny.net/gfwlist -server=/.falun.caltech.edu/127.0.0.1#7913 -ipset=/.falun.caltech.edu/gfwlist server=/.falunart.org/127.0.0.1#7913 ipset=/.falunart.org/gfwlist server=/.falunasia.info/127.0.0.1#7913 @@ -3018,22 +3012,26 @@ server=/.falunau.org/127.0.0.1#7913 ipset=/.falunau.org/gfwlist server=/.falunaz.net/127.0.0.1#7913 ipset=/.falunaz.net/gfwlist +server=/.falun.caltech.edu/127.0.0.1#7913 +ipset=/.falun.caltech.edu/gfwlist +server=/.falun-co.org/127.0.0.1#7913 +ipset=/.falun-co.org/gfwlist server=/.falundafa-dc.org/127.0.0.1#7913 ipset=/.falundafa-dc.org/gfwlist server=/.falundafa-florida.org/127.0.0.1#7913 ipset=/.falundafa-florida.org/gfwlist -server=/.falundafa-nc.org/127.0.0.1#7913 -ipset=/.falundafa-nc.org/gfwlist -server=/.falundafa-pa.net/127.0.0.1#7913 -ipset=/.falundafa-pa.net/gfwlist -server=/.falundafa-sacramento.org/127.0.0.1#7913 -ipset=/.falundafa-sacramento.org/gfwlist -server=/.falundafa.org/127.0.0.1#7913 -ipset=/.falundafa.org/gfwlist server=/.falundafaindia.org/127.0.0.1#7913 ipset=/.falundafaindia.org/gfwlist server=/.falundafamuseum.org/127.0.0.1#7913 ipset=/.falundafamuseum.org/gfwlist +server=/.falundafa-nc.org/127.0.0.1#7913 +ipset=/.falundafa-nc.org/gfwlist +server=/.falundafa.org/127.0.0.1#7913 +ipset=/.falundafa.org/gfwlist +server=/.falundafa-pa.net/127.0.0.1#7913 +ipset=/.falundafa-pa.net/gfwlist +server=/.falundafa-sacramento.org/127.0.0.1#7913 +ipset=/.falundafa-sacramento.org/gfwlist server=/.falungong.club/127.0.0.1#7913 ipset=/.falungong.club/gfwlist server=/.falungong.de/127.0.0.1#7913 @@ -3046,6 +3044,8 @@ server=/.faluninfo.de/127.0.0.1#7913 ipset=/.faluninfo.de/gfwlist server=/.faluninfo.net/127.0.0.1#7913 ipset=/.faluninfo.net/gfwlist +server=/.falun-ny.net/127.0.0.1#7913 +ipset=/.falun-ny.net/gfwlist server=/.falunpilipinas.net/127.0.0.1#7913 ipset=/.falunpilipinas.net/gfwlist server=/.falunworld.net/127.0.0.1#7913 @@ -3054,8 +3054,6 @@ server=/.familyfed.org/127.0.0.1#7913 ipset=/.familyfed.org/gfwlist server=/.famunion.com/127.0.0.1#7913 ipset=/.famunion.com/gfwlist -server=/.fan-qiang.com/127.0.0.1#7913 -ipset=/.fan-qiang.com/gfwlist server=/.fangbinxing.com/127.0.0.1#7913 ipset=/.fangbinxing.com/gfwlist server=/.fangeming.com/127.0.0.1#7913 @@ -3068,18 +3066,20 @@ server=/.fangmincn.org/127.0.0.1#7913 ipset=/.fangmincn.org/gfwlist server=/.fangong.forums-free.com/127.0.0.1#7913 ipset=/.fangong.forums-free.com/gfwlist -server=/.fangong.org/127.0.0.1#7913 -ipset=/.fangong.org/gfwlist server=/.fangongheike.com/127.0.0.1#7913 ipset=/.fangongheike.com/gfwlist +server=/.fangong.org/127.0.0.1#7913 +ipset=/.fangong.org/gfwlist server=/.fanhaodang.com/127.0.0.1#7913 ipset=/.fanhaodang.com/gfwlist -server=/.fanqiang.tk/127.0.0.1#7913 -ipset=/.fanqiang.tk/gfwlist +server=/.fan-qiang.com/127.0.0.1#7913 +ipset=/.fan-qiang.com/gfwlist server=/.fanqiangdang.com/127.0.0.1#7913 ipset=/.fanqiangdang.com/gfwlist server=/.fanqianghou.com/127.0.0.1#7913 ipset=/.fanqianghou.com/gfwlist +server=/.fanqiang.tk/127.0.0.1#7913 +ipset=/.fanqiang.tk/gfwlist server=/.fanqiangyakexi.net/127.0.0.1#7913 ipset=/.fanqiangyakexi.net/gfwlist server=/.fanqiangzhe.com/127.0.0.1#7913 @@ -3098,14 +3098,14 @@ server=/.fartit.com/127.0.0.1#7913 ipset=/.fartit.com/gfwlist server=/.farwestchina.com/127.0.0.1#7913 ipset=/.farwestchina.com/gfwlist -server=/.fast.wistia.com/127.0.0.1#7913 -ipset=/.fast.wistia.com/gfwlist server=/.fastpic.ru/127.0.0.1#7913 ipset=/.fastpic.ru/gfwlist server=/.fastssh.com/127.0.0.1#7913 ipset=/.fastssh.com/gfwlist server=/.faststone.org/127.0.0.1#7913 ipset=/.faststone.org/gfwlist +server=/.fast.wistia.com/127.0.0.1#7913 +ipset=/.fast.wistia.com/gfwlist server=/.fatbtc.com/127.0.0.1#7913 ipset=/.fatbtc.com/gfwlist server=/.favstar.fm/127.0.0.1#7913 @@ -3114,26 +3114,26 @@ server=/.fawanghuihui.org/127.0.0.1#7913 ipset=/.fawanghuihui.org/gfwlist server=/.faydao.com/127.0.0.1#7913 ipset=/.faydao.com/gfwlist -server=/.fb.com/127.0.0.1#7913 -ipset=/.fb.com/gfwlist -server=/.fb.me/127.0.0.1#7913 -ipset=/.fb.me/gfwlist server=/.fbaddins.com/127.0.0.1#7913 ipset=/.fbaddins.com/gfwlist server=/.fbcdn.net/127.0.0.1#7913 ipset=/.fbcdn.net/gfwlist +server=/.fb.com/127.0.0.1#7913 +ipset=/.fb.com/gfwlist +server=/.fb.me/127.0.0.1#7913 +ipset=/.fb.me/gfwlist server=/.fbsbx.com/127.0.0.1#7913 ipset=/.fbsbx.com/gfwlist server=/.fbworkmail.com/127.0.0.1#7913 ipset=/.fbworkmail.com/gfwlist -server=/.fc2.com/127.0.0.1#7913 -ipset=/.fc2.com/gfwlist server=/.fc2blog.net/127.0.0.1#7913 ipset=/.fc2blog.net/gfwlist server=/.fc2china.com/127.0.0.1#7913 ipset=/.fc2china.com/gfwlist server=/.fc2cn.com/127.0.0.1#7913 ipset=/.fc2cn.com/gfwlist +server=/.fc2.com/127.0.0.1#7913 +ipset=/.fc2.com/gfwlist server=/.fda.gov.tw/127.0.0.1#7913 ipset=/.fda.gov.tw/gfwlist server=/.fdc64.de/127.0.0.1#7913 @@ -3154,10 +3154,10 @@ server=/.feer.com/127.0.0.1#7913 ipset=/.feer.com/gfwlist server=/.feifeiss.com/127.0.0.1#7913 ipset=/.feifeiss.com/gfwlist -server=/.feitian-california.org/127.0.0.1#7913 -ipset=/.feitian-california.org/gfwlist server=/.feitianacademy.org/127.0.0.1#7913 ipset=/.feitianacademy.org/gfwlist +server=/.feitian-california.org/127.0.0.1#7913 +ipset=/.feitian-california.org/gfwlist server=/.feministteacher.com/127.0.0.1#7913 ipset=/.feministteacher.com/gfwlist server=/.fengzhenghu.com/127.0.0.1#7913 @@ -3166,10 +3166,10 @@ server=/.fengzhenghu.net/127.0.0.1#7913 ipset=/.fengzhenghu.net/gfwlist server=/.fevernet.com/127.0.0.1#7913 ipset=/.fevernet.com/gfwlist -server=/.ff.im/127.0.0.1#7913 -ipset=/.ff.im/gfwlist server=/.fffff.at/127.0.0.1#7913 ipset=/.fffff.at/gfwlist +server=/.ff.im/127.0.0.1#7913 +ipset=/.ff.im/gfwlist server=/.fflick.com/127.0.0.1#7913 ipset=/.fflick.com/gfwlist server=/.ffvpn.com/127.0.0.1#7913 @@ -3280,6 +3280,8 @@ server=/.footwiball.com/127.0.0.1#7913 ipset=/.footwiball.com/gfwlist server=/.foreignpolicy.com/127.0.0.1#7913 ipset=/.foreignpolicy.com/gfwlist +server=/.forum4hk.com/127.0.0.1#7913 +ipset=/.forum4hk.com/gfwlist server=/.forum.baby-kingdom.com/127.0.0.1#7913 ipset=/.forum.baby-kingdom.com/gfwlist server=/.forum.cyberctm.com/127.0.0.1#7913 @@ -3304,8 +3306,6 @@ server=/.forum.tvb.com/127.0.0.1#7913 ipset=/.forum.tvb.com/gfwlist server=/.forum.xinbao.de/127.0.0.1#7913 ipset=/.forum.xinbao.de/gfwlist -server=/.forum4hk.com/127.0.0.1#7913 -ipset=/.forum4hk.com/gfwlist server=/.fotile.me/127.0.0.1#7913 ipset=/.fotile.me/gfwlist server=/.fourface.nodesnoop.com/127.0.0.1#7913 @@ -3320,36 +3320,24 @@ server=/.foxsub.com/127.0.0.1#7913 ipset=/.foxsub.com/gfwlist server=/.foxtang.com/127.0.0.1#7913 ipset=/.foxtang.com/gfwlist -server=/.fpmt-osel.org/127.0.0.1#7913 -ipset=/.fpmt-osel.org/gfwlist -server=/.fpmt.org/127.0.0.1#7913 -ipset=/.fpmt.org/gfwlist -server=/.fpmt.tw/127.0.0.1#7913 -ipset=/.fpmt.tw/gfwlist server=/.fpmtmexico.org/127.0.0.1#7913 ipset=/.fpmtmexico.org/gfwlist -server=/.fq.wikia.com/127.0.0.1#7913 -ipset=/.fq.wikia.com/gfwlist +server=/.fpmt.org/127.0.0.1#7913 +ipset=/.fpmt.org/gfwlist +server=/.fpmt-osel.org/127.0.0.1#7913 +ipset=/.fpmt-osel.org/gfwlist +server=/.fpmt.tw/127.0.0.1#7913 +ipset=/.fpmt.tw/gfwlist server=/.fqok.org/127.0.0.1#7913 ipset=/.fqok.org/gfwlist server=/.fqrouter.com/127.0.0.1#7913 ipset=/.fqrouter.com/gfwlist +server=/.fq.wikia.com/127.0.0.1#7913 +ipset=/.fq.wikia.com/gfwlist server=/.franklc.com/127.0.0.1#7913 ipset=/.franklc.com/gfwlist server=/.freakshare.com/127.0.0.1#7913 ipset=/.freakshare.com/gfwlist -server=/.free-gate.org/127.0.0.1#7913 -ipset=/.free-gate.org/gfwlist -server=/.free-hada-now.org/127.0.0.1#7913 -ipset=/.free-hada-now.org/gfwlist -server=/.free-proxy.cz/127.0.0.1#7913 -ipset=/.free-proxy.cz/gfwlist -server=/.free-ss.site/127.0.0.1#7913 -ipset=/.free-ss.site/gfwlist -server=/.free-ssh.com/127.0.0.1#7913 -ipset=/.free-ssh.com/gfwlist -server=/.free.fr/127.0.0.1#7913 -ipset=/.free.fr/gfwlist server=/.free4u.com.ar/127.0.0.1#7913 ipset=/.free4u.com.ar/gfwlist server=/.freealim.com/127.0.0.1#7913 @@ -3358,12 +3346,12 @@ server=/.freebrowser.org/127.0.0.1#7913 ipset=/.freebrowser.org/gfwlist server=/.freechal.com/127.0.0.1#7913 ipset=/.freechal.com/gfwlist +server=/.freechinaforum.org/127.0.0.1#7913 +ipset=/.freechinaforum.org/gfwlist server=/.freechina.net/127.0.0.1#7913 ipset=/.freechina.net/gfwlist server=/.freechina.news/127.0.0.1#7913 ipset=/.freechina.news/gfwlist -server=/.freechinaforum.org/127.0.0.1#7913 -ipset=/.freechinaforum.org/gfwlist server=/.freechinaweibo.com/127.0.0.1#7913 ipset=/.freechinaweibo.com/gfwlist server=/.freeddns.com/127.0.0.1#7913 @@ -3384,10 +3372,16 @@ server=/.freeforums.org/127.0.0.1#7913 ipset=/.freeforums.org/gfwlist server=/.freefq.com/127.0.0.1#7913 ipset=/.freefq.com/gfwlist +server=/.free.fr/127.0.0.1#7913 +ipset=/.free.fr/gfwlist server=/.freefuckvids.com/127.0.0.1#7913 ipset=/.freefuckvids.com/gfwlist server=/.freegao.com/127.0.0.1#7913 ipset=/.freegao.com/gfwlist +server=/.free-gate.org/127.0.0.1#7913 +ipset=/.free-gate.org/gfwlist +server=/.free-hada-now.org/127.0.0.1#7913 +ipset=/.free-hada-now.org/gfwlist server=/.freehongkong.org/127.0.0.1#7913 ipset=/.freehongkong.org/gfwlist server=/.freeilhamtohti.org/127.0.0.1#7913 @@ -3414,16 +3408,22 @@ server=/.freeopenvpn.com/127.0.0.1#7913 ipset=/.freeopenvpn.com/gfwlist server=/.freeoz.org/127.0.0.1#7913 ipset=/.freeoz.org/gfwlist +server=/.free-proxy.cz/127.0.0.1#7913 +ipset=/.free-proxy.cz/gfwlist +server=/.free-ssh.com/127.0.0.1#7913 +ipset=/.free-ssh.com/gfwlist server=/.freessh.us/127.0.0.1#7913 ipset=/.freessh.us/gfwlist +server=/.free-ss.site/127.0.0.1#7913 +ipset=/.free-ss.site/gfwlist server=/.freetcp.com/127.0.0.1#7913 ipset=/.freetcp.com/gfwlist +server=/.freetibetanheroes.org/127.0.0.1#7913 +ipset=/.freetibetanheroes.org/gfwlist server=/.freetibet.net/127.0.0.1#7913 ipset=/.freetibet.net/gfwlist server=/.freetibet.org/127.0.0.1#7913 ipset=/.freetibet.org/gfwlist -server=/.freetibetanheroes.org/127.0.0.1#7913 -ipset=/.freetibetanheroes.org/gfwlist server=/.freeviewmovies.com/127.0.0.1#7913 ipset=/.freeviewmovies.com/gfwlist server=/.freevpn.me/127.0.0.1#7913 @@ -3448,26 +3448,26 @@ server=/.freeyellow.com/127.0.0.1#7913 ipset=/.freeyellow.com/gfwlist server=/.freeyoutubeproxy.net/127.0.0.1#7913 ipset=/.freeyoutubeproxy.net/gfwlist -server=/.friendfeed-media.com/127.0.0.1#7913 -ipset=/.friendfeed-media.com/gfwlist server=/.friendfeed.com/127.0.0.1#7913 ipset=/.friendfeed.com/gfwlist +server=/.friendfeed-media.com/127.0.0.1#7913 +ipset=/.friendfeed-media.com/gfwlist server=/.friends-of-tibet.org/127.0.0.1#7913 -ipset=/.friends-of-tibet.org/gfwlist server=/.friendsoftibet.org/127.0.0.1#7913 +ipset=/.friends-of-tibet.org/gfwlist ipset=/.friendsoftibet.org/gfwlist server=/.fring.com/127.0.0.1#7913 ipset=/.fring.com/gfwlist server=/.fringenetwork.com/127.0.0.1#7913 ipset=/.fringenetwork.com/gfwlist -server=/.from-pr.com/127.0.0.1#7913 -ipset=/.from-pr.com/gfwlist -server=/.from-sd.com/127.0.0.1#7913 -ipset=/.from-sd.com/gfwlist server=/.fromchinatousa.net/127.0.0.1#7913 ipset=/.fromchinatousa.net/gfwlist server=/.frommel.net/127.0.0.1#7913 ipset=/.frommel.net/gfwlist +server=/.from-pr.com/127.0.0.1#7913 +ipset=/.from-pr.com/gfwlist +server=/.from-sd.com/127.0.0.1#7913 +ipset=/.from-sd.com/gfwlist server=/.frontlinedefenders.org/127.0.0.1#7913 ipset=/.frontlinedefenders.org/gfwlist server=/.frootvpn.com/127.0.0.1#7913 @@ -3518,10 +3518,10 @@ server=/.futuremessage.org/127.0.0.1#7913 ipset=/.futuremessage.org/gfwlist server=/.fux.com/127.0.0.1#7913 ipset=/.fux.com/gfwlist -server=/.fuyin.net/127.0.0.1#7913 -ipset=/.fuyin.net/gfwlist server=/.fuyindiantai.org/127.0.0.1#7913 ipset=/.fuyindiantai.org/gfwlist +server=/.fuyin.net/127.0.0.1#7913 +ipset=/.fuyin.net/gfwlist server=/.fuyu.org.tw/127.0.0.1#7913 ipset=/.fuyu.org.tw/gfwlist server=/.fw.cm/127.0.0.1#7913 @@ -3536,12 +3536,6 @@ server=/.fzh999.net/127.0.0.1#7913 ipset=/.fzh999.net/gfwlist server=/.fzlm.com/127.0.0.1#7913 ipset=/.fzlm.com/gfwlist -server=/.g-area.org/127.0.0.1#7913 -ipset=/.g-area.org/gfwlist -server=/.g-queen.com/127.0.0.1#7913 -ipset=/.g-queen.com/gfwlist -server=/.g.co/127.0.0.1#7913 -ipset=/.g.co/gfwlist server=/.g0v.social/127.0.0.1#7913 ipset=/.g0v.social/gfwlist server=/.g6hentai.com/127.0.0.1#7913 @@ -3564,12 +3558,12 @@ server=/.gamebase.com.tw/127.0.0.1#7913 ipset=/.gamebase.com.tw/gfwlist server=/.gamejolt.com/127.0.0.1#7913 ipset=/.gamejolt.com/gfwlist +server=/.gamer2-cds.cdn.hinet.net/127.0.0.1#7913 +ipset=/.gamer2-cds.cdn.hinet.net/gfwlist server=/.gamer-cds.cdn.hinet.net/127.0.0.1#7913 ipset=/.gamer-cds.cdn.hinet.net/gfwlist server=/.gamer.com.tw/127.0.0.1#7913 ipset=/.gamer.com.tw/gfwlist -server=/.gamer2-cds.cdn.hinet.net/127.0.0.1#7913 -ipset=/.gamer2-cds.cdn.hinet.net/gfwlist server=/.gamez.com.tw/127.0.0.1#7913 ipset=/.gamez.com.tw/gfwlist server=/.gamousa.com/127.0.0.1#7913 @@ -3588,14 +3582,16 @@ server=/.gardennetworks.com/127.0.0.1#7913 ipset=/.gardennetworks.com/gfwlist server=/.gardennetworks.org/127.0.0.1#7913 ipset=/.gardennetworks.org/gfwlist +server=/.g-area.org/127.0.0.1#7913 +ipset=/.g-area.org/gfwlist server=/.gartlive.com/127.0.0.1#7913 ipset=/.gartlive.com/gfwlist -server=/.gate-project.com/127.0.0.1#7913 -ipset=/.gate-project.com/gfwlist -server=/.gate.io/127.0.0.1#7913 -ipset=/.gate.io/gfwlist server=/.gatecoin.com/127.0.0.1#7913 ipset=/.gatecoin.com/gfwlist +server=/.gate.io/127.0.0.1#7913 +ipset=/.gate.io/gfwlist +server=/.gate-project.com/127.0.0.1#7913 +ipset=/.gate-project.com/gfwlist server=/.gather.com/127.0.0.1#7913 ipset=/.gather.com/gfwlist server=/.gatherproxy.com/127.0.0.1#7913 @@ -3624,6 +3620,8 @@ server=/.gclooney.com/127.0.0.1#7913 ipset=/.gclooney.com/gfwlist server=/.gcmasia.com/127.0.0.1#7913 ipset=/.gcmasia.com/gfwlist +server=/.g.co/127.0.0.1#7913 +ipset=/.g.co/gfwlist server=/.gcpnews.com/127.0.0.1#7913 ipset=/.gcpnews.com/gfwlist server=/.gcr.io/127.0.0.1#7913 @@ -3652,24 +3650,22 @@ server=/.gerefoundation.org/127.0.0.1#7913 ipset=/.gerefoundation.org/gfwlist server=/.get.app/127.0.0.1#7913 ipset=/.get.app/gfwlist -server=/.get.dev/127.0.0.1#7913 -ipset=/.get.dev/gfwlist -server=/.get.how/127.0.0.1#7913 -ipset=/.get.how/gfwlist -server=/.get.page/127.0.0.1#7913 -ipset=/.get.page/gfwlist server=/.getastrill.com/127.0.0.1#7913 ipset=/.getastrill.com/gfwlist server=/.getchu.com/127.0.0.1#7913 ipset=/.getchu.com/gfwlist server=/.getcloak.com/127.0.0.1#7913 ipset=/.getcloak.com/gfwlist +server=/.get.dev/127.0.0.1#7913 +ipset=/.get.dev/gfwlist server=/.getfoxyproxy.org/127.0.0.1#7913 ipset=/.getfoxyproxy.org/gfwlist server=/.getfreedur.com/127.0.0.1#7913 ipset=/.getfreedur.com/gfwlist server=/.getgom.com/127.0.0.1#7913 ipset=/.getgom.com/gfwlist +server=/.get.how/127.0.0.1#7913 +ipset=/.get.how/gfwlist server=/.geti2p.net/127.0.0.1#7913 ipset=/.geti2p.net/gfwlist server=/.getiton.com/127.0.0.1#7913 @@ -3682,6 +3678,8 @@ server=/.getmdl.io/127.0.0.1#7913 ipset=/.getmdl.io/gfwlist server=/.getoutline.org/127.0.0.1#7913 ipset=/.getoutline.org/gfwlist +server=/.get.page/127.0.0.1#7913 +ipset=/.get.page/gfwlist server=/.getsocialscope.com/127.0.0.1#7913 ipset=/.getsocialscope.com/gfwlist server=/.getsync.com/127.0.0.1#7913 @@ -3722,10 +3720,10 @@ server=/.girlbanker.com/127.0.0.1#7913 ipset=/.girlbanker.com/gfwlist server=/.gist.github.com/127.0.0.1#7913 ipset=/.gist.github.com/gfwlist -server=/.git.io/127.0.0.1#7913 -ipset=/.git.io/gfwlist server=/.github.com/127.0.0.1#7913 ipset=/.github.com/gfwlist +server=/.git.io/127.0.0.1#7913 +ipset=/.git.io/gfwlist server=/.gizlen.net/127.0.0.1#7913 ipset=/.gizlen.net/gfwlist server=/.gjczz.com/127.0.0.1#7913 @@ -3744,10 +3742,10 @@ server=/.globalrescue.net/127.0.0.1#7913 ipset=/.globalrescue.net/gfwlist server=/.globaltm.org/127.0.0.1#7913 ipset=/.globaltm.org/gfwlist -server=/.globalvoices.org/127.0.0.1#7913 -ipset=/.globalvoices.org/gfwlist server=/.globalvoicesonline.org/127.0.0.1#7913 ipset=/.globalvoicesonline.org/gfwlist +server=/.globalvoices.org/127.0.0.1#7913 +ipset=/.globalvoices.org/gfwlist server=/.globalvpn.net/127.0.0.1#7913 ipset=/.globalvpn.net/gfwlist server=/.glock.com/127.0.0.1#7913 @@ -3774,10 +3772,6 @@ server=/.gmozomg.izihost.org/127.0.0.1#7913 ipset=/.gmozomg.izihost.org/gfwlist server=/.gnci.org.hk/127.0.0.1#7913 ipset=/.gnci.org.hk/gfwlist -server=/.go-pki.com/127.0.0.1#7913 -ipset=/.go-pki.com/gfwlist -server=/.go.nesnode.com/127.0.0.1#7913 -ipset=/.go.nesnode.com/gfwlist server=/.go141.com/127.0.0.1#7913 ipset=/.go141.com/gfwlist server=/.goagent.biz/127.0.0.1#7913 @@ -3796,10 +3790,10 @@ server=/.godoc.org/127.0.0.1#7913 ipset=/.godoc.org/gfwlist server=/.godsdirectcontact.co.uk/127.0.0.1#7913 ipset=/.godsdirectcontact.co.uk/gfwlist -server=/.godsdirectcontact.org.tw/127.0.0.1#7913 -ipset=/.godsdirectcontact.org.tw/gfwlist server=/.godsdirectcontact.org/127.0.0.1#7913 ipset=/.godsdirectcontact.org/gfwlist +server=/.godsdirectcontact.org.tw/127.0.0.1#7913 +ipset=/.godsdirectcontact.org.tw/gfwlist server=/.godsimmediatecontact.com/127.0.0.1#7913 ipset=/.godsimmediatecontact.com/gfwlist server=/.gogotunnel.com/127.0.0.1#7913 @@ -3826,16 +3820,16 @@ server=/.goldstep.net/127.0.0.1#7913 ipset=/.goldstep.net/gfwlist server=/.goldwave.com/127.0.0.1#7913 ipset=/.goldwave.com/gfwlist -server=/.gongm.in/127.0.0.1#7913 -ipset=/.gongm.in/gfwlist +server=/.go.nesnode.com/127.0.0.1#7913 +ipset=/.go.nesnode.com/gfwlist server=/.gongmeng.info/127.0.0.1#7913 ipset=/.gongmeng.info/gfwlist +server=/.gongm.in/127.0.0.1#7913 +ipset=/.gongm.in/gfwlist server=/.gongminliliang.com/127.0.0.1#7913 ipset=/.gongminliliang.com/gfwlist server=/.gongwt.com/127.0.0.1#7913 ipset=/.gongwt.com/gfwlist -server=/.goo.gl/127.0.0.1#7913 -ipset=/.goo.gl/gfwlist server=/.gooday.xyz/127.0.0.1#7913 ipset=/.gooday.xyz/gfwlist server=/.gooddns.info/127.0.0.1#7913 @@ -3850,10 +3844,21 @@ server=/.goodtv.tv/127.0.0.1#7913 ipset=/.goodtv.tv/gfwlist server=/.goofind.com/127.0.0.1#7913 ipset=/.goofind.com/gfwlist +server=/.goo.gl/127.0.0.1#7913 server=/.google.ae/127.0.0.1#7913 ipset=/.google.ae/gfwlist server=/.google.am/127.0.0.1#7913 ipset=/.google.am/gfwlist +server=/.googleapis.cn/127.0.0.1#7913 +ipset=/.googleapis.cn/gfwlist +server=/.googleapis.com/127.0.0.1#7913 +ipset=/.googleapis.com/gfwlist +server=/.googleapps.com/127.0.0.1#7913 +ipset=/.googleapps.com/gfwlist +server=/.googlearth.com/127.0.0.1#7913 +ipset=/.googlearth.com/gfwlist +server=/.googleartproject.com/127.0.0.1#7913 +ipset=/.googleartproject.com/gfwlist server=/.google.as/127.0.0.1#7913 ipset=/.google.as/gfwlist server=/.google.at/127.0.0.1#7913 @@ -3866,29 +3871,34 @@ server=/.google.be/127.0.0.1#7913 ipset=/.google.be/gfwlist server=/.google.bg/127.0.0.1#7913 ipset=/.google.bg/gfwlist +server=/.googleblog.com/127.0.0.1#7913 +ipset=/.googleblog.com/gfwlist +server=/.googlebot.com/127.0.0.1#7913 +ipset=/.googlebot.com/gfwlist server=/.google.ca/127.0.0.1#7913 ipset=/.google.ca/gfwlist server=/.google.calstate.edu/127.0.0.1#7913 ipset=/.google.calstate.edu/gfwlist server=/.google.cd/127.0.0.1#7913 ipset=/.google.cd/gfwlist +server=/.googlechinawebmaster.com/127.0.0.1#7913 +ipset=/.googlechinawebmaster.com/gfwlist server=/.google.ci/127.0.0.1#7913 ipset=/.google.ci/gfwlist +server=/.googlecode.com/127.0.0.1#7913 +ipset=/.googlecode.com/gfwlist server=/.google.co.id/127.0.0.1#7913 ipset=/.google.co.id/gfwlist server=/.google.co.jp/127.0.0.1#7913 ipset=/.google.co.jp/gfwlist server=/.google.co.kr/127.0.0.1#7913 ipset=/.google.co.kr/gfwlist +server=/.google.com/127.0.0.1#7913 server=/.google.co.ma/127.0.0.1#7913 -ipset=/.google.co.ma/gfwlist -server=/.google.co.th/127.0.0.1#7913 -ipset=/.google.co.th/gfwlist -server=/.google.co.uk/127.0.0.1#7913 -ipset=/.google.co.uk/gfwlist server=/.google.com.af/127.0.0.1#7913 ipset=/.google.com.af/gfwlist server=/.google.com.ag/127.0.0.1#7913 +ipset=/.google.co.ma/gfwlist ipset=/.google.com.ag/gfwlist server=/.google.com.ai/127.0.0.1#7913 ipset=/.google.com.ai/gfwlist @@ -3930,6 +3940,7 @@ server=/.google.com.et/127.0.0.1#7913 ipset=/.google.com.et/gfwlist server=/.google.com.fj/127.0.0.1#7913 ipset=/.google.com.fj/gfwlist +ipset=/.google.com/gfwlist server=/.google.com.gh/127.0.0.1#7913 ipset=/.google.com.gh/gfwlist server=/.google.com.gi/127.0.0.1#7913 @@ -3966,6 +3977,8 @@ server=/.google.com.ly/127.0.0.1#7913 ipset=/.google.com.ly/gfwlist server=/.google.com.ma/127.0.0.1#7913 ipset=/.google.com.ma/gfwlist +server=/.googlecommerce.com/127.0.0.1#7913 +ipset=/.googlecommerce.com/gfwlist server=/.google.com.mm/127.0.0.1#7913 ipset=/.google.com.mm/gfwlist server=/.google.com.mt/127.0.0.1#7913 @@ -4048,8 +4061,10 @@ server=/.google.com.zm/127.0.0.1#7913 ipset=/.google.com.zm/gfwlist server=/.google.com.zw/127.0.0.1#7913 ipset=/.google.com.zw/gfwlist -server=/.google.com/127.0.0.1#7913 -ipset=/.google.com/gfwlist +server=/.google.co.th/127.0.0.1#7913 +ipset=/.google.co.th/gfwlist +server=/.google.co.uk/127.0.0.1#7913 +ipset=/.google.co.uk/gfwlist server=/.google.de/127.0.0.1#7913 ipset=/.google.de/gfwlist server=/.google.dev/127.0.0.1#7913 @@ -4058,6 +4073,12 @@ server=/.google.dj/127.0.0.1#7913 ipset=/.google.dj/gfwlist server=/.google.dk/127.0.0.1#7913 ipset=/.google.dk/gfwlist +server=/.googledomains.com/127.0.0.1#7913 +ipset=/.googledomains.com/gfwlist +server=/.googledrive.com/127.0.0.1#7913 +ipset=/.googledrive.com/gfwlist +server=/.googleearth.com/127.0.0.1#7913 +ipset=/.googleearth.com/gfwlist server=/.google.es/127.0.0.1#7913 ipset=/.google.es/gfwlist server=/.google.fi/127.0.0.1#7913 @@ -4072,8 +4093,16 @@ server=/.google.gl/127.0.0.1#7913 ipset=/.google.gl/gfwlist server=/.google.gr/127.0.0.1#7913 ipset=/.google.gr/gfwlist +server=/.googlegroups.com/127.0.0.1#7913 +ipset=/.googlegroups.com/gfwlist +server=/.googlehosted.com/127.0.0.1#7913 +ipset=/.googlehosted.com/gfwlist +server=/.googleideas.com/127.0.0.1#7913 +ipset=/.googleideas.com/gfwlist server=/.google.ie/127.0.0.1#7913 ipset=/.google.ie/gfwlist +server=/.googleinsidesearch.com/127.0.0.1#7913 +ipset=/.googleinsidesearch.com/gfwlist server=/.google.is/127.0.0.1#7913 ipset=/.google.is/gfwlist server=/.google.it/127.0.0.1#7913 @@ -4082,8 +4111,14 @@ server=/.google.jo/127.0.0.1#7913 ipset=/.google.jo/gfwlist server=/.google.kz/127.0.0.1#7913 ipset=/.google.kz/gfwlist +server=/.googlelabs.com/127.0.0.1#7913 +ipset=/.googlelabs.com/gfwlist server=/.google.lv/127.0.0.1#7913 ipset=/.google.lv/gfwlist +server=/.googlemail.com/127.0.0.1#7913 +ipset=/.googlemail.com/gfwlist +server=/.googlemashups.com/127.0.0.1#7913 +ipset=/.googlemashups.com/gfwlist server=/.google.mn/127.0.0.1#7913 ipset=/.google.mn/gfwlist server=/.google.ms/127.0.0.1#7913 @@ -4094,6 +4129,12 @@ server=/.google.no/127.0.0.1#7913 ipset=/.google.no/gfwlist server=/.google.nu/127.0.0.1#7913 ipset=/.google.nu/gfwlist +server=/.googlepagecreator.com/127.0.0.1#7913 +ipset=/.googlepagecreator.com/gfwlist +server=/.googleplay.com/127.0.0.1#7913 +ipset=/.googleplay.com/gfwlist +server=/.googleplus.com/127.0.0.1#7913 +ipset=/.googleplus.com/gfwlist server=/.google.ro/127.0.0.1#7913 ipset=/.google.ro/gfwlist server=/.google.ru/127.0.0.1#7913 @@ -4102,14 +4143,20 @@ server=/.google.rw/127.0.0.1#7913 ipset=/.google.rw/gfwlist server=/.google.sc/127.0.0.1#7913 ipset=/.google.sc/gfwlist +server=/.googlescholar.com/127.0.0.1#7913 +ipset=/.googlescholar.com/gfwlist server=/.google.sh/127.0.0.1#7913 ipset=/.google.sh/gfwlist +server=/.googlesile.com/127.0.0.1#7913 +ipset=/.googlesile.com/gfwlist server=/.google.sk/127.0.0.1#7913 ipset=/.google.sk/gfwlist server=/.google.sm/127.0.0.1#7913 ipset=/.google.sm/gfwlist server=/.google.sn/127.0.0.1#7913 ipset=/.google.sn/gfwlist +server=/.googlesource.com/127.0.0.1#7913 +ipset=/.googlesource.com/gfwlist server=/.google.tk/127.0.0.1#7913 ipset=/.google.tk/gfwlist server=/.google.tm/127.0.0.1#7913 @@ -4118,82 +4165,33 @@ server=/.google.to/127.0.0.1#7913 ipset=/.google.to/gfwlist server=/.google.tt/127.0.0.1#7913 ipset=/.google.tt/gfwlist -server=/.google.vu/127.0.0.1#7913 -ipset=/.google.vu/gfwlist -server=/.google.ws/127.0.0.1#7913 -ipset=/.google.ws/gfwlist -server=/.googleapis.cn/127.0.0.1#7913 -ipset=/.googleapis.cn/gfwlist -server=/.googleapis.com/127.0.0.1#7913 -ipset=/.googleapis.com/gfwlist -server=/.googleapps.com/127.0.0.1#7913 -ipset=/.googleapps.com/gfwlist -server=/.googlearth.com/127.0.0.1#7913 -ipset=/.googlearth.com/gfwlist -server=/.googleartproject.com/127.0.0.1#7913 -ipset=/.googleartproject.com/gfwlist -server=/.googleblog.com/127.0.0.1#7913 -ipset=/.googleblog.com/gfwlist -server=/.googlebot.com/127.0.0.1#7913 -ipset=/.googlebot.com/gfwlist -server=/.googlechinawebmaster.com/127.0.0.1#7913 -ipset=/.googlechinawebmaster.com/gfwlist -server=/.googlecode.com/127.0.0.1#7913 -ipset=/.googlecode.com/gfwlist -server=/.googlecommerce.com/127.0.0.1#7913 -ipset=/.googlecommerce.com/gfwlist -server=/.googledomains.com/127.0.0.1#7913 -ipset=/.googledomains.com/gfwlist -server=/.googledrive.com/127.0.0.1#7913 -ipset=/.googledrive.com/gfwlist -server=/.googleearth.com/127.0.0.1#7913 -ipset=/.googleearth.com/gfwlist -server=/.googlegroups.com/127.0.0.1#7913 -ipset=/.googlegroups.com/gfwlist -server=/.googlehosted.com/127.0.0.1#7913 -ipset=/.googlehosted.com/gfwlist -server=/.googleideas.com/127.0.0.1#7913 -ipset=/.googleideas.com/gfwlist -server=/.googleinsidesearch.com/127.0.0.1#7913 -ipset=/.googleinsidesearch.com/gfwlist -server=/.googlelabs.com/127.0.0.1#7913 -ipset=/.googlelabs.com/gfwlist -server=/.googlemail.com/127.0.0.1#7913 -ipset=/.googlemail.com/gfwlist -server=/.googlemashups.com/127.0.0.1#7913 -ipset=/.googlemashups.com/gfwlist -server=/.googlepagecreator.com/127.0.0.1#7913 -ipset=/.googlepagecreator.com/gfwlist -server=/.googleplay.com/127.0.0.1#7913 -ipset=/.googleplay.com/gfwlist -server=/.googleplus.com/127.0.0.1#7913 -ipset=/.googleplus.com/gfwlist -server=/.googlescholar.com/127.0.0.1#7913 -ipset=/.googlescholar.com/gfwlist -server=/.googlesile.com/127.0.0.1#7913 -ipset=/.googlesile.com/gfwlist -server=/.googlesource.com/127.0.0.1#7913 -ipset=/.googlesource.com/gfwlist server=/.googleusercontent.com/127.0.0.1#7913 ipset=/.googleusercontent.com/gfwlist server=/.googlevideo.com/127.0.0.1#7913 ipset=/.googlevideo.com/gfwlist +server=/.google.vu/127.0.0.1#7913 +ipset=/.google.vu/gfwlist server=/.googleweblight.com/127.0.0.1#7913 ipset=/.googleweblight.com/gfwlist +server=/.google.ws/127.0.0.1#7913 +ipset=/.google.ws/gfwlist server=/.googlezip.net/127.0.0.1#7913 ipset=/.googlezip.net/gfwlist +ipset=/.goo.gl/gfwlist server=/.gopetition.com/127.0.0.1#7913 ipset=/.gopetition.com/gfwlist +server=/.go-pki.com/127.0.0.1#7913 +ipset=/.go-pki.com/gfwlist server=/.goproxing.net/127.0.0.1#7913 ipset=/.goproxing.net/gfwlist server=/.goregrish.com/127.0.0.1#7913 ipset=/.goregrish.com/gfwlist server=/.gospelherald.com/127.0.0.1#7913 ipset=/.gospelherald.com/gfwlist -server=/.got-game.org/127.0.0.1#7913 -ipset=/.got-game.org/gfwlist server=/.gotdns.ch/127.0.0.1#7913 ipset=/.gotdns.ch/gfwlist +server=/.got-game.org/127.0.0.1#7913 +ipset=/.got-game.org/gfwlist server=/.gotgeeks.com/127.0.0.1#7913 ipset=/.gotgeeks.com/gfwlist server=/.gotrusted.com/127.0.0.1#7913 @@ -4204,6 +4202,8 @@ server=/.gov.taipei/127.0.0.1#7913 ipset=/.gov.taipei/gfwlist server=/.gov.tw/127.0.0.1#7913 ipset=/.gov.tw/gfwlist +server=/.g-queen.com/127.0.0.1#7913 +ipset=/.g-queen.com/gfwlist server=/.gr8domain.biz/127.0.0.1#7913 ipset=/.gr8domain.biz/gfwlist server=/.gr8name.biz/127.0.0.1#7913 @@ -4220,21 +4220,21 @@ server=/.graphql.org/127.0.0.1#7913 ipset=/.graphql.org/gfwlist server=/.greasespot.net/127.0.0.1#7913 ipset=/.greasespot.net/gfwlist -server=/.great-firewall.com/127.0.0.1#7913 -ipset=/.great-firewall.com/gfwlist -server=/.great-roc.org/127.0.0.1#7913 -ipset=/.great-roc.org/gfwlist server=/.greatfire.org/127.0.0.1#7913 ipset=/.greatfire.org/gfwlist server=/.greatfire.us7.list-manage.com/127.0.0.1#7913 ipset=/.greatfire.us7.list-manage.com/gfwlist server=/.greatfirewall.biz/127.0.0.1#7913 ipset=/.greatfirewall.biz/gfwlist +server=/.great-firewall.com/127.0.0.1#7913 +ipset=/.great-firewall.com/gfwlist server=/.greatfirewallofchina.net/127.0.0.1#7913 ipset=/.greatfirewallofchina.net/gfwlist server=/.greatfirewallofchina.org/127.0.0.1#7913 ipset=/.greatfirewallofchina.org/gfwlist +server=/.great-roc.org/127.0.0.1#7913 server=/.greatroc.org/127.0.0.1#7913 +ipset=/.great-roc.org/gfwlist ipset=/.greatroc.org/gfwlist server=/.greatroc.tw/127.0.0.1#7913 ipset=/.greatroc.tw/gfwlist @@ -4270,8 +4270,6 @@ server=/.gtricks.com/127.0.0.1#7913 ipset=/.gtricks.com/gfwlist server=/.gts-vpn.com/127.0.0.1#7913 ipset=/.gts-vpn.com/gfwlist -server=/.gu-chu-sum.org/127.0.0.1#7913 -ipset=/.gu-chu-sum.org/gfwlist server=/.guaguass.com/127.0.0.1#7913 ipset=/.guaguass.com/gfwlist server=/.guaguass.org/127.0.0.1#7913 @@ -4286,16 +4284,18 @@ server=/.guangnianvpn.com/127.0.0.1#7913 ipset=/.guangnianvpn.com/gfwlist server=/.guardster.com/127.0.0.1#7913 ipset=/.guardster.com/gfwlist +server=/.gu-chu-sum.org/127.0.0.1#7913 +ipset=/.gu-chu-sum.org/gfwlist server=/.guishan.org/127.0.0.1#7913 ipset=/.guishan.org/gfwlist server=/.gumroad.com/127.0.0.1#7913 ipset=/.gumroad.com/gfwlist -server=/.gun-world.net/127.0.0.1#7913 -ipset=/.gun-world.net/gfwlist server=/.gunsamerica.com/127.0.0.1#7913 ipset=/.gunsamerica.com/gfwlist server=/.gunsandammo.com/127.0.0.1#7913 ipset=/.gunsandammo.com/gfwlist +server=/.gun-world.net/127.0.0.1#7913 +ipset=/.gun-world.net/gfwlist server=/.guo.media/127.0.0.1#7913 ipset=/.guo.media/gfwlist server=/.guruonline.hk/127.0.0.1#7913 @@ -4322,10 +4322,6 @@ server=/.gzm.tv/127.0.0.1#7913 ipset=/.gzm.tv/gfwlist server=/.gzone-anime.info/127.0.0.1#7913 ipset=/.gzone-anime.info/gfwlist -server=/.h-china.org/127.0.0.1#7913 -ipset=/.h-china.org/gfwlist -server=/.h-moe.com/127.0.0.1#7913 -ipset=/.h-moe.com/gfwlist server=/.h1n1china.org/127.0.0.1#7913 ipset=/.h1n1china.org/gfwlist server=/.h528.com/127.0.0.1#7913 @@ -4362,10 +4358,10 @@ server=/.hanime.tv/127.0.0.1#7913 ipset=/.hanime.tv/gfwlist server=/.hanunyi.com/127.0.0.1#7913 ipset=/.hanunyi.com/gfwlist -server=/.hao.news/127.0.0.1#7913 -ipset=/.hao.news/gfwlist server=/.haoel.github.io/127.0.0.1#7913 ipset=/.haoel.github.io/gfwlist +server=/.hao.news/127.0.0.1#7913 +ipset=/.hao.news/gfwlist server=/.happy-vpn.com/127.0.0.1#7913 ipset=/.happy-vpn.com/gfwlist server=/.haproxy.org/127.0.0.1#7913 @@ -4374,22 +4370,24 @@ server=/.hardsextube.com/127.0.0.1#7913 ipset=/.hardsextube.com/gfwlist server=/.harunyahya.com/127.0.0.1#7913 ipset=/.harunyahya.com/gfwlist -server=/.hautelook.com/127.0.0.1#7913 -ipset=/.hautelook.com/gfwlist server=/.hautelookcdn.com/127.0.0.1#7913 ipset=/.hautelookcdn.com/gfwlist +server=/.hautelook.com/127.0.0.1#7913 +ipset=/.hautelook.com/gfwlist server=/.have8.com/127.0.0.1#7913 ipset=/.have8.com/gfwlist server=/.hbg.com/127.0.0.1#7913 ipset=/.hbg.com/gfwlist server=/.hbo.com/127.0.0.1#7913 ipset=/.hbo.com/gfwlist +server=/.h-china.org/127.0.0.1#7913 +ipset=/.h-china.org/gfwlist server=/.hclips.com/127.0.0.1#7913 ipset=/.hclips.com/gfwlist -server=/.hd.stheadline.com/127.0.0.1#7913 -ipset=/.hd.stheadline.com/gfwlist server=/.hdlt.me/127.0.0.1#7913 ipset=/.hdlt.me/gfwlist +server=/.hd.stheadline.com/127.0.0.1#7913 +ipset=/.hd.stheadline.com/gfwlist server=/.hdtvb.net/127.0.0.1#7913 ipset=/.hdtvb.net/gfwlist server=/.hdzog.com/127.0.0.1#7913 @@ -4398,12 +4396,12 @@ server=/.heartyit.com/127.0.0.1#7913 ipset=/.heartyit.com/gfwlist server=/.heavy-r.com/127.0.0.1#7913 ipset=/.heavy-r.com/gfwlist -server=/.hec.su/127.0.0.1#7913 -ipset=/.hec.su/gfwlist server=/.hecaitou.net/127.0.0.1#7913 ipset=/.hecaitou.net/gfwlist server=/.hechaji.com/127.0.0.1#7913 ipset=/.hechaji.com/gfwlist +server=/.hec.su/127.0.0.1#7913 +ipset=/.hec.su/gfwlist server=/.heeact.edu.tw/127.0.0.1#7913 ipset=/.heeact.edu.tw/gfwlist server=/.hegre-art.com/127.0.0.1#7913 @@ -4420,12 +4418,12 @@ server=/.hellotxt.com/127.0.0.1#7913 ipset=/.hellotxt.com/gfwlist server=/.hellouk.org/127.0.0.1#7913 ipset=/.hellouk.org/gfwlist -server=/.help.linksalpha.com/127.0.0.1#7913 -ipset=/.help.linksalpha.com/gfwlist server=/.helpeachpeople.com/127.0.0.1#7913 ipset=/.helpeachpeople.com/gfwlist server=/.helplinfen.com/127.0.0.1#7913 ipset=/.helplinfen.com/gfwlist +server=/.help.linksalpha.com/127.0.0.1#7913 +ipset=/.help.linksalpha.com/gfwlist server=/.helpster.de/127.0.0.1#7913 ipset=/.helpster.de/gfwlist server=/.helpzhuling.org/127.0.0.1#7913 @@ -4454,12 +4452,8 @@ server=/.hhdcb3office.org/127.0.0.1#7913 ipset=/.hhdcb3office.org/gfwlist server=/.hhthesakyatrizin.org/127.0.0.1#7913 ipset=/.hhthesakyatrizin.org/gfwlist -server=/.hi-on.org.tw/127.0.0.1#7913 -ipset=/.hi-on.org.tw/gfwlist server=/.hidden-advent.org/127.0.0.1#7913 ipset=/.hidden-advent.org/gfwlist -server=/.hide.me/127.0.0.1#7913 -ipset=/.hide.me/gfwlist server=/.hidecloud.com/127.0.0.1#7913 ipset=/.hidecloud.com/gfwlist server=/.hidein.net/127.0.0.1#7913 @@ -4468,14 +4462,16 @@ server=/.hideipvpn.com/127.0.0.1#7913 ipset=/.hideipvpn.com/gfwlist server=/.hideman.net/127.0.0.1#7913 ipset=/.hideman.net/gfwlist +server=/.hide.me/127.0.0.1#7913 +ipset=/.hide.me/gfwlist server=/.hideme.nl/127.0.0.1#7913 ipset=/.hideme.nl/gfwlist -server=/.hidemy.name/127.0.0.1#7913 -ipset=/.hidemy.name/gfwlist server=/.hidemyass.com/127.0.0.1#7913 ipset=/.hidemyass.com/gfwlist server=/.hidemycomp.com/127.0.0.1#7913 ipset=/.hidemycomp.com/gfwlist +server=/.hidemy.name/127.0.0.1#7913 +ipset=/.hidemy.name/gfwlist server=/.higfw.com/127.0.0.1#7913 ipset=/.higfw.com/gfwlist server=/.highpeakspureearth.com/127.0.0.1#7913 @@ -4500,6 +4496,8 @@ server=/.himemix.com/127.0.0.1#7913 ipset=/.himemix.com/gfwlist server=/.himemix.net/127.0.0.1#7913 ipset=/.himemix.net/gfwlist +server=/.hi-on.org.tw/127.0.0.1#7913 +ipset=/.hi-on.org.tw/gfwlist server=/.hitbtc.com/127.0.0.1#7913 ipset=/.hitbtc.com/gfwlist server=/.hitomi.la/127.0.0.1#7913 @@ -4509,37 +4507,11 @@ ipset=/.hiwifi.com/gfwlist server=/.hizb-ut-tahrir.info/127.0.0.1#7913 ipset=/.hizb-ut-tahrir.info/gfwlist server=/.hizb-ut-tahrir.org/127.0.0.1#7913 -ipset=/.hizb-ut-tahrir.org/gfwlist server=/.hizbuttahrir.org/127.0.0.1#7913 +ipset=/.hizb-ut-tahrir.org/gfwlist ipset=/.hizbuttahrir.org/gfwlist server=/.hjclub.info/127.0.0.1#7913 ipset=/.hjclub.info/gfwlist -server=/.hk-pub.com/127.0.0.1#7913 -ipset=/.hk-pub.com/gfwlist -server=/.hk.frienddy.com/127.0.0.1#7913 -ipset=/.hk.frienddy.com/gfwlist -server=/.hk.geocities.com/127.0.0.1#7913 -ipset=/.hk.geocities.com/gfwlist -server=/.hk.gradconnection.com/127.0.0.1#7913 -ipset=/.hk.gradconnection.com/gfwlist -server=/.hk.hao123img.com/127.0.0.1#7913 -ipset=/.hk.hao123img.com/gfwlist -server=/.hk.jiepang.com/127.0.0.1#7913 -ipset=/.hk.jiepang.com/gfwlist -server=/.hk.knowledge.yahoo.com/127.0.0.1#7913 -ipset=/.hk.knowledge.yahoo.com/gfwlist -server=/.hk.myblog.yahoo.com/127.0.0.1#7913 -ipset=/.hk.myblog.yahoo.com/gfwlist -server=/.hk.news.yahoo.com/127.0.0.1#7913 -ipset=/.hk.news.yahoo.com/gfwlist -server=/.hk.rd.yahoo.com/127.0.0.1#7913 -ipset=/.hk.rd.yahoo.com/gfwlist -server=/.hk.search.yahoo.com/127.0.0.1#7913 -ipset=/.hk.search.yahoo.com/gfwlist -server=/.hk.video.news.yahoo.com/127.0.0.1#7913 -ipset=/.hk.video.news.yahoo.com/gfwlist -server=/.hk.yahoo.com/127.0.0.1#7913 -ipset=/.hk.yahoo.com/gfwlist server=/.hk01.com/127.0.0.1#7913 ipset=/.hk01.com/gfwlist server=/.hk32168.com/127.0.0.1#7913 @@ -4586,14 +4558,22 @@ server=/.hkfaa.com/127.0.0.1#7913 ipset=/.hkfaa.com/gfwlist server=/.hkfreezone.com/127.0.0.1#7913 ipset=/.hkfreezone.com/gfwlist +server=/.hk.frienddy.com/127.0.0.1#7913 +ipset=/.hk.frienddy.com/gfwlist server=/.hkfront.org/127.0.0.1#7913 ipset=/.hkfront.org/gfwlist server=/.hkgalden.com/127.0.0.1#7913 ipset=/.hkgalden.com/gfwlist +server=/.hk.geocities.com/127.0.0.1#7913 +ipset=/.hk.geocities.com/gfwlist server=/.hkgolden.com/127.0.0.1#7913 ipset=/.hkgolden.com/gfwlist +server=/.hk.gradconnection.com/127.0.0.1#7913 +ipset=/.hk.gradconnection.com/gfwlist server=/.hkgreenradio.org/127.0.0.1#7913 ipset=/.hkgreenradio.org/gfwlist +server=/.hk.hao123img.com/127.0.0.1#7913 +ipset=/.hk.hao123img.com/gfwlist server=/.hkheadline.com/127.0.0.1#7913 ipset=/.hkheadline.com/gfwlist server=/.hkhkhk.com/127.0.0.1#7913 @@ -4606,28 +4586,48 @@ server=/.hkip.org.uk/127.0.0.1#7913 ipset=/.hkip.org.uk/gfwlist server=/.hkjc.com/127.0.0.1#7913 ipset=/.hkjc.com/gfwlist +server=/.hk.jiepang.com/127.0.0.1#7913 +ipset=/.hk.jiepang.com/gfwlist server=/.hkjp.org/127.0.0.1#7913 ipset=/.hkjp.org/gfwlist +server=/.hk.knowledge.yahoo.com/127.0.0.1#7913 +ipset=/.hk.knowledge.yahoo.com/gfwlist server=/.hklft.com/127.0.0.1#7913 ipset=/.hklft.com/gfwlist server=/.hklts.org.hk/127.0.0.1#7913 ipset=/.hklts.org.hk/gfwlist +server=/.hk.myblog.yahoo.com/127.0.0.1#7913 +ipset=/.hk.myblog.yahoo.com/gfwlist +server=/.hk.news.yahoo.com/127.0.0.1#7913 +ipset=/.hk.news.yahoo.com/gfwlist server=/.hkptu.org/127.0.0.1#7913 ipset=/.hkptu.org/gfwlist +server=/.hk-pub.com/127.0.0.1#7913 +ipset=/.hk-pub.com/gfwlist +server=/.hk.rd.yahoo.com/127.0.0.1#7913 +ipset=/.hk.rd.yahoo.com/gfwlist server=/.hkreporter.com/127.0.0.1#7913 ipset=/.hkreporter.com/gfwlist server=/.hkreporter.loved.hk/127.0.0.1#7913 ipset=/.hkreporter.loved.hk/gfwlist +server=/.hk.search.yahoo.com/127.0.0.1#7913 +ipset=/.hk.search.yahoo.com/gfwlist server=/.hkupop.hku.hk/127.0.0.1#7913 ipset=/.hkupop.hku.hk/gfwlist server=/.hkusu.net/127.0.0.1#7913 ipset=/.hkusu.net/gfwlist +server=/.hk.video.news.yahoo.com/127.0.0.1#7913 +ipset=/.hk.video.news.yahoo.com/gfwlist server=/.hkvwet.com/127.0.0.1#7913 ipset=/.hkvwet.com/gfwlist server=/.hkwcc.org.hk/127.0.0.1#7913 ipset=/.hkwcc.org.hk/gfwlist +server=/.hk.yahoo.com/127.0.0.1#7913 +ipset=/.hk.yahoo.com/gfwlist server=/.hkzone.org/127.0.0.1#7913 ipset=/.hkzone.org/gfwlist +server=/.h-moe.com/127.0.0.1#7913 +ipset=/.h-moe.com/gfwlist server=/.hmonghot.com/127.0.0.1#7913 ipset=/.hmonghot.com/gfwlist server=/.hmv.co.jp/127.0.0.1#7913 @@ -4648,16 +4648,16 @@ server=/.holymountaincn.com/127.0.0.1#7913 ipset=/.holymountaincn.com/gfwlist server=/.holyspiritspeaks.org/127.0.0.1#7913 ipset=/.holyspiritspeaks.org/gfwlist -server=/.home.sina.com/127.0.0.1#7913 -ipset=/.home.sina.com/gfwlist -server=/.home.so-net.net.tw/127.0.0.1#7913 -ipset=/.home.so-net.net.tw/gfwlist server=/.homedepot.com/127.0.0.1#7913 ipset=/.homedepot.com/gfwlist server=/.homeperversion.com/127.0.0.1#7913 ipset=/.homeperversion.com/gfwlist server=/.homeservershow.com/127.0.0.1#7913 ipset=/.homeservershow.com/gfwlist +server=/.home.sina.com/127.0.0.1#7913 +ipset=/.home.sina.com/gfwlist +server=/.home.so-net.net.tw/127.0.0.1#7913 +ipset=/.home.so-net.net.tw/gfwlist server=/.hongkongfp.com/127.0.0.1#7913 ipset=/.hongkongfp.com/gfwlist server=/.hongmeimei.com/127.0.0.1#7913 @@ -4722,52 +4722,52 @@ server=/.hrichina.org/127.0.0.1#7913 ipset=/.hrichina.org/gfwlist server=/.hrtsea.com/127.0.0.1#7913 ipset=/.hrtsea.com/gfwlist -server=/.hrw.org/127.0.0.1#7913 -ipset=/.hrw.org/gfwlist server=/.hrweb.org/127.0.0.1#7913 ipset=/.hrweb.org/gfwlist +server=/.hrw.org/127.0.0.1#7913 +ipset=/.hrw.org/gfwlist server=/.hsjp.net/127.0.0.1#7913 ipset=/.hsjp.net/gfwlist server=/.hsselite.com/127.0.0.1#7913 ipset=/.hsselite.com/gfwlist -server=/.hst.net.tw/127.0.0.1#7913 -ipset=/.hst.net.tw/gfwlist server=/.hstern.net/127.0.0.1#7913 ipset=/.hstern.net/gfwlist +server=/.hst.net.tw/127.0.0.1#7913 +ipset=/.hst.net.tw/gfwlist server=/.hstt.net/127.0.0.1#7913 ipset=/.hstt.net/gfwlist -server=/.ht.ly/127.0.0.1#7913 -ipset=/.ht.ly/gfwlist server=/.htkou.net/127.0.0.1#7913 ipset=/.htkou.net/gfwlist server=/.htl.li/127.0.0.1#7913 ipset=/.htl.li/gfwlist +server=/.ht.ly/127.0.0.1#7913 +ipset=/.ht.ly/gfwlist server=/.html5rocks.com/127.0.0.1#7913 ipset=/.html5rocks.com/gfwlist server=/.https443.net/127.0.0.1#7913 ipset=/.https443.net/gfwlist server=/.https443.org/127.0.0.1#7913 ipset=/.https443.org/gfwlist -server=/.hua-yue.net/127.0.0.1#7913 -ipset=/.hua-yue.net/gfwlist server=/.huaglad.com/127.0.0.1#7913 ipset=/.huaglad.com/gfwlist server=/.huanghuagang.org/127.0.0.1#7913 ipset=/.huanghuagang.org/gfwlist server=/.huangyiyu.com/127.0.0.1#7913 ipset=/.huangyiyu.com/gfwlist -server=/.huaren.us/127.0.0.1#7913 -ipset=/.huaren.us/gfwlist server=/.huaren4us.com/127.0.0.1#7913 ipset=/.huaren4us.com/gfwlist +server=/.huaren.us/127.0.0.1#7913 +ipset=/.huaren.us/gfwlist server=/.huashangnews.com/127.0.0.1#7913 ipset=/.huashangnews.com/gfwlist -server=/.huaxia-news.com/127.0.0.1#7913 -ipset=/.huaxia-news.com/gfwlist server=/.huaxiabao.org/127.0.0.1#7913 ipset=/.huaxiabao.org/gfwlist +server=/.huaxia-news.com/127.0.0.1#7913 +ipset=/.huaxia-news.com/gfwlist server=/.huaxin.ph/127.0.0.1#7913 ipset=/.huaxin.ph/gfwlist +server=/.hua-yue.net/127.0.0.1#7913 +ipset=/.hua-yue.net/gfwlist server=/.huayuworld.org/127.0.0.1#7913 ipset=/.huayuworld.org/gfwlist server=/.hudatoriq.web.id/127.0.0.1#7913 @@ -4792,16 +4792,16 @@ server=/.huluim.com/127.0.0.1#7913 ipset=/.huluim.com/gfwlist server=/.humanrightsbriefing.org/127.0.0.1#7913 ipset=/.humanrightsbriefing.org/gfwlist -server=/.hung-ya.com/127.0.0.1#7913 -ipset=/.hung-ya.com/gfwlist server=/.hungerstrikeforaids.org/127.0.0.1#7913 ipset=/.hungerstrikeforaids.org/gfwlist +server=/.hung-ya.com/127.0.0.1#7913 +ipset=/.hung-ya.com/gfwlist server=/.huobi.com/127.0.0.1#7913 ipset=/.huobi.com/gfwlist server=/.huobi.pro/127.0.0.1#7913 -ipset=/.huobi.pro/gfwlist server=/.huobipro.com/127.0.0.1#7913 ipset=/.huobipro.com/gfwlist +ipset=/.huobi.pro/gfwlist server=/.huping.net/127.0.0.1#7913 ipset=/.huping.net/gfwlist server=/.hurgokbayrak.com/127.0.0.1#7913 @@ -4832,14 +4832,6 @@ server=/.hybrid-analysis.com/127.0.0.1#7913 ipset=/.hybrid-analysis.com/gfwlist server=/.hyperrate.com/127.0.0.1#7913 ipset=/.hyperrate.com/gfwlist -server=/.i-cable.com/127.0.0.1#7913 -ipset=/.i-cable.com/gfwlist -server=/.i-part.com.tw/127.0.0.1#7913 -ipset=/.i-part.com.tw/gfwlist -server=/.i-scmp.com/127.0.0.1#7913 -ipset=/.i-scmp.com/gfwlist -server=/.i.lithium.com/127.0.0.1#7913 -ipset=/.i.lithium.com/gfwlist server=/.i1.hk/127.0.0.1#7913 ipset=/.i1.hk/gfwlist server=/.i2p2.de/127.0.0.1#7913 @@ -4868,6 +4860,8 @@ server=/.ibros.org/127.0.0.1#7913 ipset=/.ibros.org/gfwlist server=/.ibvpn.com/127.0.0.1#7913 ipset=/.ibvpn.com/gfwlist +server=/.i-cable.com/127.0.0.1#7913 +ipset=/.i-cable.com/gfwlist server=/.icams.com/127.0.0.1#7913 ipset=/.icams.com/gfwlist server=/.ice.audionow.com/127.0.0.1#7913 @@ -4882,16 +4876,16 @@ server=/.iconpaper.org/127.0.0.1#7913 ipset=/.iconpaper.org/gfwlist server=/.icu-project.org/127.0.0.1#7913 ipset=/.icu-project.org/gfwlist -server=/.id.hao123.com/127.0.0.1#7913 -ipset=/.id.hao123.com/gfwlist -server=/.id.heroku.com/127.0.0.1#7913 -ipset=/.id.heroku.com/gfwlist server=/.iddddg.com/127.0.0.1#7913 ipset=/.iddddg.com/gfwlist server=/.idemocracy.asia/127.0.0.1#7913 ipset=/.idemocracy.asia/gfwlist server=/.identi.ca/127.0.0.1#7913 ipset=/.identi.ca/gfwlist +server=/.id.hao123.com/127.0.0.1#7913 +ipset=/.id.hao123.com/gfwlist +server=/.id.heroku.com/127.0.0.1#7913 +ipset=/.id.heroku.com/gfwlist server=/.idiomconnection.com/127.0.0.1#7913 ipset=/.idiomconnection.com/gfwlist server=/.idouga.com/127.0.0.1#7913 @@ -4906,8 +4900,6 @@ server=/.ied2k.net/127.0.0.1#7913 ipset=/.ied2k.net/gfwlist server=/.ienergy1.com/127.0.0.1#7913 ipset=/.ienergy1.com/gfwlist -server=/.if.ttt/127.0.0.1#7913 -ipset=/.if.ttt/gfwlist server=/.ifan.cz.cc/127.0.0.1#7913 ipset=/.ifan.cz.cc/gfwlist server=/.ifanqiang.com/127.0.0.1#7913 @@ -4918,7 +4910,9 @@ server=/.ifjc.org/127.0.0.1#7913 ipset=/.ifjc.org/gfwlist server=/.ifreewares.com/127.0.0.1#7913 ipset=/.ifreewares.com/gfwlist +server=/.if.ttt/127.0.0.1#7913 server=/.ift.tt/127.0.0.1#7913 +ipset=/.if.ttt/gfwlist ipset=/.ift.tt/gfwlist server=/.igcd.net/127.0.0.1#7913 ipset=/.igcd.net/gfwlist @@ -4948,14 +4942,14 @@ server=/.ikstar.com/127.0.0.1#7913 ipset=/.ikstar.com/gfwlist server=/.ikwb.com/127.0.0.1#7913 ipset=/.ikwb.com/gfwlist +server=/.i.lithium.com/127.0.0.1#7913 +ipset=/.i.lithium.com/gfwlist server=/.illusionfactory.com/127.0.0.1#7913 ipset=/.illusionfactory.com/gfwlist server=/.ilove80.be/127.0.0.1#7913 ipset=/.ilove80.be/gfwlist server=/.ilovelongtoes.com/127.0.0.1#7913 ipset=/.ilovelongtoes.com/gfwlist -server=/.im.tv/127.0.0.1#7913 -ipset=/.im.tv/gfwlist server=/.im88.tw/127.0.0.1#7913 ipset=/.im88.tw/gfwlist server=/.imageab.com/127.0.0.1#7913 @@ -4964,10 +4958,10 @@ server=/.imagefap.com/127.0.0.1#7913 ipset=/.imagefap.com/gfwlist server=/.imageflea.com/127.0.0.1#7913 ipset=/.imageflea.com/gfwlist -server=/.images-gaytube.com/127.0.0.1#7913 -ipset=/.images-gaytube.com/gfwlist server=/.images.comico.tw/127.0.0.1#7913 ipset=/.images.comico.tw/gfwlist +server=/.images-gaytube.com/127.0.0.1#7913 +ipset=/.images-gaytube.com/gfwlist server=/.imageshack.us/127.0.0.1#7913 ipset=/.imageshack.us/gfwlist server=/.imagevenue.com/127.0.0.1#7913 @@ -4978,12 +4972,12 @@ server=/.imb.org/127.0.0.1#7913 ipset=/.imb.org/gfwlist server=/.imdb.com/127.0.0.1#7913 ipset=/.imdb.com/gfwlist +server=/.imgchili.net/127.0.0.1#7913 +ipset=/.imgchili.net/gfwlist server=/.img.dlsite.jp/127.0.0.1#7913 ipset=/.img.dlsite.jp/gfwlist server=/.img.ly/127.0.0.1#7913 ipset=/.img.ly/gfwlist -server=/.imgchili.net/127.0.0.1#7913 -ipset=/.imgchili.net/gfwlist server=/.imgmega.com/127.0.0.1#7913 ipset=/.imgmega.com/gfwlist server=/.imgur.com/127.0.0.1#7913 @@ -5000,8 +4994,8 @@ server=/.impact.org.au/127.0.0.1#7913 ipset=/.impact.org.au/gfwlist server=/.impp.mn/127.0.0.1#7913 ipset=/.impp.mn/gfwlist -server=/.in-disguise.com/127.0.0.1#7913 -ipset=/.in-disguise.com/gfwlist +server=/.im.tv/127.0.0.1#7913 +ipset=/.im.tv/gfwlist server=/.in99.org/127.0.0.1#7913 ipset=/.in99.org/gfwlist server=/.incapdns.net/127.0.0.1#7913 @@ -5014,6 +5008,8 @@ server=/.indiandefensenews.in/127.0.0.1#7913 ipset=/.indiandefensenews.in/gfwlist server=/.indiemerch.com/127.0.0.1#7913 ipset=/.indiemerch.com/gfwlist +server=/.in-disguise.com/127.0.0.1#7913 +ipset=/.in-disguise.com/gfwlist server=/.info-graf.fr/127.0.0.1#7913 ipset=/.info-graf.fr/gfwlist server=/.initiativesforchina.org/127.0.0.1#7913 @@ -5038,12 +5034,12 @@ server=/.institut-tibetain.org/127.0.0.1#7913 ipset=/.institut-tibetain.org/gfwlist server=/.international-news.newsmagazine.asia/127.0.0.1#7913 ipset=/.international-news.newsmagazine.asia/gfwlist -server=/.internet.org/127.0.0.1#7913 -ipset=/.internet.org/gfwlist server=/.internetdefenseleague.org/127.0.0.1#7913 ipset=/.internetdefenseleague.org/gfwlist server=/.internetfreedom.org/127.0.0.1#7913 ipset=/.internetfreedom.org/gfwlist +server=/.internet.org/127.0.0.1#7913 +ipset=/.internet.org/gfwlist server=/.internetpopculture.com/127.0.0.1#7913 ipset=/.internetpopculture.com/gfwlist server=/.inthenameofconfuciusmovie.com/127.0.0.1#7913 @@ -5058,6 +5054,8 @@ server=/.iownyour.org/127.0.0.1#7913 ipset=/.iownyour.org/gfwlist server=/.ipalter.com/127.0.0.1#7913 ipset=/.ipalter.com/gfwlist +server=/.i-part.com.tw/127.0.0.1#7913 +ipset=/.i-part.com.tw/gfwlist server=/.ipfire.org/127.0.0.1#7913 ipset=/.ipfire.org/gfwlist server=/.ipfs.io/127.0.0.1#7913 @@ -5084,10 +5082,10 @@ server=/.ippotv.com/127.0.0.1#7913 ipset=/.ippotv.com/gfwlist server=/.ipredator.se/127.0.0.1#7913 ipset=/.ipredator.se/gfwlist -server=/.iptv.com.tw/127.0.0.1#7913 -ipset=/.iptv.com.tw/gfwlist server=/.iptvbin.com/127.0.0.1#7913 ipset=/.iptvbin.com/gfwlist +server=/.iptv.com.tw/127.0.0.1#7913 +ipset=/.iptv.com.tw/gfwlist server=/.ipvanish.com/127.0.0.1#7913 ipset=/.ipvanish.com/gfwlist server=/.iredmail.org/127.0.0.1#7913 @@ -5098,22 +5096,22 @@ server=/.ironpython.net/127.0.0.1#7913 ipset=/.ironpython.net/gfwlist server=/.ironsocket.com/127.0.0.1#7913 ipset=/.ironsocket.com/gfwlist -server=/.is-a-hunter.com/127.0.0.1#7913 -ipset=/.is-a-hunter.com/gfwlist -server=/.is.gd/127.0.0.1#7913 -ipset=/.is.gd/gfwlist server=/.isaacmao.com/127.0.0.1#7913 ipset=/.isaacmao.com/gfwlist +server=/.is-a-hunter.com/127.0.0.1#7913 +ipset=/.is-a-hunter.com/gfwlist server=/.isasecret.com/127.0.0.1#7913 ipset=/.isasecret.com/gfwlist +server=/.i-scmp.com/127.0.0.1#7913 +ipset=/.i-scmp.com/gfwlist server=/.isc.sans.edu/127.0.0.1#7913 ipset=/.isc.sans.edu/gfwlist +server=/.is.gd/127.0.0.1#7913 +ipset=/.is.gd/gfwlist server=/.isgreat.org/127.0.0.1#7913 ipset=/.isgreat.org/gfwlist server=/.islahhaber.net/127.0.0.1#7913 ipset=/.islahhaber.net/gfwlist -server=/.islam.org.hk/127.0.0.1#7913 -ipset=/.islam.org.hk/gfwlist server=/.islamawareness.net/127.0.0.1#7913 ipset=/.islamawareness.net/gfwlist server=/.islamhouse.com/127.0.0.1#7913 @@ -5122,6 +5120,8 @@ server=/.islamicity.com/127.0.0.1#7913 ipset=/.islamicity.com/gfwlist server=/.islamicpluralism.org/127.0.0.1#7913 ipset=/.islamicpluralism.org/gfwlist +server=/.islam.org.hk/127.0.0.1#7913 +ipset=/.islam.org.hk/gfwlist server=/.islamtoday.net/127.0.0.1#7913 ipset=/.islamtoday.net/gfwlist server=/.ismaelan.com/127.0.0.1#7913 @@ -5158,10 +5158,10 @@ server=/.itemdb.com/127.0.0.1#7913 ipset=/.itemdb.com/gfwlist server=/.ithelp.ithome.com.tw/127.0.0.1#7913 ipset=/.ithelp.ithome.com.tw/gfwlist -server=/.its.caltech.edu/127.0.0.1#7913 -ipset=/.its.caltech.edu/gfwlist server=/.itsaol.com/127.0.0.1#7913 ipset=/.itsaol.com/gfwlist +server=/.its.caltech.edu/127.0.0.1#7913 +ipset=/.its.caltech.edu/gfwlist server=/.itshidden.com/127.0.0.1#7913 ipset=/.itshidden.com/gfwlist server=/.itsky.it/127.0.0.1#7913 @@ -5188,14 +5188,10 @@ server=/.iyouport.com/127.0.0.1#7913 ipset=/.iyouport.com/gfwlist server=/.izaobao.us/127.0.0.1#7913 ipset=/.izaobao.us/gfwlist -server=/.izles.net/127.0.0.1#7913 -ipset=/.izles.net/gfwlist server=/.izlesem.org/127.0.0.1#7913 ipset=/.izlesem.org/gfwlist -server=/.j.mp/127.0.0.1#7913 -ipset=/.j.mp/gfwlist -server=/.ja.wikipedia.org/127.0.0.1#7913 -ipset=/.ja.wikipedia.org/gfwlist +server=/.izles.net/127.0.0.1#7913 +ipset=/.izles.net/gfwlist server=/.jamaat.org/127.0.0.1#7913 ipset=/.jamaat.org/gfwlist server=/.jamyangnorbu.com/127.0.0.1#7913 @@ -5204,14 +5200,12 @@ server=/.jandyx.com/127.0.0.1#7913 ipset=/.jandyx.com/gfwlist server=/.janwongphoto.com/127.0.0.1#7913 ipset=/.janwongphoto.com/gfwlist -server=/.japan-whores.com/127.0.0.1#7913 -ipset=/.japan-whores.com/gfwlist server=/.japanfirst.asianfreeforum.com/127.0.0.1#7913 ipset=/.japanfirst.asianfreeforum.com/gfwlist server=/.japantimes.co.jp/127.0.0.1#7913 ipset=/.japantimes.co.jp/gfwlist -server=/.jav.com/127.0.0.1#7913 -ipset=/.jav.com/gfwlist +server=/.japan-whores.com/127.0.0.1#7913 +ipset=/.japan-whores.com/gfwlist server=/.jav101.com/127.0.0.1#7913 ipset=/.jav101.com/gfwlist server=/.jav2be.com/127.0.0.1#7913 @@ -5222,6 +5216,8 @@ server=/.javakiba.org/127.0.0.1#7913 ipset=/.javakiba.org/gfwlist server=/.javbus.com/127.0.0.1#7913 ipset=/.javbus.com/gfwlist +server=/.jav.com/127.0.0.1#7913 +ipset=/.jav.com/gfwlist server=/.javfor.me/127.0.0.1#7913 ipset=/.javfor.me/gfwlist server=/.javhd.com/127.0.0.1#7913 @@ -5246,6 +5242,8 @@ server=/.javtag.com/127.0.0.1#7913 ipset=/.javtag.com/gfwlist server=/.javzoo.com/127.0.0.1#7913 ipset=/.javzoo.com/gfwlist +server=/.ja.wikipedia.org/127.0.0.1#7913 +ipset=/.ja.wikipedia.org/gfwlist server=/.jbtalks.cc/127.0.0.1#7913 ipset=/.jbtalks.cc/gfwlist server=/.jbtalks.com/127.0.0.1#7913 @@ -5316,6 +5314,8 @@ server=/.jkub.com/127.0.0.1#7913 ipset=/.jkub.com/gfwlist server=/.jma.go.jp/127.0.0.1#7913 ipset=/.jma.go.jp/gfwlist +server=/.j.mp/127.0.0.1#7913 +ipset=/.j.mp/gfwlist server=/.jmscult.com/127.0.0.1#7913 ipset=/.jmscult.com/gfwlist server=/.joachims.org/127.0.0.1#7913 @@ -5380,22 +5380,18 @@ server=/.jwmusic.org/127.0.0.1#7913 ipset=/.jwmusic.org/gfwlist server=/.jyxf.net/127.0.0.1#7913 ipset=/.jyxf.net/gfwlist -server=/.k-doujin.net/127.0.0.1#7913 -ipset=/.k-doujin.net/gfwlist -server=/.ka-wai.com/127.0.0.1#7913 -ipset=/.ka-wai.com/gfwlist -server=/.kagyu.org.za/127.0.0.1#7913 -ipset=/.kagyu.org.za/gfwlist -server=/.kagyu.org/127.0.0.1#7913 -ipset=/.kagyu.org/gfwlist server=/.kagyumonlam.org/127.0.0.1#7913 ipset=/.kagyumonlam.org/gfwlist server=/.kagyunews.com.hk/127.0.0.1#7913 ipset=/.kagyunews.com.hk/gfwlist -server=/.kagyuoffice.org.tw/127.0.0.1#7913 -ipset=/.kagyuoffice.org.tw/gfwlist server=/.kagyuoffice.org/127.0.0.1#7913 ipset=/.kagyuoffice.org/gfwlist +server=/.kagyuoffice.org.tw/127.0.0.1#7913 +ipset=/.kagyuoffice.org.tw/gfwlist +server=/.kagyu.org/127.0.0.1#7913 +ipset=/.kagyu.org/gfwlist +server=/.kagyu.org.za/127.0.0.1#7913 +ipset=/.kagyu.org.za/gfwlist server=/.kaiyuan.de/127.0.0.1#7913 ipset=/.kaiyuan.de/gfwlist server=/.kakao.com/127.0.0.1#7913 @@ -5420,20 +5416,24 @@ server=/.karayou.com/127.0.0.1#7913 ipset=/.karayou.com/gfwlist server=/.karkhung.com/127.0.0.1#7913 ipset=/.karkhung.com/gfwlist -server=/.karmapa-teachings.org/127.0.0.1#7913 -ipset=/.karmapa-teachings.org/gfwlist server=/.karmapa.org/127.0.0.1#7913 ipset=/.karmapa.org/gfwlist +server=/.karmapa-teachings.org/127.0.0.1#7913 +ipset=/.karmapa-teachings.org/gfwlist +server=/.ka-wai.com/127.0.0.1#7913 +ipset=/.ka-wai.com/gfwlist server=/.kawaiikawaii.jp/127.0.0.1#7913 ipset=/.kawaiikawaii.jp/gfwlist server=/.kawase.com/127.0.0.1#7913 ipset=/.kawase.com/gfwlist -server=/.kb.monitorware.com/127.0.0.1#7913 -ipset=/.kb.monitorware.com/gfwlist server=/.kba-tx.org/127.0.0.1#7913 ipset=/.kba-tx.org/gfwlist +server=/.kb.monitorware.com/127.0.0.1#7913 +ipset=/.kb.monitorware.com/gfwlist server=/.kcoolonline.com/127.0.0.1#7913 ipset=/.kcoolonline.com/gfwlist +server=/.k-doujin.net/127.0.0.1#7913 +ipset=/.k-doujin.net/gfwlist server=/.kebrum.com/127.0.0.1#7913 ipset=/.kebrum.com/gfwlist server=/.kechara.com/127.0.0.1#7913 @@ -5492,20 +5492,20 @@ server=/.kissbbao.cn/127.0.0.1#7913 ipset=/.kissbbao.cn/gfwlist server=/.kiwi.kz/127.0.0.1#7913 ipset=/.kiwi.kz/gfwlist -server=/.kk-whys.co.jp/127.0.0.1#7913 -ipset=/.kk-whys.co.jp/gfwlist server=/.kkbox.com/127.0.0.1#7913 ipset=/.kkbox.com/gfwlist server=/.kknews.cc/127.0.0.1#7913 ipset=/.kknews.cc/gfwlist +server=/.kk-whys.co.jp/127.0.0.1#7913 +ipset=/.kk-whys.co.jp/gfwlist server=/.kmuh.org.tw/127.0.0.1#7913 ipset=/.kmuh.org.tw/gfwlist server=/.knowledgerush.com/127.0.0.1#7913 ipset=/.knowledgerush.com/gfwlist -server=/.kobo.com/127.0.0.1#7913 -ipset=/.kobo.com/gfwlist server=/.kobobooks.com/127.0.0.1#7913 ipset=/.kobobooks.com/gfwlist +server=/.kobo.com/127.0.0.1#7913 +ipset=/.kobo.com/gfwlist server=/.kodingen.com/127.0.0.1#7913 ipset=/.kodingen.com/gfwlist server=/.kompozer.net/127.0.0.1#7913 @@ -5558,12 +5558,12 @@ server=/.kyzyhello.com/127.0.0.1#7913 ipset=/.kyzyhello.com/gfwlist server=/.kzeng.info/127.0.0.1#7913 ipset=/.kzeng.info/gfwlist -server=/.la-forum.org/127.0.0.1#7913 -ipset=/.la-forum.org/gfwlist server=/.labiennale.org/127.0.0.1#7913 ipset=/.labiennale.org/gfwlist server=/.ladbrokes.com/127.0.0.1#7913 ipset=/.ladbrokes.com/gfwlist +server=/.la-forum.org/127.0.0.1#7913 +ipset=/.la-forum.org/gfwlist server=/.lagranepoca.com/127.0.0.1#7913 ipset=/.lagranepoca.com/gfwlist server=/.lalulalu.com/127.0.0.1#7913 @@ -5606,8 +5606,6 @@ server=/.lbank.info/127.0.0.1#7913 ipset=/.lbank.info/gfwlist server=/.ld.hao123img.com/127.0.0.1#7913 ipset=/.ld.hao123img.com/gfwlist -server=/.le-vpn.com/127.0.0.1#7913 -ipset=/.le-vpn.com/gfwlist server=/.leafyvpn.net/127.0.0.1#7913 ipset=/.leafyvpn.net/gfwlist server=/.lecloud.net/127.0.0.1#7913 @@ -5646,6 +5644,8 @@ server=/.letou.com/127.0.0.1#7913 ipset=/.letou.com/gfwlist server=/.letscorp.net/127.0.0.1#7913 ipset=/.letscorp.net/gfwlist +server=/.le-vpn.com/127.0.0.1#7913 +ipset=/.le-vpn.com/gfwlist server=/.lflink.com/127.0.0.1#7913 ipset=/.lflink.com/gfwlist server=/.lflinkup.com/127.0.0.1#7913 @@ -5692,22 +5692,22 @@ server=/.limiao.net/127.0.0.1#7913 ipset=/.limiao.net/gfwlist server=/.line-apps.com/127.0.0.1#7913 ipset=/.line-apps.com/gfwlist -server=/.line-scdn.net/127.0.0.1#7913 -ipset=/.line-scdn.net/gfwlist +server=/.linear-abematv.akamaized.net/127.0.0.1#7913 +ipset=/.linear-abematv.akamaized.net/gfwlist server=/.line.me/127.0.0.1#7913 ipset=/.line.me/gfwlist server=/.line.naver.jp/127.0.0.1#7913 ipset=/.line.naver.jp/gfwlist -server=/.linear-abematv.akamaized.net/127.0.0.1#7913 -ipset=/.linear-abematv.akamaized.net/gfwlist +server=/.line-scdn.net/127.0.0.1#7913 +ipset=/.line-scdn.net/gfwlist server=/.linglingfa.com/127.0.0.1#7913 ipset=/.linglingfa.com/gfwlist server=/.lingvodics.com/127.0.0.1#7913 ipset=/.lingvodics.com/gfwlist -server=/.link-o-rama.com/127.0.0.1#7913 -ipset=/.link-o-rama.com/gfwlist server=/.linkideo.com/127.0.0.1#7913 ipset=/.linkideo.com/gfwlist +server=/.link-o-rama.com/127.0.0.1#7913 +ipset=/.link-o-rama.com/gfwlist server=/.linkuswell.com/127.0.0.1#7913 ipset=/.linkuswell.com/gfwlist server=/.linux.org.hk/127.0.0.1#7913 @@ -5726,8 +5726,6 @@ server=/.listorious.com/127.0.0.1#7913 ipset=/.listorious.com/gfwlist server=/.lists.w3.org/127.0.0.1#7913 ipset=/.lists.w3.org/gfwlist -server=/.liu-xiaobo.org/127.0.0.1#7913 -ipset=/.liu-xiaobo.org/gfwlist server=/.liudejun.com/127.0.0.1#7913 ipset=/.liudejun.com/gfwlist server=/.liuhanyu.com/127.0.0.1#7913 @@ -5736,6 +5734,8 @@ server=/.liujianshu.com/127.0.0.1#7913 ipset=/.liujianshu.com/gfwlist server=/.liuxiaobo.net/127.0.0.1#7913 ipset=/.liuxiaobo.net/gfwlist +server=/.liu-xiaobo.org/127.0.0.1#7913 +ipset=/.liu-xiaobo.org/gfwlist server=/.liuxiaotong.com/127.0.0.1#7913 ipset=/.liuxiaotong.com/gfwlist server=/.livecoin.net/127.0.0.1#7913 @@ -5812,12 +5812,12 @@ server=/.lsd.org.hk/127.0.0.1#7913 ipset=/.lsd.org.hk/gfwlist server=/.lsforum.net/127.0.0.1#7913 ipset=/.lsforum.net/gfwlist -server=/.lsm.org/127.0.0.1#7913 -ipset=/.lsm.org/gfwlist server=/.lsmchinese.org/127.0.0.1#7913 ipset=/.lsmchinese.org/gfwlist server=/.lsmkorean.org/127.0.0.1#7913 ipset=/.lsmkorean.org/gfwlist +server=/.lsm.org/127.0.0.1#7913 +ipset=/.lsm.org/gfwlist server=/.lsmradio.com/127.0.0.1#7913 ipset=/.lsmradio.com/gfwlist server=/.lsmwebcast.com/127.0.0.1#7913 @@ -5844,16 +5844,6 @@ server=/.lyfhk.net/127.0.0.1#7913 ipset=/.lyfhk.net/gfwlist server=/.lzmtnews.org/127.0.0.1#7913 ipset=/.lzmtnews.org/gfwlist -server=/.m.hkgalden.com/127.0.0.1#7913 -ipset=/.m.hkgalden.com/gfwlist -server=/.m.me/127.0.0.1#7913 -ipset=/.m.me/gfwlist -server=/.m.plixi.com/127.0.0.1#7913 -ipset=/.m.plixi.com/gfwlist -server=/.m.slandr.net/127.0.0.1#7913 -ipset=/.m.slandr.net/gfwlist -server=/.ma.hao123.com/127.0.0.1#7913 -ipset=/.ma.hao123.com/gfwlist server=/.macgamestore.com/127.0.0.1#7913 ipset=/.macgamestore.com/gfwlist server=/.macrovpn.com/127.0.0.1#7913 @@ -5876,6 +5866,8 @@ server=/.magic-net.info/127.0.0.1#7913 ipset=/.magic-net.info/gfwlist server=/.mahabodhi.org/127.0.0.1#7913 ipset=/.mahabodhi.org/gfwlist +server=/.ma.hao123.com/127.0.0.1#7913 +ipset=/.ma.hao123.com/gfwlist server=/.maiio.net/127.0.0.1#7913 ipset=/.maiio.net/gfwlist server=/.mail-archive.com/127.0.0.1#7913 @@ -5976,22 +5968,18 @@ server=/.mcreasite.com/127.0.0.1#7913 ipset=/.mcreasite.com/gfwlist server=/.md-t.org/127.0.0.1#7913 ipset=/.md-t.org/gfwlist -server=/.me.me/127.0.0.1#7913 -ipset=/.me.me/gfwlist -server=/.me.youthwant.com.tw/127.0.0.1#7913 -ipset=/.me.youthwant.com.tw/gfwlist server=/.meansys.com/127.0.0.1#7913 ipset=/.meansys.com/gfwlist -server=/.media.nu.nl/127.0.0.1#7913 -ipset=/.media.nu.nl/gfwlist -server=/.media.org.hk/127.0.0.1#7913 -ipset=/.media.org.hk/gfwlist server=/.mediachinese.com/127.0.0.1#7913 ipset=/.mediachinese.com/gfwlist server=/.mediafire.com/127.0.0.1#7913 ipset=/.mediafire.com/gfwlist server=/.mediafreakcity.com/127.0.0.1#7913 ipset=/.mediafreakcity.com/gfwlist +server=/.media.nu.nl/127.0.0.1#7913 +ipset=/.media.nu.nl/gfwlist +server=/.media.org.hk/127.0.0.1#7913 +ipset=/.media.org.hk/gfwlist server=/.medium.com/127.0.0.1#7913 ipset=/.medium.com/gfwlist server=/.meetav.com/127.0.0.1#7913 @@ -6016,16 +6004,18 @@ server=/.meirixiaochao.com/127.0.0.1#7913 ipset=/.meirixiaochao.com/gfwlist server=/.meltoday.com/127.0.0.1#7913 ipset=/.meltoday.com/gfwlist -server=/.meme.yahoo.com/127.0.0.1#7913 -ipset=/.meme.yahoo.com/gfwlist +server=/.me.me/127.0.0.1#7913 +ipset=/.me.me/gfwlist server=/.memehk.com/127.0.0.1#7913 ipset=/.memehk.com/gfwlist +server=/.meme.yahoo.com/127.0.0.1#7913 +ipset=/.meme.yahoo.com/gfwlist server=/.memorybbs.com/127.0.0.1#7913 ipset=/.memorybbs.com/gfwlist -server=/.memri.org/127.0.0.1#7913 -ipset=/.memri.org/gfwlist server=/.memrijttm.org/127.0.0.1#7913 ipset=/.memrijttm.org/gfwlist +server=/.memri.org/127.0.0.1#7913 +ipset=/.memri.org/gfwlist server=/.mercatox.com/127.0.0.1#7913 ipset=/.mercatox.com/gfwlist server=/.mercyprophet.org/127.0.0.1#7913 @@ -6062,6 +6052,8 @@ server=/.metroradio.com.hk/127.0.0.1#7913 ipset=/.metroradio.com.hk/gfwlist server=/.meyou.jp/127.0.0.1#7913 ipset=/.meyou.jp/gfwlist +server=/.me.youthwant.com.tw/127.0.0.1#7913 +ipset=/.me.youthwant.com.tw/gfwlist server=/.meyul.com/127.0.0.1#7913 ipset=/.meyul.com/gfwlist server=/.mfxmedia.com/127.0.0.1#7913 @@ -6072,6 +6064,8 @@ server=/.mgstage.com/127.0.0.1#7913 ipset=/.mgstage.com/gfwlist server=/.mh4u.org/127.0.0.1#7913 ipset=/.mh4u.org/gfwlist +server=/.m.hkgalden.com/127.0.0.1#7913 +ipset=/.m.hkgalden.com/gfwlist server=/.mhradio.org/127.0.0.1#7913 ipset=/.mhradio.org/gfwlist server=/.michaelanti.com/127.0.0.1#7913 @@ -6108,12 +6102,12 @@ server=/.minghui-a.org/127.0.0.1#7913 ipset=/.minghui-a.org/gfwlist server=/.minghui-b.org/127.0.0.1#7913 ipset=/.minghui-b.org/gfwlist -server=/.minghui-school.org/127.0.0.1#7913 -ipset=/.minghui-school.org/gfwlist -server=/.minghui.or.kr/127.0.0.1#7913 -ipset=/.minghui.or.kr/gfwlist server=/.minghui.org/127.0.0.1#7913 ipset=/.minghui.org/gfwlist +server=/.minghui.or.kr/127.0.0.1#7913 +ipset=/.minghui.or.kr/gfwlist +server=/.minghui-school.org/127.0.0.1#7913 +ipset=/.minghui-school.org/gfwlist server=/.minghuiyw.wordpress.com/127.0.0.1#7913 ipset=/.minghuiyw.wordpress.com/gfwlist server=/.mingjinglishi.com/127.0.0.1#7913 @@ -6122,10 +6116,10 @@ server=/.mingjingnews.com/127.0.0.1#7913 ipset=/.mingjingnews.com/gfwlist server=/.mingjingtimes.com/127.0.0.1#7913 ipset=/.mingjingtimes.com/gfwlist -server=/.mingpao.com/127.0.0.1#7913 -ipset=/.mingpao.com/gfwlist server=/.mingpaocanada.com/127.0.0.1#7913 ipset=/.mingpaocanada.com/gfwlist +server=/.mingpao.com/127.0.0.1#7913 +ipset=/.mingpao.com/gfwlist server=/.mingpaomonthly.com/127.0.0.1#7913 ipset=/.mingpaomonthly.com/gfwlist server=/.mingpaonews.com/127.0.0.1#7913 @@ -6160,10 +6154,10 @@ server=/.mist.vip/127.0.0.1#7913 ipset=/.mist.vip/gfwlist server=/.mitao.com.tw/127.0.0.1#7913 ipset=/.mitao.com.tw/gfwlist -server=/.mitbbs.com/127.0.0.1#7913 -ipset=/.mitbbs.com/gfwlist server=/.mitbbsau.com/127.0.0.1#7913 ipset=/.mitbbsau.com/gfwlist +server=/.mitbbs.com/127.0.0.1#7913 +ipset=/.mitbbs.com/gfwlist server=/.mixero.com/127.0.0.1#7913 ipset=/.mixero.com/gfwlist server=/.mixpod.com/127.0.0.1#7913 @@ -6182,26 +6176,26 @@ server=/.mlcool.com/127.0.0.1#7913 ipset=/.mlcool.com/gfwlist server=/.mlzs.work/127.0.0.1#7913 ipset=/.mlzs.work/gfwlist -server=/.mm-cg.com/127.0.0.1#7913 -ipset=/.mm-cg.com/gfwlist server=/.mmaaxx.com/127.0.0.1#7913 ipset=/.mmaaxx.com/gfwlist +server=/.mm-cg.com/127.0.0.1#7913 +ipset=/.mm-cg.com/gfwlist +server=/.m.me/127.0.0.1#7913 +ipset=/.m.me/gfwlist server=/.mmmca.com/127.0.0.1#7913 ipset=/.mmmca.com/gfwlist server=/.mnewstv.com/127.0.0.1#7913 ipset=/.mnewstv.com/gfwlist -server=/.mo.nightlife141.com/127.0.0.1#7913 -ipset=/.mo.nightlife141.com/gfwlist server=/.mobatek.net/127.0.0.1#7913 ipset=/.mobatek.net/gfwlist server=/.mobile01.com/127.0.0.1#7913 ipset=/.mobile01.com/gfwlist server=/.mobileways.de/127.0.0.1#7913 ipset=/.mobileways.de/gfwlist -server=/.moby.to/127.0.0.1#7913 -ipset=/.moby.to/gfwlist server=/.mobypicture.com/127.0.0.1#7913 ipset=/.mobypicture.com/gfwlist +server=/.moby.to/127.0.0.1#7913 +ipset=/.moby.to/gfwlist server=/.moeaic.gov.tw/127.0.0.1#7913 ipset=/.moeaic.gov.tw/gfwlist server=/.moeerolibrary.com/127.0.0.1#7913 @@ -6226,10 +6220,12 @@ server=/.molihua.org/127.0.0.1#7913 ipset=/.molihua.org/gfwlist server=/.mondex.org/127.0.0.1#7913 ipset=/.mondex.org/gfwlist -server=/.money-link.com.tw/127.0.0.1#7913 -ipset=/.money-link.com.tw/gfwlist server=/.moneyhome.biz/127.0.0.1#7913 ipset=/.moneyhome.biz/gfwlist +server=/.money-link.com.tw/127.0.0.1#7913 +ipset=/.money-link.com.tw/gfwlist +server=/.mo.nightlife141.com/127.0.0.1#7913 +ipset=/.mo.nightlife141.com/gfwlist server=/.monitorchina.org/127.0.0.1#7913 ipset=/.monitorchina.org/gfwlist server=/.monster.com/127.0.0.1#7913 @@ -6268,6 +6264,8 @@ server=/.mpfinance.com/127.0.0.1#7913 ipset=/.mpfinance.com/gfwlist server=/.mpinews.com/127.0.0.1#7913 ipset=/.mpinews.com/gfwlist +server=/.m.plixi.com/127.0.0.1#7913 +ipset=/.m.plixi.com/gfwlist server=/.mponline.hk/127.0.0.1#7913 ipset=/.mponline.hk/gfwlist server=/.mqxd.org/127.0.0.1#7913 @@ -6288,6 +6286,8 @@ server=/.msguancha.com/127.0.0.1#7913 ipset=/.msguancha.com/gfwlist server=/.msha.gov/127.0.0.1#7913 ipset=/.msha.gov/gfwlist +server=/.m.slandr.net/127.0.0.1#7913 +ipset=/.m.slandr.net/gfwlist server=/.mswe1.org/127.0.0.1#7913 ipset=/.mswe1.org/gfwlist server=/.mthruf.com/127.0.0.1#7913 @@ -6322,22 +6322,10 @@ server=/.mvdis.gov.tw/127.0.0.1#7913 ipset=/.mvdis.gov.tw/gfwlist server=/.mvg.jp/127.0.0.1#7913 ipset=/.mvg.jp/gfwlist -server=/.mx.hao123.com/127.0.0.1#7913 -ipset=/.mx.hao123.com/gfwlist server=/.mx981.com/127.0.0.1#7913 ipset=/.mx981.com/gfwlist -server=/.my-formosa.com/127.0.0.1#7913 -ipset=/.my-formosa.com/gfwlist -server=/.my-private-network.co.uk/127.0.0.1#7913 -ipset=/.my-private-network.co.uk/gfwlist -server=/.my-proxy.com/127.0.0.1#7913 -ipset=/.my-proxy.com/gfwlist -server=/.my.mail.ru/127.0.0.1#7913 -ipset=/.my.mail.ru/gfwlist -server=/.my.opera.com/127.0.0.1#7913 -ipset=/.my.opera.com/gfwlist -server=/.my.pcloud.com/127.0.0.1#7913 -ipset=/.my.pcloud.com/gfwlist +server=/.mx.hao123.com/127.0.0.1#7913 +ipset=/.mx.hao123.com/gfwlist server=/.my03.com/127.0.0.1#7913 ipset=/.my03.com/gfwlist server=/.myactimes.com/127.0.0.1#7913 @@ -6376,6 +6364,8 @@ server=/.myeasytv.com/127.0.0.1#7913 ipset=/.myeasytv.com/gfwlist server=/.myeclipseide.com/127.0.0.1#7913 ipset=/.myeclipseide.com/gfwlist +server=/.my-formosa.com/127.0.0.1#7913 +ipset=/.my-formosa.com/gfwlist server=/.myforum.com.hk/127.0.0.1#7913 ipset=/.myforum.com.hk/gfwlist server=/.myforum.com.uk/127.0.0.1#7913 @@ -6396,6 +6386,8 @@ server=/.mykomica.org/127.0.0.1#7913 ipset=/.mykomica.org/gfwlist server=/.mylftv.com/127.0.0.1#7913 ipset=/.mylftv.com/gfwlist +server=/.my.mail.ru/127.0.0.1#7913 +ipset=/.my.mail.ru/gfwlist server=/.mymediarom.com/127.0.0.1#7913 ipset=/.mymediarom.com/gfwlist server=/.mymoe.moe/127.0.0.1#7913 @@ -6410,8 +6402,12 @@ server=/.mynetav.org/127.0.0.1#7913 ipset=/.mynetav.org/gfwlist server=/.mynumber.org/127.0.0.1#7913 ipset=/.mynumber.org/gfwlist +server=/.my.opera.com/127.0.0.1#7913 +ipset=/.my.opera.com/gfwlist server=/.myparagliding.com/127.0.0.1#7913 ipset=/.myparagliding.com/gfwlist +server=/.my.pcloud.com/127.0.0.1#7913 +ipset=/.my.pcloud.com/gfwlist server=/.mypicture.info/127.0.0.1#7913 ipset=/.mypicture.info/gfwlist server=/.mypop3.net/127.0.0.1#7913 @@ -6420,6 +6416,10 @@ server=/.mypop3.org/127.0.0.1#7913 ipset=/.mypop3.org/gfwlist server=/.mypopescu.com/127.0.0.1#7913 ipset=/.mypopescu.com/gfwlist +server=/.my-private-network.co.uk/127.0.0.1#7913 +ipset=/.my-private-network.co.uk/gfwlist +server=/.my-proxy.com/127.0.0.1#7913 +ipset=/.my-proxy.com/gfwlist server=/.myradio.hk/127.0.0.1#7913 ipset=/.myradio.hk/gfwlist server=/.myreadingmanga.info/127.0.0.1#7913 @@ -6432,10 +6432,10 @@ server=/.mysinablog.com/127.0.0.1#7913 ipset=/.mysinablog.com/gfwlist server=/.mysite.verizon.net/127.0.0.1#7913 ipset=/.mysite.verizon.net/gfwlist -server=/.myspace.com/127.0.0.1#7913 -ipset=/.myspace.com/gfwlist server=/.myspacecdn.com/127.0.0.1#7913 ipset=/.myspacecdn.com/gfwlist +server=/.myspace.com/127.0.0.1#7913 +ipset=/.myspace.com/gfwlist server=/.mytalkbox.com/127.0.0.1#7913 ipset=/.mytalkbox.com/gfwlist server=/.mytizi.com/127.0.0.1#7913 @@ -6456,10 +6456,10 @@ server=/.nalandabodhi.org/127.0.0.1#7913 ipset=/.nalandabodhi.org/gfwlist server=/.nalandawest.org/127.0.0.1#7913 ipset=/.nalandawest.org/gfwlist -server=/.namgyal.org/127.0.0.1#7913 -ipset=/.namgyal.org/gfwlist server=/.namgyalmonastery.org/127.0.0.1#7913 ipset=/.namgyalmonastery.org/gfwlist +server=/.namgyal.org/127.0.0.1#7913 +ipset=/.namgyal.org/gfwlist server=/.namsisi.com/127.0.0.1#7913 ipset=/.namsisi.com/gfwlist server=/.nanyang.com/127.0.0.1#7913 @@ -6474,14 +6474,14 @@ server=/.naol.cc/127.0.0.1#7913 ipset=/.naol.cc/gfwlist server=/.nat.gov.tw/127.0.0.1#7913 ipset=/.nat.gov.tw/gfwlist -server=/.nat.moe/127.0.0.1#7913 -ipset=/.nat.moe/gfwlist server=/.national-lottery.co.uk/127.0.0.1#7913 ipset=/.national-lottery.co.uk/gfwlist server=/.nationsonline.org/127.0.0.1#7913 ipset=/.nationsonline.org/gfwlist server=/.nationwide.com/127.0.0.1#7913 ipset=/.nationwide.com/gfwlist +server=/.nat.moe/127.0.0.1#7913 +ipset=/.nat.moe/gfwlist server=/.naughtyamerica.com/127.0.0.1#7913 ipset=/.naughtyamerica.com/gfwlist server=/.navyfamily.navy.mil/127.0.0.1#7913 @@ -6512,12 +6512,12 @@ server=/.neo-miracle.com/127.0.0.1#7913 ipset=/.neo-miracle.com/gfwlist server=/.nepusoku.com/127.0.0.1#7913 ipset=/.nepusoku.com/gfwlist -server=/.net-fits.pro/127.0.0.1#7913 -ipset=/.net-fits.pro/gfwlist server=/.netbirds.com/127.0.0.1#7913 ipset=/.netbirds.com/gfwlist server=/.netcolony.com/127.0.0.1#7913 ipset=/.netcolony.com/gfwlist +server=/.net-fits.pro/127.0.0.1#7913 +ipset=/.net-fits.pro/gfwlist server=/.netflix.com/127.0.0.1#7913 ipset=/.netflix.com/gfwlist server=/.netme.cc/127.0.0.1#7913 @@ -6534,10 +6534,10 @@ server=/.neverforget8964.org/127.0.0.1#7913 ipset=/.neverforget8964.org/gfwlist server=/.new-3lunch.net/127.0.0.1#7913 ipset=/.new-3lunch.net/gfwlist -server=/.new-akiba.com/127.0.0.1#7913 -ipset=/.new-akiba.com/gfwlist server=/.new96.ca/127.0.0.1#7913 ipset=/.new96.ca/gfwlist +server=/.new-akiba.com/127.0.0.1#7913 +ipset=/.new-akiba.com/gfwlist server=/.newcenturymc.com/127.0.0.1#7913 ipset=/.newcenturymc.com/gfwlist server=/.newcenturynews.com/127.0.0.1#7913 @@ -6552,8 +6552,20 @@ server=/.newlandmagazine.com.au/127.0.0.1#7913 ipset=/.newlandmagazine.com.au/gfwlist server=/.newnews.ca/127.0.0.1#7913 ipset=/.newnews.ca/gfwlist +server=/.news100.com.tw/127.0.0.1#7913 +ipset=/.news100.com.tw/gfwlist +server=/.newsancai.com/127.0.0.1#7913 +ipset=/.newsancai.com/gfwlist +server=/.newschinacomment.org/127.0.0.1#7913 +ipset=/.newschinacomment.org/gfwlist +server=/.newscn.org/127.0.0.1#7913 +ipset=/.newscn.org/gfwlist server=/.news.cnyes.com/127.0.0.1#7913 ipset=/.news.cnyes.com/gfwlist +server=/.newsdetox.ca/127.0.0.1#7913 +ipset=/.newsdetox.ca/gfwlist +server=/.newsdh.com/127.0.0.1#7913 +ipset=/.newsdh.com/gfwlist server=/.news.hk.msn.com/127.0.0.1#7913 ipset=/.news.hk.msn.com/gfwlist server=/.news.hkpeanut.com/127.0.0.1#7913 @@ -6566,6 +6578,8 @@ server=/.news.now.com/127.0.0.1#7913 ipset=/.news.now.com/gfwlist server=/.news.omy.sg/127.0.0.1#7913 ipset=/.news.omy.sg/gfwlist +server=/.newspeak.cc/127.0.0.1#7913 +ipset=/.newspeak.cc/gfwlist server=/.news.seehua.com/127.0.0.1#7913 ipset=/.news.seehua.com/gfwlist server=/.news.sina.com.hk/127.0.0.1#7913 @@ -6576,32 +6590,18 @@ server=/.news.sinchew.com.my/127.0.0.1#7913 ipset=/.news.sinchew.com.my/gfwlist server=/.news.singtao.ca/127.0.0.1#7913 ipset=/.news.singtao.ca/gfwlist -server=/.news.tvb.com/127.0.0.1#7913 -ipset=/.news.tvb.com/gfwlist -server=/.news.tvbs.com.tw/127.0.0.1#7913 -ipset=/.news.tvbs.com.tw/gfwlist -server=/.news.yahoo.com/127.0.0.1#7913 -ipset=/.news.yahoo.com/gfwlist -server=/.news100.com.tw/127.0.0.1#7913 -ipset=/.news100.com.tw/gfwlist -server=/.newsancai.com/127.0.0.1#7913 -ipset=/.newsancai.com/gfwlist -server=/.newschinacomment.org/127.0.0.1#7913 -ipset=/.newschinacomment.org/gfwlist -server=/.newscn.org/127.0.0.1#7913 -ipset=/.newscn.org/gfwlist -server=/.newsdetox.ca/127.0.0.1#7913 -ipset=/.newsdetox.ca/gfwlist -server=/.newsdh.com/127.0.0.1#7913 -ipset=/.newsdh.com/gfwlist -server=/.newspeak.cc/127.0.0.1#7913 -ipset=/.newspeak.cc/gfwlist server=/.newstamago.com/127.0.0.1#7913 ipset=/.newstamago.com/gfwlist server=/.newstapa.org/127.0.0.1#7913 ipset=/.newstapa.org/gfwlist server=/.newstarnet.com/127.0.0.1#7913 ipset=/.newstarnet.com/gfwlist +server=/.news.tvb.com/127.0.0.1#7913 +ipset=/.news.tvb.com/gfwlist +server=/.news.tvbs.com.tw/127.0.0.1#7913 +ipset=/.news.tvbs.com.tw/gfwlist +server=/.news.yahoo.com/127.0.0.1#7913 +ipset=/.news.yahoo.com/gfwlist server=/.newtaiwan.com.tw/127.0.0.1#7913 ipset=/.newtaiwan.com.tw/gfwlist server=/.newtalk.tw/127.0.0.1#7913 @@ -6678,16 +6678,16 @@ server=/.nko.navy.mil/127.0.0.1#7913 ipset=/.nko.navy.mil/gfwlist server=/.nlfreevpn.com/127.0.0.1#7913 ipset=/.nlfreevpn.com/gfwlist -server=/.no-ip.org/127.0.0.1#7913 -ipset=/.no-ip.org/gfwlist -server=/.nobel.se/127.0.0.1#7913 -ipset=/.nobel.se/gfwlist server=/.nobelprize.org/127.0.0.1#7913 ipset=/.nobelprize.org/gfwlist +server=/.nobel.se/127.0.0.1#7913 +ipset=/.nobel.se/gfwlist server=/.nobodycanstop.us/127.0.0.1#7913 ipset=/.nobodycanstop.us/gfwlist server=/.nofile.io/127.0.0.1#7913 ipset=/.nofile.io/gfwlist +server=/.no-ip.org/127.0.0.1#7913 +ipset=/.no-ip.org/gfwlist server=/.nokogiri.org/127.0.0.1#7913 ipset=/.nokogiri.org/gfwlist server=/.nokola.com/127.0.0.1#7913 @@ -6726,10 +6726,10 @@ server=/.npa.gov.tw/127.0.0.1#7913 ipset=/.npa.gov.tw/gfwlist server=/.npnt.me/127.0.0.1#7913 ipset=/.npnt.me/gfwlist -server=/.nps.gov/127.0.0.1#7913 -ipset=/.nps.gov/gfwlist server=/.npsboost.com/127.0.0.1#7913 ipset=/.npsboost.com/gfwlist +server=/.nps.gov/127.0.0.1#7913 +ipset=/.nps.gov/gfwlist server=/.nradio.me/127.0.0.1#7913 ipset=/.nradio.me/gfwlist server=/.nrk.no/127.0.0.1#7913 @@ -6761,7 +6761,6 @@ ipset=/.ntbna.gov.tw/gfwlist server=/.ntbt.gov.tw/127.0.0.1#7913 ipset=/.ntbt.gov.tw/gfwlist server=/.ntd.tv/127.0.0.1#7913 -ipset=/.ntd.tv/gfwlist server=/.ntdtv.ca/127.0.0.1#7913 ipset=/.ntdtv.ca/gfwlist server=/.ntdtv.co.kr/127.0.0.1#7913 @@ -6770,12 +6769,13 @@ server=/.ntdtv.com/127.0.0.1#7913 ipset=/.ntdtv.com/gfwlist server=/.ntdtv.cz/127.0.0.1#7913 ipset=/.ntdtv.cz/gfwlist +ipset=/.ntd.tv/gfwlist +server=/.ntdtvla.com/127.0.0.1#7913 +ipset=/.ntdtvla.com/gfwlist server=/.ntdtv.org/127.0.0.1#7913 ipset=/.ntdtv.org/gfwlist server=/.ntdtv.ru/127.0.0.1#7913 ipset=/.ntdtv.ru/gfwlist -server=/.ntdtvla.com/127.0.0.1#7913 -ipset=/.ntdtvla.com/gfwlist server=/.ntrfun.com/127.0.0.1#7913 ipset=/.ntrfun.com/gfwlist server=/.ntsna.gov.tw/127.0.0.1#7913 @@ -6806,10 +6806,6 @@ server=/.nvtongzhisheng.org/127.0.0.1#7913 ipset=/.nvtongzhisheng.org/gfwlist server=/.nwtca.org/127.0.0.1#7913 ipset=/.nwtca.org/gfwlist -server=/.ny.stgloballink.com/127.0.0.1#7913 -ipset=/.ny.stgloballink.com/gfwlist -server=/.ny.visiontimes.com/127.0.0.1#7913 -ipset=/.ny.visiontimes.com/gfwlist server=/.nyaa.eu/127.0.0.1#7913 ipset=/.nyaa.eu/gfwlist server=/.nyaa.si/127.0.0.1#7913 @@ -6820,24 +6816,28 @@ server=/.nylon-angel.com/127.0.0.1#7913 ipset=/.nylon-angel.com/gfwlist server=/.nylonstockingsonline.com/127.0.0.1#7913 ipset=/.nylonstockingsonline.com/gfwlist -server=/.nyt.com/127.0.0.1#7913 -ipset=/.nyt.com/gfwlist +server=/.ny.stgloballink.com/127.0.0.1#7913 +ipset=/.ny.stgloballink.com/gfwlist server=/.nytchina.com/127.0.0.1#7913 ipset=/.nytchina.com/gfwlist server=/.nytcn.me/127.0.0.1#7913 ipset=/.nytcn.me/gfwlist server=/.nytco.com/127.0.0.1#7913 ipset=/.nytco.com/gfwlist -server=/.nyti.ms/127.0.0.1#7913 -ipset=/.nyti.ms/gfwlist +server=/.nyt.com/127.0.0.1#7913 +ipset=/.nyt.com/gfwlist server=/.nytimes.com/127.0.0.1#7913 ipset=/.nytimes.com/gfwlist server=/.nytimes.map.fastly.net/127.0.0.1#7913 ipset=/.nytimes.map.fastly.net/gfwlist server=/.nytimg.com/127.0.0.1#7913 ipset=/.nytimg.com/gfwlist +server=/.nyti.ms/127.0.0.1#7913 +ipset=/.nyti.ms/gfwlist server=/.nytstyle.com/127.0.0.1#7913 ipset=/.nytstyle.com/gfwlist +server=/.ny.visiontimes.com/127.0.0.1#7913 +ipset=/.ny.visiontimes.com/gfwlist server=/.nzchinese.com/127.0.0.1#7913 ipset=/.nzchinese.com/gfwlist server=/.nzchinese.net.nz/127.0.0.1#7913 @@ -6858,10 +6858,10 @@ server=/.ocry.com/127.0.0.1#7913 ipset=/.ocry.com/gfwlist server=/.october-review.org/127.0.0.1#7913 ipset=/.october-review.org/gfwlist -server=/.oculus.com/127.0.0.1#7913 -ipset=/.oculus.com/gfwlist server=/.oculuscdn.com/127.0.0.1#7913 ipset=/.oculuscdn.com/gfwlist +server=/.oculus.com/127.0.0.1#7913 +ipset=/.oculus.com/gfwlist server=/.oex.com/127.0.0.1#7913 ipset=/.oex.com/gfwlist server=/.offbeatchina.com/127.0.0.1#7913 @@ -6880,14 +6880,14 @@ server=/.oiktv.com/127.0.0.1#7913 ipset=/.oiktv.com/gfwlist server=/.oizoblog.com/127.0.0.1#7913 ipset=/.oizoblog.com/gfwlist -server=/.ok.ru/127.0.0.1#7913 -ipset=/.ok.ru/gfwlist server=/.okayfreedom.com/127.0.0.1#7913 ipset=/.okayfreedom.com/gfwlist server=/.okex.com/127.0.0.1#7913 ipset=/.okex.com/gfwlist server=/.okk.tw/127.0.0.1#7913 ipset=/.okk.tw/gfwlist +server=/.ok.ru/127.0.0.1#7913 +ipset=/.ok.ru/gfwlist server=/.old-cat.net/127.0.0.1#7913 ipset=/.old-cat.net/gfwlist server=/.old.honeynet.org/127.0.0.1#7913 @@ -6906,12 +6906,12 @@ server=/.omnitalk.com/127.0.0.1#7913 ipset=/.omnitalk.com/gfwlist server=/.omnitalk.org/127.0.0.1#7913 ipset=/.omnitalk.org/gfwlist -server=/.on.cc/127.0.0.1#7913 -ipset=/.on.cc/gfwlist server=/.on2.com/127.0.0.1#7913 ipset=/.on2.com/gfwlist server=/.onapp.com/127.0.0.1#7913 ipset=/.onapp.com/gfwlist +server=/.on.cc/127.0.0.1#7913 +ipset=/.on.cc/gfwlist server=/.onedrive.live.com/127.0.0.1#7913 ipset=/.onedrive.live.com/gfwlist server=/.onedumb.com/127.0.0.1#7913 @@ -6920,10 +6920,10 @@ server=/.onejav.com/127.0.0.1#7913 ipset=/.onejav.com/gfwlist server=/.onion.city/127.0.0.1#7913 ipset=/.onion.city/gfwlist -server=/.online.recoveryversion.org/127.0.0.1#7913 -ipset=/.online.recoveryversion.org/gfwlist server=/.onlinecha.com/127.0.0.1#7913 ipset=/.onlinecha.com/gfwlist +server=/.online.recoveryversion.org/127.0.0.1#7913 +ipset=/.online.recoveryversion.org/gfwlist server=/.onlineyoutube.com/127.0.0.1#7913 ipset=/.onlineyoutube.com/gfwlist server=/.onlytweets.com/127.0.0.1#7913 @@ -6948,10 +6948,10 @@ server=/.ontrac.com/127.0.0.1#7913 ipset=/.ontrac.com/gfwlist server=/.oopsforum.com/127.0.0.1#7913 ipset=/.oopsforum.com/gfwlist -server=/.open.com.hk/127.0.0.1#7913 -ipset=/.open.com.hk/gfwlist server=/.openallweb.com/127.0.0.1#7913 ipset=/.openallweb.com/gfwlist +server=/.open.com.hk/127.0.0.1#7913 +ipset=/.open.com.hk/gfwlist server=/.opendemocracy.net/127.0.0.1#7913 ipset=/.opendemocracy.net/gfwlist server=/.opendn.xyz/127.0.0.1#7913 @@ -6984,10 +6984,10 @@ server=/.orgasm.com/127.0.0.1#7913 ipset=/.orgasm.com/gfwlist server=/.orgfree.com/127.0.0.1#7913 ipset=/.orgfree.com/gfwlist -server=/.orient-doll.com/127.0.0.1#7913 -ipset=/.orient-doll.com/gfwlist server=/.orientaldaily.com.my/127.0.0.1#7913 ipset=/.orientaldaily.com.my/gfwlist +server=/.orient-doll.com/127.0.0.1#7913 +ipset=/.orient-doll.com/gfwlist server=/.orn.jp/127.0.0.1#7913 ipset=/.orn.jp/gfwlist server=/.orzistic.org/127.0.0.1#7913 @@ -7018,10 +7018,10 @@ server=/.overplay.net/127.0.0.1#7913 ipset=/.overplay.net/gfwlist server=/.oversea.istarshine.com/127.0.0.1#7913 ipset=/.oversea.istarshine.com/gfwlist -server=/.ow.ly/127.0.0.1#7913 -ipset=/.ow.ly/gfwlist server=/.owl.li/127.0.0.1#7913 ipset=/.owl.li/gfwlist +server=/.ow.ly/127.0.0.1#7913 +ipset=/.ow.ly/gfwlist server=/.oyax.com/127.0.0.1#7913 ipset=/.oyax.com/gfwlist server=/.oyghan.com/127.0.0.1#7913 @@ -7046,10 +7046,10 @@ server=/.pacopacomama.com/127.0.0.1#7913 ipset=/.pacopacomama.com/gfwlist server=/.padmanet.com/127.0.0.1#7913 ipset=/.padmanet.com/gfwlist -server=/.page.bid.yahoo.com/127.0.0.1#7913 -ipset=/.page.bid.yahoo.com/gfwlist server=/.page2rss.com/127.0.0.1#7913 ipset=/.page2rss.com/gfwlist +server=/.page.bid.yahoo.com/127.0.0.1#7913 +ipset=/.page.bid.yahoo.com/gfwlist server=/.pagodabox.com/127.0.0.1#7913 ipset=/.pagodabox.com/gfwlist server=/.palacemoon.com/127.0.0.1#7913 @@ -7078,10 +7078,10 @@ server=/.panoramio.com/127.0.0.1#7913 ipset=/.panoramio.com/gfwlist server=/.pao-pao.net/127.0.0.1#7913 ipset=/.pao-pao.net/gfwlist -server=/.paper.li/127.0.0.1#7913 -ipset=/.paper.li/gfwlist server=/.paperb.us/127.0.0.1#7913 ipset=/.paperb.us/gfwlist +server=/.paper.li/127.0.0.1#7913 +ipset=/.paper.li/gfwlist server=/.paradisehill.cc/127.0.0.1#7913 ipset=/.paradisehill.cc/gfwlist server=/.paradisepoker.com/127.0.0.1#7913 @@ -7096,10 +7096,10 @@ server=/.passion.com/127.0.0.1#7913 ipset=/.passion.com/gfwlist server=/.passiontimes.hk/127.0.0.1#7913 ipset=/.passiontimes.hk/gfwlist -server=/.paste.ee/127.0.0.1#7913 -ipset=/.paste.ee/gfwlist server=/.pastebin.com/127.0.0.1#7913 ipset=/.pastebin.com/gfwlist +server=/.paste.ee/127.0.0.1#7913 +ipset=/.paste.ee/gfwlist server=/.pastie.org/127.0.0.1#7913 ipset=/.pastie.org/gfwlist server=/.pbs.org/127.0.0.1#7913 @@ -7146,14 +7146,14 @@ server=/.pekingduck.org/127.0.0.1#7913 ipset=/.pekingduck.org/gfwlist server=/.pemulihan.or.id/127.0.0.1#7913 ipset=/.pemulihan.or.id/gfwlist -server=/.pen.io/127.0.0.1#7913 -ipset=/.pen.io/gfwlist server=/.penchinese.com/127.0.0.1#7913 ipset=/.penchinese.com/gfwlist server=/.penchinese.net/127.0.0.1#7913 ipset=/.penchinese.net/gfwlist server=/.pengyulong.com/127.0.0.1#7913 ipset=/.pengyulong.com/gfwlist +server=/.pen.io/127.0.0.1#7913 +ipset=/.pen.io/gfwlist server=/.penisbot.com/127.0.0.1#7913 ipset=/.penisbot.com/gfwlist server=/.penthouse.com/127.0.0.1#7913 @@ -7202,26 +7202,26 @@ server=/.photofocus.com/127.0.0.1#7913 ipset=/.photofocus.com/gfwlist server=/.phuquocservices.com/127.0.0.1#7913 ipset=/.phuquocservices.com/gfwlist -server=/.picacomic.com/127.0.0.1#7913 -ipset=/.picacomic.com/gfwlist server=/.picacomiccn.com/127.0.0.1#7913 ipset=/.picacomiccn.com/gfwlist +server=/.picacomic.com/127.0.0.1#7913 +ipset=/.picacomic.com/gfwlist server=/.picasaweb.com/127.0.0.1#7913 ipset=/.picasaweb.com/gfwlist server=/.picidae.net/127.0.0.1#7913 ipset=/.picidae.net/gfwlist server=/.picturedip.com/127.0.0.1#7913 ipset=/.picturedip.com/gfwlist -server=/.pictures.playboy.com/127.0.0.1#7913 -ipset=/.pictures.playboy.com/gfwlist server=/.picturesocial.com/127.0.0.1#7913 ipset=/.picturesocial.com/gfwlist +server=/.pictures.playboy.com/127.0.0.1#7913 +ipset=/.pictures.playboy.com/gfwlist server=/.pimg.tw/127.0.0.1#7913 ipset=/.pimg.tw/gfwlist -server=/.pin-cong.com/127.0.0.1#7913 -ipset=/.pin-cong.com/gfwlist server=/.pin6.com/127.0.0.1#7913 ipset=/.pin6.com/gfwlist +server=/.pin-cong.com/127.0.0.1#7913 +ipset=/.pin-cong.com/gfwlist server=/.pincong.rocks/127.0.0.1#7913 ipset=/.pincong.rocks/gfwlist server=/.ping.fm/127.0.0.1#7913 @@ -7238,10 +7238,10 @@ server=/.pinterest.ca/127.0.0.1#7913 ipset=/.pinterest.ca/gfwlist server=/.pinterest.co.kr/127.0.0.1#7913 ipset=/.pinterest.co.kr/gfwlist -server=/.pinterest.co.uk/127.0.0.1#7913 -ipset=/.pinterest.co.uk/gfwlist server=/.pinterest.com/127.0.0.1#7913 ipset=/.pinterest.com/gfwlist +server=/.pinterest.co.uk/127.0.0.1#7913 +ipset=/.pinterest.co.uk/gfwlist server=/.pinterest.de/127.0.0.1#7913 ipset=/.pinterest.de/gfwlist server=/.pinterest.dk/127.0.0.1#7913 @@ -7294,12 +7294,12 @@ server=/.plunder.com/127.0.0.1#7913 ipset=/.plunder.com/gfwlist server=/.plurk.com/127.0.0.1#7913 ipset=/.plurk.com/gfwlist -server=/.plus.codes/127.0.0.1#7913 -ipset=/.plus.codes/gfwlist server=/.plus28.com/127.0.0.1#7913 ipset=/.plus28.com/gfwlist server=/.plusbb.com/127.0.0.1#7913 ipset=/.plusbb.com/gfwlist +server=/.plus.codes/127.0.0.1#7913 +ipset=/.plus.codes/gfwlist server=/.pmatehunter.com/127.0.0.1#7913 ipset=/.pmatehunter.com/gfwlist server=/.pmates.com/127.0.0.1#7913 @@ -7322,10 +7322,10 @@ server=/.politiscales.net/127.0.0.1#7913 ipset=/.politiscales.net/gfwlist server=/.poloniex.com/127.0.0.1#7913 ipset=/.poloniex.com/gfwlist -server=/.polymer-project.org/127.0.0.1#7913 -ipset=/.polymer-project.org/gfwlist server=/.polymerhk.com/127.0.0.1#7913 ipset=/.polymerhk.com/gfwlist +server=/.polymer-project.org/127.0.0.1#7913 +ipset=/.polymer-project.org/gfwlist server=/.popo.tw/127.0.0.1#7913 ipset=/.popo.tw/gfwlist server=/.popvote.hk/127.0.0.1#7913 @@ -7334,14 +7334,14 @@ server=/.popyard.com/127.0.0.1#7913 ipset=/.popyard.com/gfwlist server=/.popyard.org/127.0.0.1#7913 ipset=/.popyard.org/gfwlist -server=/.porn.com/127.0.0.1#7913 -ipset=/.porn.com/gfwlist server=/.porn2.com/127.0.0.1#7913 ipset=/.porn2.com/gfwlist server=/.porn5.com/127.0.0.1#7913 ipset=/.porn5.com/gfwlist server=/.pornbase.org/127.0.0.1#7913 ipset=/.pornbase.org/gfwlist +server=/.porn.com/127.0.0.1#7913 +ipset=/.porn.com/gfwlist server=/.pornerbros.com/127.0.0.1#7913 ipset=/.pornerbros.com/gfwlist server=/.pornhd.com/127.0.0.1#7913 @@ -7392,10 +7392,10 @@ server=/.potato.im/127.0.0.1#7913 ipset=/.potato.im/gfwlist server=/.potvpn.com/127.0.0.1#7913 ipset=/.potvpn.com/gfwlist -server=/.power.com/127.0.0.1#7913 -ipset=/.power.com/gfwlist server=/.powerapple.com/127.0.0.1#7913 ipset=/.powerapple.com/gfwlist +server=/.power.com/127.0.0.1#7913 +ipset=/.power.com/gfwlist server=/.powercx.com/127.0.0.1#7913 ipset=/.powercx.com/gfwlist server=/.powerphoto.org/127.0.0.1#7913 @@ -7472,12 +7472,12 @@ server=/.psblog.name/127.0.0.1#7913 ipset=/.psblog.name/gfwlist server=/.pscp.tv/127.0.0.1#7913 ipset=/.pscp.tv/gfwlist +server=/.psiphon3.com/127.0.0.1#7913 +ipset=/.psiphon3.com/gfwlist server=/.psiphon.ca/127.0.0.1#7913 ipset=/.psiphon.ca/gfwlist server=/.psiphon.civisec.org/127.0.0.1#7913 ipset=/.psiphon.civisec.org/gfwlist -server=/.psiphon3.com/127.0.0.1#7913 -ipset=/.psiphon3.com/gfwlist server=/.psiphontoday.com/127.0.0.1#7913 ipset=/.psiphontoday.com/gfwlist server=/.pts.org.tw/127.0.0.1#7913 @@ -7526,10 +7526,10 @@ server=/.puuko.com/127.0.0.1#7913 ipset=/.puuko.com/gfwlist server=/.pwned.com/127.0.0.1#7913 ipset=/.pwned.com/gfwlist -server=/.python.com.tw/127.0.0.1#7913 -ipset=/.python.com.tw/gfwlist server=/.python.com/127.0.0.1#7913 ipset=/.python.com/gfwlist +server=/.python.com.tw/127.0.0.1#7913 +ipset=/.python.com.tw/gfwlist server=/.pythonhackers.com/127.0.0.1#7913 ipset=/.pythonhackers.com/gfwlist server=/.pytorch.org/127.0.0.1#7913 @@ -7540,8 +7540,6 @@ server=/.qgirl.com.tw/127.0.0.1#7913 ipset=/.qgirl.com.tw/gfwlist server=/.qhigh.com/127.0.0.1#7913 ipset=/.qhigh.com/gfwlist -server=/.qi-gong.me/127.0.0.1#7913 -ipset=/.qi-gong.me/gfwlist server=/.qiandao.today/127.0.0.1#7913 ipset=/.qiandao.today/gfwlist server=/.qiangyou.org/127.0.0.1#7913 @@ -7550,6 +7548,8 @@ server=/.qidian.ca/127.0.0.1#7913 ipset=/.qidian.ca/gfwlist server=/.qienkuen.org/127.0.0.1#7913 ipset=/.qienkuen.org/gfwlist +server=/.qi-gong.me/127.0.0.1#7913 +ipset=/.qi-gong.me/gfwlist server=/.qiwen.lu/127.0.0.1#7913 ipset=/.qiwen.lu/gfwlist server=/.qixianglu.cn/127.0.0.1#7913 @@ -7578,10 +7578,10 @@ server=/.quitccp.net/127.0.0.1#7913 ipset=/.quitccp.net/gfwlist server=/.quitccp.org/127.0.0.1#7913 ipset=/.quitccp.org/gfwlist -server=/.quora.com/127.0.0.1#7913 -ipset=/.quora.com/gfwlist server=/.quoracdn.net/127.0.0.1#7913 ipset=/.quoracdn.net/gfwlist +server=/.quora.com/127.0.0.1#7913 +ipset=/.quora.com/gfwlist server=/.quran.com/127.0.0.1#7913 ipset=/.quran.com/gfwlist server=/.quranexplorer.com/127.0.0.1#7913 @@ -7596,8 +7596,6 @@ server=/.qz.com/127.0.0.1#7913 ipset=/.qz.com/gfwlist server=/.r18.com/127.0.0.1#7913 ipset=/.r18.com/gfwlist -server=/.ra.gg/127.0.0.1#7913 -ipset=/.ra.gg/gfwlist server=/.radicalparty.org/127.0.0.1#7913 ipset=/.radicalparty.org/gfwlist server=/.radiko.jp/127.0.0.1#7913 @@ -7612,8 +7610,10 @@ server=/.radiovncr.com/127.0.0.1#7913 ipset=/.radiovncr.com/gfwlist server=/.rael.org/127.0.0.1#7913 ipset=/.rael.org/gfwlist +server=/.ra.gg/127.0.0.1#7913 server=/.raggedbanner.com/127.0.0.1#7913 ipset=/.raggedbanner.com/gfwlist +ipset=/.ra.gg/gfwlist server=/.raidcall.com.tw/127.0.0.1#7913 ipset=/.raidcall.com.tw/gfwlist server=/.raidtalk.com.tw/127.0.0.1#7913 @@ -7650,12 +7650,12 @@ server=/.raremovie.cc/127.0.0.1#7913 ipset=/.raremovie.cc/gfwlist server=/.raremovie.net/127.0.0.1#7913 ipset=/.raremovie.net/gfwlist -server=/.raw.githubusercontent.com/127.0.0.1#7913 -ipset=/.raw.githubusercontent.com/gfwlist server=/.rawgit.com/127.0.0.1#7913 ipset=/.rawgit.com/gfwlist server=/.rawgithub.com/127.0.0.1#7913 ipset=/.rawgithub.com/gfwlist +server=/.raw.githubusercontent.com/127.0.0.1#7913 +ipset=/.raw.githubusercontent.com/gfwlist server=/.razyboard.com/127.0.0.1#7913 ipset=/.razyboard.com/gfwlist server=/.rcam.target.com/127.0.0.1#7913 @@ -7696,8 +7696,6 @@ server=/.recovery.org.tw/127.0.0.1#7913 ipset=/.recovery.org.tw/gfwlist server=/.recoveryversion.com.tw/127.0.0.1#7913 ipset=/.recoveryversion.com.tw/gfwlist -server=/.red-lang.org/127.0.0.1#7913 -ipset=/.red-lang.org/gfwlist server=/.redballoonsolidarity.org/127.0.0.1#7913 ipset=/.redballoonsolidarity.org/gfwlist server=/.redchinacn.net/127.0.0.1#7913 @@ -7705,9 +7703,9 @@ ipset=/.redchinacn.net/gfwlist server=/.redchinacn.org/127.0.0.1#7913 ipset=/.redchinacn.org/gfwlist server=/.redd.it/127.0.0.1#7913 -ipset=/.redd.it/gfwlist server=/.reddit.com/127.0.0.1#7913 ipset=/.reddit.com/gfwlist +ipset=/.redd.it/gfwlist server=/.redditlist.com/127.0.0.1#7913 ipset=/.redditlist.com/gfwlist server=/.redditmedia.com/127.0.0.1#7913 @@ -7716,6 +7714,8 @@ server=/.redditstatic.com/127.0.0.1#7913 ipset=/.redditstatic.com/gfwlist server=/.redhotlabs.com/127.0.0.1#7913 ipset=/.redhotlabs.com/gfwlist +server=/.red-lang.org/127.0.0.1#7913 +ipset=/.red-lang.org/gfwlist server=/.redtube.com/127.0.0.1#7913 ipset=/.redtube.com/gfwlist server=/.referer.us/127.0.0.1#7913 @@ -7754,14 +7754,14 @@ server=/.revleft.com/127.0.0.1#7913 ipset=/.revleft.com/gfwlist server=/.revver.com/127.0.0.1#7913 ipset=/.revver.com/gfwlist -server=/.rfa.org/127.0.0.1#7913 -ipset=/.rfa.org/gfwlist server=/.rfachina.com/127.0.0.1#7913 ipset=/.rfachina.com/gfwlist server=/.rfalive1.akacast.akamaistream.net/127.0.0.1#7913 ipset=/.rfalive1.akacast.akamaistream.net/gfwlist server=/.rfamobile.org/127.0.0.1#7913 ipset=/.rfamobile.org/gfwlist +server=/.rfa.org/127.0.0.1#7913 +ipset=/.rfa.org/gfwlist server=/.rfaweb.org/127.0.0.1#7913 ipset=/.rfaweb.org/gfwlist server=/.rferl.org/127.0.0.1#7913 @@ -7792,10 +7792,10 @@ server=/.rixcloud.us/127.0.0.1#7913 ipset=/.rixcloud.us/gfwlist server=/.rlwlw.com/127.0.0.1#7913 ipset=/.rlwlw.com/gfwlist -server=/.rmjdw.com/127.0.0.1#7913 -ipset=/.rmjdw.com/gfwlist server=/.rmjdw132.info/127.0.0.1#7913 ipset=/.rmjdw132.info/gfwlist +server=/.rmjdw.com/127.0.0.1#7913 +ipset=/.rmjdw.com/gfwlist server=/.roadshow.hk/127.0.0.1#7913 ipset=/.roadshow.hk/gfwlist server=/.roboforex.com/127.0.0.1#7913 @@ -7832,10 +7832,10 @@ server=/.rtalabel.org/127.0.0.1#7913 ipset=/.rtalabel.org/gfwlist server=/.rthk.hk/127.0.0.1#7913 ipset=/.rthk.hk/gfwlist -server=/.rthk.org.hk/127.0.0.1#7913 -ipset=/.rthk.org.hk/gfwlist server=/.rthklive2-lh.akamaihd.net/127.0.0.1#7913 ipset=/.rthklive2-lh.akamaihd.net/gfwlist +server=/.rthk.org.hk/127.0.0.1#7913 +ipset=/.rthk.org.hk/gfwlist server=/.rti.org.tw/127.0.0.1#7913 ipset=/.rti.org.tw/gfwlist server=/.rtycminnesota.org/127.0.0.1#7913 @@ -7856,26 +7856,20 @@ server=/.ruyiseek.com/127.0.0.1#7913 ipset=/.ruyiseek.com/gfwlist server=/.rxhj.net/127.0.0.1#7913 ipset=/.rxhj.net/gfwlist -server=/.s-cute.com/127.0.0.1#7913 -ipset=/.s-cute.com/gfwlist -server=/.s-dragon.org/127.0.0.1#7913 -ipset=/.s-dragon.org/gfwlist -server=/.s1.nudezz.com/127.0.0.1#7913 -ipset=/.s1.nudezz.com/gfwlist server=/.s1heng.com/127.0.0.1#7913 ipset=/.s1heng.com/gfwlist +server=/.s1.nudezz.com/127.0.0.1#7913 +ipset=/.s1.nudezz.com/gfwlist server=/.s1s1s1.com/127.0.0.1#7913 ipset=/.s1s1s1.com/gfwlist +server=/.s3.amazonaws.com/127.0.0.1#7913 +ipset=/.s3.amazonaws.com/gfwlist server=/.s3-ap-northeast-1.amazonaws.com/127.0.0.1#7913 ipset=/.s3-ap-northeast-1.amazonaws.com/gfwlist server=/.s3-ap-southeast-2.amazonaws.com/127.0.0.1#7913 ipset=/.s3-ap-southeast-2.amazonaws.com/gfwlist -server=/.s3.amazonaws.com/127.0.0.1#7913 -ipset=/.s3.amazonaws.com/gfwlist server=/.s8forum.com/127.0.0.1#7913 ipset=/.s8forum.com/gfwlist -server=/.sa.hao123.com/127.0.0.1#7913 -ipset=/.sa.hao123.com/gfwlist server=/.sacks.com/127.0.0.1#7913 ipset=/.sacks.com/gfwlist server=/.sacom.hk/127.0.0.1#7913 @@ -7888,6 +7882,8 @@ server=/.safervpn.com/127.0.0.1#7913 ipset=/.safervpn.com/gfwlist server=/.safety.google/127.0.0.1#7913 ipset=/.safety.google/gfwlist +server=/.sa.hao123.com/127.0.0.1#7913 +ipset=/.sa.hao123.com/gfwlist server=/.saintyculture.com/127.0.0.1#7913 ipset=/.saintyculture.com/gfwlist server=/.saiq.me/127.0.0.1#7913 @@ -7934,12 +7930,12 @@ server=/.sbme.me/127.0.0.1#7913 ipset=/.sbme.me/gfwlist server=/.sbs.com.au/127.0.0.1#7913 ipset=/.sbs.com.au/gfwlist -server=/.scache.vzw.com/127.0.0.1#7913 -ipset=/.scache.vzw.com/gfwlist server=/.scache1.vzw.com/127.0.0.1#7913 ipset=/.scache1.vzw.com/gfwlist server=/.scache2.vzw.com/127.0.0.1#7913 ipset=/.scache2.vzw.com/gfwlist +server=/.scache.vzw.com/127.0.0.1#7913 +ipset=/.scache.vzw.com/gfwlist server=/.scasino.com/127.0.0.1#7913 ipset=/.scasino.com/gfwlist server=/.schema.org/127.0.0.1#7913 @@ -7948,28 +7944,32 @@ server=/.sciencenets.com/127.0.0.1#7913 ipset=/.sciencenets.com/gfwlist server=/.scieron.com/127.0.0.1#7913 ipset=/.scieron.com/gfwlist -server=/.scmp.com/127.0.0.1#7913 -ipset=/.scmp.com/gfwlist server=/.scmpchinese.com/127.0.0.1#7913 ipset=/.scmpchinese.com/gfwlist +server=/.scmp.com/127.0.0.1#7913 +ipset=/.scmp.com/gfwlist server=/.scramble.io/127.0.0.1#7913 ipset=/.scramble.io/gfwlist server=/.scribd.com/127.0.0.1#7913 ipset=/.scribd.com/gfwlist server=/.scriptspot.com/127.0.0.1#7913 ipset=/.scriptspot.com/gfwlist +server=/.s-cute.com/127.0.0.1#7913 +ipset=/.s-cute.com/gfwlist +server=/.s-dragon.org/127.0.0.1#7913 +ipset=/.s-dragon.org/gfwlist server=/.seapuff.com/127.0.0.1#7913 ipset=/.seapuff.com/gfwlist server=/.search.aol.com/127.0.0.1#7913 ipset=/.search.aol.com/gfwlist +server=/.searchtruth.com/127.0.0.1#7913 +ipset=/.searchtruth.com/gfwlist server=/.search.xxx/127.0.0.1#7913 ipset=/.search.xxx/gfwlist server=/.search.yahoo.co.jp/127.0.0.1#7913 ipset=/.search.yahoo.co.jp/gfwlist server=/.search.yahoo.com/127.0.0.1#7913 ipset=/.search.yahoo.com/gfwlist -server=/.searchtruth.com/127.0.0.1#7913 -ipset=/.searchtruth.com/gfwlist server=/.secretchina.com/127.0.0.1#7913 ipset=/.secretchina.com/gfwlist server=/.secretgarden.no/127.0.0.1#7913 @@ -8026,8 +8026,6 @@ server=/.sevenload.com/127.0.0.1#7913 ipset=/.sevenload.com/gfwlist server=/.sex-11.com/127.0.0.1#7913 ipset=/.sex-11.com/gfwlist -server=/.sex.com/127.0.0.1#7913 -ipset=/.sex.com/gfwlist server=/.sex3.com/127.0.0.1#7913 ipset=/.sex3.com/gfwlist server=/.sex8.cc/127.0.0.1#7913 @@ -8036,10 +8034,12 @@ server=/.sexandsubmission.com/127.0.0.1#7913 ipset=/.sexandsubmission.com/gfwlist server=/.sexbot.com/127.0.0.1#7913 ipset=/.sexbot.com/gfwlist -server=/.sexhu.com/127.0.0.1#7913 -ipset=/.sexhu.com/gfwlist +server=/.sex.com/127.0.0.1#7913 +ipset=/.sex.com/gfwlist server=/.sexhuang.com/127.0.0.1#7913 ipset=/.sexhuang.com/gfwlist +server=/.sexhu.com/127.0.0.1#7913 +ipset=/.sexhu.com/gfwlist server=/.sexidude.com/127.0.0.1#7913 ipset=/.sexidude.com/gfwlist server=/.sexinsex.net/127.0.0.1#7913 @@ -8048,10 +8048,10 @@ server=/.sextvx.com/127.0.0.1#7913 ipset=/.sextvx.com/gfwlist server=/.sexxxy.biz/127.0.0.1#7913 ipset=/.sexxxy.biz/gfwlist -server=/.sf.net/127.0.0.1#7913 -ipset=/.sf.net/gfwlist server=/.sfileydy.com/127.0.0.1#7913 ipset=/.sfileydy.com/gfwlist +server=/.sf.net/127.0.0.1#7913 +ipset=/.sf.net/gfwlist server=/.sfshibao.com/127.0.0.1#7913 ipset=/.sfshibao.com/gfwlist server=/.sftindia.org/127.0.0.1#7913 @@ -8064,20 +8064,20 @@ server=/.shadow.ma/127.0.0.1#7913 ipset=/.shadow.ma/gfwlist server=/.shadowsky.xyz/127.0.0.1#7913 ipset=/.shadowsky.xyz/gfwlist -server=/.shadowsocks-r.com/127.0.0.1#7913 -ipset=/.shadowsocks-r.com/gfwlist +server=/.shadowsocks9.com/127.0.0.1#7913 +ipset=/.shadowsocks9.com/gfwlist server=/.shadowsocks.asia/127.0.0.1#7913 ipset=/.shadowsocks.asia/gfwlist server=/.shadowsocks.be/127.0.0.1#7913 ipset=/.shadowsocks.be/gfwlist -server=/.shadowsocks.com.hk/127.0.0.1#7913 -ipset=/.shadowsocks.com.hk/gfwlist server=/.shadowsocks.com/127.0.0.1#7913 ipset=/.shadowsocks.com/gfwlist +server=/.shadowsocks.com.hk/127.0.0.1#7913 +ipset=/.shadowsocks.com.hk/gfwlist server=/.shadowsocks.org/127.0.0.1#7913 ipset=/.shadowsocks.org/gfwlist -server=/.shadowsocks9.com/127.0.0.1#7913 -ipset=/.shadowsocks9.com/gfwlist +server=/.shadowsocks-r.com/127.0.0.1#7913 +ipset=/.shadowsocks-r.com/gfwlist server=/.shambalapost.com/127.0.0.1#7913 ipset=/.shambalapost.com/gfwlist server=/.shambhalasun.com/127.0.0.1#7913 @@ -8088,26 +8088,26 @@ server=/.shapeservices.com/127.0.0.1#7913 ipset=/.shapeservices.com/gfwlist server=/.share.america.gov/127.0.0.1#7913 ipset=/.share.america.gov/gfwlist +server=/.sharebee.com/127.0.0.1#7913 +ipset=/.sharebee.com/gfwlist +server=/.sharecool.org/127.0.0.1#7913 +ipset=/.sharecool.org/gfwlist server=/.share.dmhy.org/127.0.0.1#7913 ipset=/.share.dmhy.org/gfwlist server=/.share.ovi.com/127.0.0.1#7913 ipset=/.share.ovi.com/gfwlist server=/.share.youthwant.com.tw/127.0.0.1#7913 ipset=/.share.youthwant.com.tw/gfwlist -server=/.sharebee.com/127.0.0.1#7913 -ipset=/.sharebee.com/gfwlist -server=/.sharecool.org/127.0.0.1#7913 -ipset=/.sharecool.org/gfwlist server=/.sharpdaily.com.hk/127.0.0.1#7913 ipset=/.sharpdaily.com.hk/gfwlist server=/.sharpdaily.hk/127.0.0.1#7913 ipset=/.sharpdaily.hk/gfwlist server=/.sharpdaily.tw/127.0.0.1#7913 ipset=/.sharpdaily.tw/gfwlist -server=/.shat-tibet.com/127.0.0.1#7913 -ipset=/.shat-tibet.com/gfwlist server=/.shattered.io/127.0.0.1#7913 ipset=/.shattered.io/gfwlist +server=/.shat-tibet.com/127.0.0.1#7913 +ipset=/.shat-tibet.com/gfwlist server=/.sheikyermami.com/127.0.0.1#7913 ipset=/.sheikyermami.com/gfwlist server=/.shellfire.de/127.0.0.1#7913 @@ -8158,10 +8158,10 @@ server=/.showtime.jp/127.0.0.1#7913 ipset=/.showtime.jp/gfwlist server=/.shutterstock.com/127.0.0.1#7913 ipset=/.shutterstock.com/gfwlist -server=/.shwchurch.org/127.0.0.1#7913 -ipset=/.shwchurch.org/gfwlist server=/.shwchurch3.com/127.0.0.1#7913 ipset=/.shwchurch3.com/gfwlist +server=/.shwchurch.org/127.0.0.1#7913 +ipset=/.shwchurch.org/gfwlist server=/.siddharthasintent.org/127.0.0.1#7913 ipset=/.siddharthasintent.org/gfwlist server=/.sidelinesnews.com/127.0.0.1#7913 @@ -8196,14 +8196,14 @@ server=/.singtao.com/127.0.0.1#7913 ipset=/.singtao.com/gfwlist server=/.singtaousa.com/127.0.0.1#7913 ipset=/.singtaousa.com/gfwlist -server=/.sino-monthly.com/127.0.0.1#7913 -ipset=/.sino-monthly.com/gfwlist server=/.sinoants.com/127.0.0.1#7913 ipset=/.sinoants.com/gfwlist server=/.sinocast.com/127.0.0.1#7913 ipset=/.sinocast.com/gfwlist server=/.sinocism.com/127.0.0.1#7913 ipset=/.sinocism.com/gfwlist +server=/.sino-monthly.com/127.0.0.1#7913 +ipset=/.sino-monthly.com/gfwlist server=/.sinomontreal.ca/127.0.0.1#7913 ipset=/.sinomontreal.ca/gfwlist server=/.sinonet.ca/127.0.0.1#7913 @@ -8214,12 +8214,12 @@ server=/.sinoquebec.com/127.0.0.1#7913 ipset=/.sinoquebec.com/gfwlist server=/.sipml5.org/127.0.0.1#7913 ipset=/.sipml5.org/gfwlist -server=/.sis.xxx/127.0.0.1#7913 -ipset=/.sis.xxx/gfwlist server=/.sis001.com/127.0.0.1#7913 ipset=/.sis001.com/gfwlist server=/.sis001.us/127.0.0.1#7913 ipset=/.sis001.us/gfwlist +server=/.sis.xxx/127.0.0.1#7913 +ipset=/.sis.xxx/gfwlist server=/.site2unblock.com/127.0.0.1#7913 ipset=/.site2unblock.com/gfwlist server=/.site90.net/127.0.0.1#7913 @@ -8274,8 +8274,6 @@ server=/.slyip.com/127.0.0.1#7913 ipset=/.slyip.com/gfwlist server=/.slyip.net/127.0.0.1#7913 ipset=/.slyip.net/gfwlist -server=/.sm-miracle.com/127.0.0.1#7913 -ipset=/.sm-miracle.com/gfwlist server=/.smartdnsproxy.com/127.0.0.1#7913 ipset=/.smartdnsproxy.com/gfwlist server=/.smarthide.com/127.0.0.1#7913 @@ -8288,6 +8286,8 @@ server=/.smhric.org/127.0.0.1#7913 ipset=/.smhric.org/gfwlist server=/.smith.edu/127.0.0.1#7913 ipset=/.smith.edu/gfwlist +server=/.sm-miracle.com/127.0.0.1#7913 +ipset=/.sm-miracle.com/gfwlist server=/.smyxy.org/127.0.0.1#7913 ipset=/.smyxy.org/gfwlist server=/.snapchat.com/127.0.0.1#7913 @@ -8302,26 +8302,26 @@ server=/.snowlionpub.com/127.0.0.1#7913 ipset=/.snowlionpub.com/gfwlist server=/.sobees.com/127.0.0.1#7913 ipset=/.sobees.com/gfwlist -server=/.soc.mil/127.0.0.1#7913 -ipset=/.soc.mil/gfwlist server=/.socialwhale.com/127.0.0.1#7913 ipset=/.socialwhale.com/gfwlist -server=/.socks-proxy.net/127.0.0.1#7913 -ipset=/.socks-proxy.net/gfwlist server=/.sockscap64.com/127.0.0.1#7913 ipset=/.sockscap64.com/gfwlist server=/.sockslist.net/127.0.0.1#7913 ipset=/.sockslist.net/gfwlist +server=/.socks-proxy.net/127.0.0.1#7913 +ipset=/.socks-proxy.net/gfwlist +server=/.soc.mil/127.0.0.1#7913 +ipset=/.soc.mil/gfwlist server=/.socrec.org/127.0.0.1#7913 ipset=/.socrec.org/gfwlist -server=/.sod.co.jp/127.0.0.1#7913 -ipset=/.sod.co.jp/gfwlist server=/.sodatea.github.io/127.0.0.1#7913 ipset=/.sodatea.github.io/gfwlist -server=/.softether-download.com/127.0.0.1#7913 -ipset=/.softether-download.com/gfwlist +server=/.sod.co.jp/127.0.0.1#7913 +ipset=/.sod.co.jp/gfwlist server=/.softether.co.jp/127.0.0.1#7913 ipset=/.softether.co.jp/gfwlist +server=/.softether-download.com/127.0.0.1#7913 +ipset=/.softether-download.com/gfwlist server=/.softether.org/127.0.0.1#7913 ipset=/.softether.org/gfwlist server=/.softfamous.com/127.0.0.1#7913 @@ -8336,12 +8336,12 @@ server=/.sogclub.com/127.0.0.1#7913 ipset=/.sogclub.com/gfwlist server=/.sogrady.me/127.0.0.1#7913 ipset=/.sogrady.me/gfwlist -server=/.soh.tw/127.0.0.1#7913 -ipset=/.soh.tw/gfwlist server=/.sohcradio.com/127.0.0.1#7913 ipset=/.sohcradio.com/gfwlist server=/.sohfrance.org/127.0.0.1#7913 ipset=/.sohfrance.org/gfwlist +server=/.soh.tw/127.0.0.1#7913 +ipset=/.soh.tw/gfwlist server=/.sokamonline.com/127.0.0.1#7913 ipset=/.sokamonline.com/gfwlist server=/.sokmil.com/127.0.0.1#7913 @@ -8376,10 +8376,10 @@ server=/.sostibet.org/127.0.0.1#7913 ipset=/.sostibet.org/gfwlist server=/.soubory.com/127.0.0.1#7913 ipset=/.soubory.com/gfwlist -server=/.soul-plus.net/127.0.0.1#7913 -ipset=/.soul-plus.net/gfwlist server=/.soulcaliburhentai.net/127.0.0.1#7913 ipset=/.soulcaliburhentai.net/gfwlist +server=/.soul-plus.net/127.0.0.1#7913 +ipset=/.soul-plus.net/gfwlist server=/.soumo.info/127.0.0.1#7913 ipset=/.soumo.info/gfwlist server=/.soundcloud.com/127.0.0.1#7913 @@ -8454,34 +8454,34 @@ server=/.srcf.ucam.org/127.0.0.1#7913 ipset=/.srcf.ucam.org/gfwlist server=/.srocket.us/127.0.0.1#7913 ipset=/.srocket.us/gfwlist -server=/.ss-link.com/127.0.0.1#7913 -ipset=/.ss-link.com/gfwlist -server=/.ss.carryzhou.com/127.0.0.1#7913 -ipset=/.ss.carryzhou.com/gfwlist -server=/.ss.levyhsu.com/127.0.0.1#7913 -ipset=/.ss.levyhsu.com/gfwlist -server=/.ss.pythonic.life/127.0.0.1#7913 -ipset=/.ss.pythonic.life/gfwlist server=/.ss7.vzw.com/127.0.0.1#7913 ipset=/.ss7.vzw.com/gfwlist +server=/.ss.carryzhou.com/127.0.0.1#7913 +ipset=/.ss.carryzhou.com/gfwlist server=/.ssglobal.co/127.0.0.1#7913 ipset=/.ssglobal.co/gfwlist server=/.ssglobal.me/127.0.0.1#7913 ipset=/.ssglobal.me/gfwlist server=/.ssh91.com/127.0.0.1#7913 ipset=/.ssh91.com/gfwlist -server=/.ssl.webpack.de/127.0.0.1#7913 -ipset=/.ssl.webpack.de/gfwlist server=/.ssl443.org/127.0.0.1#7913 ipset=/.ssl443.org/gfwlist +server=/.ss.levyhsu.com/127.0.0.1#7913 +ipset=/.ss.levyhsu.com/gfwlist +server=/.ss-link.com/127.0.0.1#7913 +ipset=/.ss-link.com/gfwlist +server=/.ssl.webpack.de/127.0.0.1#7913 +ipset=/.ssl.webpack.de/gfwlist server=/.sspanel.net/127.0.0.1#7913 ipset=/.sspanel.net/gfwlist server=/.sspro.ml/127.0.0.1#7913 ipset=/.sspro.ml/gfwlist -server=/.ssr.tools/127.0.0.1#7913 -ipset=/.ssr.tools/gfwlist +server=/.ss.pythonic.life/127.0.0.1#7913 +ipset=/.ss.pythonic.life/gfwlist server=/.ssrshare.com/127.0.0.1#7913 ipset=/.ssrshare.com/gfwlist +server=/.ssr.tools/127.0.0.1#7913 +ipset=/.ssr.tools/gfwlist server=/.sss.camp/127.0.0.1#7913 ipset=/.sss.camp/gfwlist server=/.sstmlt.moe/127.0.0.1#7913 @@ -8506,16 +8506,16 @@ server=/.startuplivingchina.com/127.0.0.1#7913 ipset=/.startuplivingchina.com/gfwlist server=/.stat.gov.tw/127.0.0.1#7913 ipset=/.stat.gov.tw/gfwlist -server=/.static-economist.com/127.0.0.1#7913 -ipset=/.static-economist.com/gfwlist -server=/.static.comico.tw/127.0.0.1#7913 -ipset=/.static.comico.tw/gfwlist -server=/.static.shemalez.com/127.0.0.1#7913 -ipset=/.static.shemalez.com/gfwlist server=/.static01.nyt.com/127.0.0.1#7913 ipset=/.static01.nyt.com/gfwlist +server=/.static.comico.tw/127.0.0.1#7913 +ipset=/.static.comico.tw/gfwlist +server=/.static-economist.com/127.0.0.1#7913 +ipset=/.static-economist.com/gfwlist server=/.staticflickr.com/127.0.0.1#7913 ipset=/.staticflickr.com/gfwlist +server=/.static.shemalez.com/127.0.0.1#7913 +ipset=/.static.shemalez.com/gfwlist server=/.statueofdemocracy.org/127.0.0.1#7913 ipset=/.statueofdemocracy.org/gfwlist server=/.stc.com.sa/127.0.0.1#7913 @@ -8556,10 +8556,10 @@ server=/.stories.google/127.0.0.1#7913 ipset=/.stories.google/gfwlist server=/.storify.com/127.0.0.1#7913 ipset=/.storify.com/gfwlist -server=/.storm.mg/127.0.0.1#7913 -ipset=/.storm.mg/gfwlist server=/.stormmediagroup.com/127.0.0.1#7913 ipset=/.stormmediagroup.com/gfwlist +server=/.storm.mg/127.0.0.1#7913 +ipset=/.storm.mg/gfwlist server=/.stoweboyd.com/127.0.0.1#7913 ipset=/.stoweboyd.com/gfwlist server=/.stranabg.com/127.0.0.1#7913 @@ -8576,10 +8576,10 @@ server=/.strongvpn.com/127.0.0.1#7913 ipset=/.strongvpn.com/gfwlist server=/.strongwindpress.com/127.0.0.1#7913 ipset=/.strongwindpress.com/gfwlist -server=/.student.tw/127.0.0.1#7913 -ipset=/.student.tw/gfwlist server=/.studentsforafreetibet.org/127.0.0.1#7913 ipset=/.studentsforafreetibet.org/gfwlist +server=/.student.tw/127.0.0.1#7913 +ipset=/.student.tw/gfwlist server=/.stumbleupon.com/127.0.0.1#7913 ipset=/.stumbleupon.com/gfwlist server=/.stupidvideos.com/127.0.0.1#7913 @@ -8638,9 +8638,9 @@ server=/.suppig.net/127.0.0.1#7913 ipset=/.suppig.net/gfwlist server=/.suprememastertv.com/127.0.0.1#7913 ipset=/.suprememastertv.com/gfwlist +server=/.surfeasy.com/127.0.0.1#7913 server=/.surfeasy.com.au/127.0.0.1#7913 ipset=/.surfeasy.com.au/gfwlist -server=/.surfeasy.com/127.0.0.1#7913 ipset=/.surfeasy.com/gfwlist server=/.suroot.com/127.0.0.1#7913 ipset=/.suroot.com/gfwlist @@ -8678,14 +8678,6 @@ server=/.szbbs.net/127.0.0.1#7913 ipset=/.szbbs.net/gfwlist server=/.szetowah.org.hk/127.0.0.1#7913 ipset=/.szetowah.org.hk/gfwlist -server=/.t-g.com/127.0.0.1#7913 -ipset=/.t-g.com/gfwlist -server=/.t.co/127.0.0.1#7913 -ipset=/.t.co/gfwlist -server=/.t.me/127.0.0.1#7913 -ipset=/.t.me/gfwlist -server=/.t.orzdream.com/127.0.0.1#7913 -ipset=/.t.orzdream.com/gfwlist server=/.t35.com/127.0.0.1#7913 ipset=/.t35.com/gfwlist server=/.t66y.com/127.0.0.1#7913 @@ -8706,18 +8698,16 @@ server=/.taedp.org.tw/127.0.0.1#7913 ipset=/.taedp.org.tw/gfwlist server=/.tafm.org/127.0.0.1#7913 ipset=/.tafm.org/gfwlist -server=/.tagwa.org.au/127.0.0.1#7913 -ipset=/.tagwa.org.au/gfwlist server=/.tagwalk.com/127.0.0.1#7913 ipset=/.tagwalk.com/gfwlist +server=/.tagwa.org.au/127.0.0.1#7913 +ipset=/.tagwa.org.au/gfwlist server=/.tahr.org.tw/127.0.0.1#7913 ipset=/.tahr.org.tw/gfwlist server=/.taipei.gov.tw/127.0.0.1#7913 ipset=/.taipei.gov.tw/gfwlist server=/.taipeisociety.org/127.0.0.1#7913 ipset=/.taipeisociety.org/gfwlist -server=/.taiwan-sex.com/127.0.0.1#7913 -ipset=/.taiwan-sex.com/gfwlist server=/.taiwanbible.com/127.0.0.1#7913 ipset=/.taiwanbible.com/gfwlist server=/.taiwancon.com/127.0.0.1#7913 @@ -8736,14 +8726,16 @@ server=/.taiwankiss.com/127.0.0.1#7913 ipset=/.taiwankiss.com/gfwlist server=/.taiwannation.50webs.com/127.0.0.1#7913 ipset=/.taiwannation.50webs.com/gfwlist -server=/.taiwannation.com.tw/127.0.0.1#7913 -ipset=/.taiwannation.com.tw/gfwlist server=/.taiwannation.com/127.0.0.1#7913 ipset=/.taiwannation.com/gfwlist +server=/.taiwannation.com.tw/127.0.0.1#7913 +ipset=/.taiwannation.com.tw/gfwlist server=/.taiwanncf.org.tw/127.0.0.1#7913 ipset=/.taiwanncf.org.tw/gfwlist server=/.taiwannews.com.tw/127.0.0.1#7913 ipset=/.taiwannews.com.tw/gfwlist +server=/.taiwan-sex.com/127.0.0.1#7913 +ipset=/.taiwan-sex.com/gfwlist server=/.taiwantp.net/127.0.0.1#7913 ipset=/.taiwantp.net/gfwlist server=/.taiwantt.org.tw/127.0.0.1#7913 @@ -8788,18 +8780,16 @@ server=/.taweet.com/127.0.0.1#7913 ipset=/.taweet.com/gfwlist server=/.tbcollege.org/127.0.0.1#7913 ipset=/.tbcollege.org/gfwlist -server=/.tbi.org.hk/127.0.0.1#7913 -ipset=/.tbi.org.hk/gfwlist server=/.tbicn.org/127.0.0.1#7913 ipset=/.tbicn.org/gfwlist +server=/.tbi.org.hk/127.0.0.1#7913 +ipset=/.tbi.org.hk/gfwlist server=/.tbjyt.org/127.0.0.1#7913 ipset=/.tbjyt.org/gfwlist server=/.tbpic.info/127.0.0.1#7913 ipset=/.tbpic.info/gfwlist server=/.tbrc.org/127.0.0.1#7913 ipset=/.tbrc.org/gfwlist -server=/.tbs-rainbow.org/127.0.0.1#7913 -ipset=/.tbs-rainbow.org/gfwlist server=/.tbsec.org/127.0.0.1#7913 ipset=/.tbsec.org/gfwlist server=/.tbskkinabalu.page.tl/127.0.0.1#7913 @@ -8808,6 +8798,8 @@ server=/.tbsmalaysia.org/127.0.0.1#7913 ipset=/.tbsmalaysia.org/gfwlist server=/.tbsn.org/127.0.0.1#7913 ipset=/.tbsn.org/gfwlist +server=/.tbs-rainbow.org/127.0.0.1#7913 +ipset=/.tbs-rainbow.org/gfwlist server=/.tbsseattle.org/127.0.0.1#7913 ipset=/.tbsseattle.org/gfwlist server=/.tbssqh.org/127.0.0.1#7913 @@ -8826,6 +8818,8 @@ server=/.tchrd.org/127.0.0.1#7913 ipset=/.tchrd.org/gfwlist server=/.tcnynj.org/127.0.0.1#7913 ipset=/.tcnynj.org/gfwlist +server=/.t.co/127.0.0.1#7913 +ipset=/.t.co/gfwlist server=/.tcpspeed.co/127.0.0.1#7913 ipset=/.tcpspeed.co/gfwlist server=/.tcpspeed.com/127.0.0.1#7913 @@ -8860,12 +8854,12 @@ server=/.telecomspace.com/127.0.0.1#7913 ipset=/.telecomspace.com/gfwlist server=/.telegram.dog/127.0.0.1#7913 ipset=/.telegram.dog/gfwlist +server=/.telegramdownload.com/127.0.0.1#7913 +ipset=/.telegramdownload.com/gfwlist server=/.telegram.me/127.0.0.1#7913 ipset=/.telegram.me/gfwlist server=/.telegram.org/127.0.0.1#7913 ipset=/.telegram.org/gfwlist -server=/.telegramdownload.com/127.0.0.1#7913 -ipset=/.telegramdownload.com/gfwlist server=/.telegraph.co.uk/127.0.0.1#7913 ipset=/.telegraph.co.uk/gfwlist server=/.telesco.pe/127.0.0.1#7913 @@ -8886,8 +8880,8 @@ server=/.textnow.me/127.0.0.1#7913 ipset=/.textnow.me/gfwlist server=/.tfhub.dev/127.0.0.1#7913 ipset=/.tfhub.dev/gfwlist -server=/.th.hao123.com/127.0.0.1#7913 -ipset=/.th.hao123.com/gfwlist +server=/.t-g.com/127.0.0.1#7913 +ipset=/.t-g.com/gfwlist server=/.thaicn.com/127.0.0.1#7913 ipset=/.thaicn.com/gfwlist server=/.thb.gov.tw/127.0.0.1#7913 @@ -8960,6 +8954,8 @@ server=/.thewgo.org/127.0.0.1#7913 ipset=/.thewgo.org/gfwlist server=/.theync.com/127.0.0.1#7913 ipset=/.theync.com/gfwlist +server=/.th.hao123.com/127.0.0.1#7913 +ipset=/.th.hao123.com/gfwlist server=/.thinkgeek.com/127.0.0.1#7913 ipset=/.thinkgeek.com/gfwlist server=/.thinkingtaiwan.com/127.0.0.1#7913 @@ -8980,10 +8976,10 @@ server=/.throughnightsfire.com/127.0.0.1#7913 ipset=/.throughnightsfire.com/gfwlist server=/.thumbzilla.com/127.0.0.1#7913 ipset=/.thumbzilla.com/gfwlist -server=/.thywords.com.tw/127.0.0.1#7913 -ipset=/.thywords.com.tw/gfwlist server=/.thywords.com/127.0.0.1#7913 ipset=/.thywords.com/gfwlist +server=/.thywords.com.tw/127.0.0.1#7913 +ipset=/.thywords.com.tw/gfwlist server=/.tiananmenduizhi.com/127.0.0.1#7913 ipset=/.tiananmenduizhi.com/gfwlist server=/.tiananmenmother.org/127.0.0.1#7913 @@ -8998,48 +8994,14 @@ server=/.tianhuayuan.com/127.0.0.1#7913 ipset=/.tianhuayuan.com/gfwlist server=/.tianlawoffice.com/127.0.0.1#7913 ipset=/.tianlawoffice.com/gfwlist -server=/.tianti.io/127.0.0.1#7913 -ipset=/.tianti.io/gfwlist server=/.tiantibooks.org/127.0.0.1#7913 ipset=/.tiantibooks.org/gfwlist +server=/.tianti.io/127.0.0.1#7913 +ipset=/.tianti.io/gfwlist server=/.tianyantong.org.cn/127.0.0.1#7913 ipset=/.tianyantong.org.cn/gfwlist server=/.tianzhu.org/127.0.0.1#7913 ipset=/.tianzhu.org/gfwlist -server=/.tibet-envoy.eu/127.0.0.1#7913 -ipset=/.tibet-envoy.eu/gfwlist -server=/.tibet-foundation.org/127.0.0.1#7913 -ipset=/.tibet-foundation.org/gfwlist -server=/.tibet-house-trust.co.uk/127.0.0.1#7913 -ipset=/.tibet-house-trust.co.uk/gfwlist -server=/.tibet-info.net/127.0.0.1#7913 -ipset=/.tibet-info.net/gfwlist -server=/.tibet-initiative.de/127.0.0.1#7913 -ipset=/.tibet-initiative.de/gfwlist -server=/.tibet-munich.de/127.0.0.1#7913 -ipset=/.tibet-munich.de/gfwlist -server=/.tibet.a.se/127.0.0.1#7913 -ipset=/.tibet.a.se/gfwlist -server=/.tibet.at/127.0.0.1#7913 -ipset=/.tibet.at/gfwlist -server=/.tibet.ca/127.0.0.1#7913 -ipset=/.tibet.ca/gfwlist -server=/.tibet.com/127.0.0.1#7913 -ipset=/.tibet.com/gfwlist -server=/.tibet.fr/127.0.0.1#7913 -ipset=/.tibet.fr/gfwlist -server=/.tibet.net/127.0.0.1#7913 -ipset=/.tibet.net/gfwlist -server=/.tibet.nu/127.0.0.1#7913 -ipset=/.tibet.nu/gfwlist -server=/.tibet.org.tw/127.0.0.1#7913 -ipset=/.tibet.org.tw/gfwlist -server=/.tibet.org/127.0.0.1#7913 -ipset=/.tibet.org/gfwlist -server=/.tibet.sk/127.0.0.1#7913 -ipset=/.tibet.sk/gfwlist -server=/.tibet.to/127.0.0.1#7913 -ipset=/.tibet.to/gfwlist server=/.tibet3rdpole.org/127.0.0.1#7913 ipset=/.tibet3rdpole.org/gfwlist server=/.tibetaction.net/127.0.0.1#7913 @@ -9048,12 +9010,10 @@ server=/.tibetaid.org/127.0.0.1#7913 ipset=/.tibetaid.org/gfwlist server=/.tibetalk.com/127.0.0.1#7913 ipset=/.tibetalk.com/gfwlist -server=/.tibetan-alliance.org/127.0.0.1#7913 -ipset=/.tibetan-alliance.org/gfwlist -server=/.tibetan.fr/127.0.0.1#7913 -ipset=/.tibetan.fr/gfwlist server=/.tibetanaidproject.org/127.0.0.1#7913 ipset=/.tibetanaidproject.org/gfwlist +server=/.tibetan-alliance.org/127.0.0.1#7913 +ipset=/.tibetan-alliance.org/gfwlist server=/.tibetanarts.org/127.0.0.1#7913 ipset=/.tibetanarts.org/gfwlist server=/.tibetanbuddhistinstitute.org/127.0.0.1#7913 @@ -9066,6 +9026,8 @@ server=/.tibetanculture.org/127.0.0.1#7913 ipset=/.tibetanculture.org/gfwlist server=/.tibetanfeministcollective.org/127.0.0.1#7913 ipset=/.tibetanfeministcollective.org/gfwlist +server=/.tibetan.fr/127.0.0.1#7913 +ipset=/.tibetan.fr/gfwlist server=/.tibetanjournal.com/127.0.0.1#7913 ipset=/.tibetanjournal.com/gfwlist server=/.tibetanlanguage.org/127.0.0.1#7913 @@ -9084,10 +9046,16 @@ server=/.tibetansports.org/127.0.0.1#7913 ipset=/.tibetansports.org/gfwlist server=/.tibetanwomen.org/127.0.0.1#7913 ipset=/.tibetanwomen.org/gfwlist -server=/.tibetanyouth.org/127.0.0.1#7913 -ipset=/.tibetanyouth.org/gfwlist server=/.tibetanyouthcongress.org/127.0.0.1#7913 ipset=/.tibetanyouthcongress.org/gfwlist +server=/.tibetanyouth.org/127.0.0.1#7913 +ipset=/.tibetanyouth.org/gfwlist +server=/.tibet.a.se/127.0.0.1#7913 +ipset=/.tibet.a.se/gfwlist +server=/.tibet.at/127.0.0.1#7913 +ipset=/.tibet.at/gfwlist +server=/.tibet.ca/127.0.0.1#7913 +ipset=/.tibet.ca/gfwlist server=/.tibetcharity.dk/127.0.0.1#7913 ipset=/.tibetcharity.dk/gfwlist server=/.tibetcharity.in/127.0.0.1#7913 @@ -9098,12 +9066,20 @@ server=/.tibetcity.com/127.0.0.1#7913 ipset=/.tibetcity.com/gfwlist server=/.tibetcollection.com/127.0.0.1#7913 ipset=/.tibetcollection.com/gfwlist +server=/.tibet.com/127.0.0.1#7913 +ipset=/.tibet.com/gfwlist server=/.tibetcorps.org/127.0.0.1#7913 ipset=/.tibetcorps.org/gfwlist +server=/.tibet-envoy.eu/127.0.0.1#7913 +ipset=/.tibet-envoy.eu/gfwlist server=/.tibetexpress.net/127.0.0.1#7913 ipset=/.tibetexpress.net/gfwlist server=/.tibetfocus.com/127.0.0.1#7913 ipset=/.tibetfocus.com/gfwlist +server=/.tibet-foundation.org/127.0.0.1#7913 +ipset=/.tibet-foundation.org/gfwlist +server=/.tibet.fr/127.0.0.1#7913 +ipset=/.tibet.fr/gfwlist server=/.tibetfund.org/127.0.0.1#7913 ipset=/.tibetfund.org/gfwlist server=/.tibetgermany.com/127.0.0.1#7913 @@ -9118,20 +9094,32 @@ server=/.tibethouse.jp/127.0.0.1#7913 ipset=/.tibethouse.jp/gfwlist server=/.tibethouse.org/127.0.0.1#7913 ipset=/.tibethouse.org/gfwlist +server=/.tibet-house-trust.co.uk/127.0.0.1#7913 +ipset=/.tibet-house-trust.co.uk/gfwlist server=/.tibethouse.us/127.0.0.1#7913 ipset=/.tibethouse.us/gfwlist +server=/.tibet-info.net/127.0.0.1#7913 +ipset=/.tibet-info.net/gfwlist server=/.tibetinfonet.net/127.0.0.1#7913 ipset=/.tibetinfonet.net/gfwlist +server=/.tibet-initiative.de/127.0.0.1#7913 +ipset=/.tibet-initiative.de/gfwlist server=/.tibetjustice.org/127.0.0.1#7913 ipset=/.tibetjustice.org/gfwlist server=/.tibetkomite.dk/127.0.0.1#7913 ipset=/.tibetkomite.dk/gfwlist server=/.tibetlibre.free.fr/127.0.0.1#7913 ipset=/.tibetlibre.free.fr/gfwlist +server=/.tibet-munich.de/127.0.0.1#7913 +ipset=/.tibet-munich.de/gfwlist server=/.tibetmuseum.org/127.0.0.1#7913 ipset=/.tibetmuseum.org/gfwlist +server=/.tibet.net/127.0.0.1#7913 +ipset=/.tibet.net/gfwlist server=/.tibetnetwork.org/127.0.0.1#7913 ipset=/.tibetnetwork.org/gfwlist +server=/.tibet.nu/127.0.0.1#7913 +ipset=/.tibet.nu/gfwlist server=/.tibetoffice.ch/127.0.0.1#7913 ipset=/.tibetoffice.ch/gfwlist server=/.tibetoffice.com.au/127.0.0.1#7913 @@ -9146,12 +9134,18 @@ server=/.tibetonline.tv/127.0.0.1#7913 ipset=/.tibetonline.tv/gfwlist server=/.tibetoralhistory.org/127.0.0.1#7913 ipset=/.tibetoralhistory.org/gfwlist +server=/.tibet.org/127.0.0.1#7913 +ipset=/.tibet.org/gfwlist +server=/.tibet.org.tw/127.0.0.1#7913 +ipset=/.tibet.org.tw/gfwlist server=/.tibetpolicy.eu/127.0.0.1#7913 ipset=/.tibetpolicy.eu/gfwlist server=/.tibetrelieffund.co.uk/127.0.0.1#7913 ipset=/.tibetrelieffund.co.uk/gfwlist server=/.tibetsites.com/127.0.0.1#7913 ipset=/.tibetsites.com/gfwlist +server=/.tibet.sk/127.0.0.1#7913 +ipset=/.tibet.sk/gfwlist server=/.tibetsociety.com/127.0.0.1#7913 ipset=/.tibetsociety.com/gfwlist server=/.tibetsun.com/127.0.0.1#7913 @@ -9164,6 +9158,8 @@ server=/.tibettelegraph.com/127.0.0.1#7913 ipset=/.tibettelegraph.com/gfwlist server=/.tibettimes.net/127.0.0.1#7913 ipset=/.tibettimes.net/gfwlist +server=/.tibet.to/127.0.0.1#7913 +ipset=/.tibet.to/gfwlist server=/.tibetwrites.org/127.0.0.1#7913 ipset=/.tibetwrites.org/gfwlist server=/.ticket.com.tw/127.0.0.1#7913 @@ -9208,6 +9204,8 @@ server=/.tmagazine.com/127.0.0.1#7913 ipset=/.tmagazine.com/gfwlist server=/.tmdfish.com/127.0.0.1#7913 ipset=/.tmdfish.com/gfwlist +server=/.t.me/127.0.0.1#7913 +ipset=/.t.me/gfwlist server=/.tmi.me/127.0.0.1#7913 ipset=/.tmi.me/gfwlist server=/.tmpp.org/127.0.0.1#7913 @@ -9226,20 +9224,18 @@ server=/.tngrnow.net/127.0.0.1#7913 ipset=/.tngrnow.net/gfwlist server=/.tnp.org/127.0.0.1#7913 ipset=/.tnp.org/gfwlist -server=/.to-porno.com/127.0.0.1#7913 -ipset=/.to-porno.com/gfwlist server=/.togetter.com/127.0.0.1#7913 ipset=/.togetter.com/gfwlist server=/.toh.info/127.0.0.1#7913 ipset=/.toh.info/gfwlist server=/.tokyo-247.com/127.0.0.1#7913 ipset=/.tokyo-247.com/gfwlist +server=/.tokyocn.com/127.0.0.1#7913 +ipset=/.tokyocn.com/gfwlist server=/.tokyo-hot.com/127.0.0.1#7913 ipset=/.tokyo-hot.com/gfwlist server=/.tokyo-porn-tube.com/127.0.0.1#7913 ipset=/.tokyo-porn-tube.com/gfwlist -server=/.tokyocn.com/127.0.0.1#7913 -ipset=/.tokyocn.com/gfwlist server=/.tongil.or.kr/127.0.0.1#7913 ipset=/.tongil.or.kr/gfwlist server=/.tono-oka.jp/127.0.0.1#7913 @@ -9250,8 +9246,6 @@ server=/.toodoc.com/127.0.0.1#7913 ipset=/.toodoc.com/gfwlist server=/.toonel.net/127.0.0.1#7913 ipset=/.toonel.net/gfwlist -server=/.top.tv/127.0.0.1#7913 -ipset=/.top.tv/gfwlist server=/.top10vpn.com/127.0.0.1#7913 ipset=/.top10vpn.com/gfwlist server=/.top81.ws/127.0.0.1#7913 @@ -9262,6 +9256,8 @@ server=/.topic.youthwant.com.tw/127.0.0.1#7913 ipset=/.topic.youthwant.com.tw/gfwlist server=/.topnews.in/127.0.0.1#7913 ipset=/.topnews.in/gfwlist +server=/.to-porno.com/127.0.0.1#7913 +ipset=/.to-porno.com/gfwlist server=/.toppornsites.com/127.0.0.1#7913 ipset=/.toppornsites.com/gfwlist server=/.topshareware.com/127.0.0.1#7913 @@ -9270,16 +9266,16 @@ server=/.topsy.com/127.0.0.1#7913 ipset=/.topsy.com/gfwlist server=/.toptip.ca/127.0.0.1#7913 ipset=/.toptip.ca/gfwlist -server=/.tor.blingblingsquad.net/127.0.0.1#7913 -ipset=/.tor.blingblingsquad.net/gfwlist -server=/.tor.cn.uptodown.com/127.0.0.1#7913 -ipset=/.tor.cn.uptodown.com/gfwlist -server=/.tor.updatestar.com/127.0.0.1#7913 -ipset=/.tor.updatestar.com/gfwlist +server=/.top.tv/127.0.0.1#7913 +ipset=/.top.tv/gfwlist server=/.tora.to/127.0.0.1#7913 ipset=/.tora.to/gfwlist +server=/.tor.blingblingsquad.net/127.0.0.1#7913 +ipset=/.tor.blingblingsquad.net/gfwlist server=/.torcn.com/127.0.0.1#7913 ipset=/.torcn.com/gfwlist +server=/.tor.cn.uptodown.com/127.0.0.1#7913 +ipset=/.tor.cn.uptodown.com/gfwlist server=/.torguard.net/127.0.0.1#7913 ipset=/.torguard.net/gfwlist server=/.torproject.org/127.0.0.1#7913 @@ -9292,8 +9288,12 @@ server=/.torrenty.org/127.0.0.1#7913 ipset=/.torrenty.org/gfwlist server=/.torrentz.eu/127.0.0.1#7913 ipset=/.torrentz.eu/gfwlist +server=/.tor.updatestar.com/127.0.0.1#7913 +ipset=/.tor.updatestar.com/gfwlist server=/.torvpn.com/127.0.0.1#7913 ipset=/.torvpn.com/gfwlist +server=/.t.orzdream.com/127.0.0.1#7913 +ipset=/.t.orzdream.com/gfwlist server=/.tosh.comedycentral.com/127.0.0.1#7913 ipset=/.tosh.comedycentral.com/gfwlist server=/.totalvpn.com/127.0.0.1#7913 @@ -9318,10 +9318,10 @@ server=/.tracfone.com/127.0.0.1#7913 ipset=/.tracfone.com/gfwlist server=/.traffichaus.com/127.0.0.1#7913 ipset=/.traffichaus.com/gfwlist -server=/.trans.wenweipo.com/127.0.0.1#7913 -ipset=/.trans.wenweipo.com/gfwlist server=/.transparency.org/127.0.0.1#7913 ipset=/.transparency.org/gfwlist +server=/.trans.wenweipo.com/127.0.0.1#7913 +ipset=/.trans.wenweipo.com/gfwlist server=/.treemall.com.tw/127.0.0.1#7913 ipset=/.treemall.com.tw/gfwlist server=/.trendsmap.com/127.0.0.1#7913 @@ -9336,10 +9336,10 @@ server=/.trimondi.de/127.0.0.1#7913 ipset=/.trimondi.de/gfwlist server=/.trouw.nl/127.0.0.1#7913 ipset=/.trouw.nl/gfwlist -server=/.trt.net.tr/127.0.0.1#7913 -ipset=/.trt.net.tr/gfwlist server=/.trtc.com.tw/127.0.0.1#7913 ipset=/.trtc.com.tw/gfwlist +server=/.trt.net.tr/127.0.0.1#7913 +ipset=/.trt.net.tr/gfwlist server=/.truebuddha-md.org/127.0.0.1#7913 ipset=/.truebuddha-md.org/gfwlist server=/.trulyergonomic.com/127.0.0.1#7913 @@ -9360,10 +9360,10 @@ server=/.tsemtulku.com/127.0.0.1#7913 ipset=/.tsemtulku.com/gfwlist server=/.tsquare.tv/127.0.0.1#7913 ipset=/.tsquare.tv/gfwlist -server=/.tsu.org.tw/127.0.0.1#7913 -ipset=/.tsu.org.tw/gfwlist server=/.tsunagarumon.com/127.0.0.1#7913 ipset=/.tsunagarumon.com/gfwlist +server=/.tsu.org.tw/127.0.0.1#7913 +ipset=/.tsu.org.tw/gfwlist server=/.tt1069.com/127.0.0.1#7913 ipset=/.tt1069.com/gfwlist server=/.tttan.com/127.0.0.1#7913 @@ -9374,12 +9374,12 @@ server=/.tu8964.com/127.0.0.1#7913 ipset=/.tu8964.com/gfwlist server=/.tubaholic.com/127.0.0.1#7913 ipset=/.tubaholic.com/gfwlist -server=/.tube.com/127.0.0.1#7913 -ipset=/.tube.com/gfwlist server=/.tube8.com/127.0.0.1#7913 ipset=/.tube8.com/gfwlist server=/.tube911.com/127.0.0.1#7913 ipset=/.tube911.com/gfwlist +server=/.tube.com/127.0.0.1#7913 +ipset=/.tube.com/gfwlist server=/.tubecup.com/127.0.0.1#7913 ipset=/.tubecup.com/gfwlist server=/.tubegals.com/127.0.0.1#7913 @@ -9392,8 +9392,6 @@ server=/.tubestack.com/127.0.0.1#7913 ipset=/.tubestack.com/gfwlist server=/.tubewolf.com/127.0.0.1#7913 ipset=/.tubewolf.com/gfwlist -server=/.tui.orzdream.com/127.0.0.1#7913 -ipset=/.tui.orzdream.com/gfwlist server=/.tuibeitu.net/127.0.0.1#7913 ipset=/.tuibeitu.net/gfwlist server=/.tuidang.net/127.0.0.1#7913 @@ -9402,6 +9400,8 @@ server=/.tuidang.org/127.0.0.1#7913 ipset=/.tuidang.org/gfwlist server=/.tuidang.se/127.0.0.1#7913 ipset=/.tuidang.se/gfwlist +server=/.tui.orzdream.com/127.0.0.1#7913 +ipset=/.tui.orzdream.com/gfwlist server=/.tuitwit.com/127.0.0.1#7913 ipset=/.tuitwit.com/gfwlist server=/.tumblr.com/127.0.0.1#7913 @@ -9454,12 +9454,12 @@ server=/.tuvpn.com/127.0.0.1#7913 ipset=/.tuvpn.com/gfwlist server=/.tuzaijidi.com/127.0.0.1#7913 ipset=/.tuzaijidi.com/gfwlist -server=/.tv.com/127.0.0.1#7913 -ipset=/.tv.com/gfwlist server=/.tvants.com/127.0.0.1#7913 ipset=/.tvants.com/gfwlist server=/.tvboxnow.com/127.0.0.1#7913 ipset=/.tvboxnow.com/gfwlist +server=/.tv.com/127.0.0.1#7913 +ipset=/.tv.com/gfwlist server=/.tvider.com/127.0.0.1#7913 ipset=/.tvider.com/gfwlist server=/.tvmost.com.hk/127.0.0.1#7913 @@ -9468,46 +9468,12 @@ server=/.tvplayvideos.com/127.0.0.1#7913 ipset=/.tvplayvideos.com/gfwlist server=/.tvunetworks.com/127.0.0.1#7913 ipset=/.tvunetworks.com/gfwlist -server=/.tw-blog.com/127.0.0.1#7913 -ipset=/.tw-blog.com/gfwlist -server=/.tw-npo.org/127.0.0.1#7913 -ipset=/.tw-npo.org/gfwlist -server=/.tw.answers.yahoo.com/127.0.0.1#7913 -ipset=/.tw.answers.yahoo.com/gfwlist -server=/.tw.bid.yahoo.com/127.0.0.1#7913 -ipset=/.tw.bid.yahoo.com/gfwlist -server=/.tw.gigacircle.com/127.0.0.1#7913 -ipset=/.tw.gigacircle.com/gfwlist -server=/.tw.hao123.com/127.0.0.1#7913 -ipset=/.tw.hao123.com/gfwlist -server=/.tw.iqiyi.com/127.0.0.1#7913 -ipset=/.tw.iqiyi.com/gfwlist -server=/.tw.jiepang.com/127.0.0.1#7913 -ipset=/.tw.jiepang.com/gfwlist -server=/.tw.knowledge.yahoo.com/127.0.0.1#7913 -ipset=/.tw.knowledge.yahoo.com/gfwlist -server=/.tw.mall.yahoo.com/127.0.0.1#7913 -ipset=/.tw.mall.yahoo.com/gfwlist -server=/.tw.mobi.yahoo.com/127.0.0.1#7913 -ipset=/.tw.mobi.yahoo.com/gfwlist -server=/.tw.money.yahoo.com/127.0.0.1#7913 -ipset=/.tw.money.yahoo.com/gfwlist -server=/.tw.myblog.yahoo.com/127.0.0.1#7913 -ipset=/.tw.myblog.yahoo.com/gfwlist -server=/.tw.news.yahoo.com/127.0.0.1#7913 -ipset=/.tw.news.yahoo.com/gfwlist -server=/.tw.streetvoice.com/127.0.0.1#7913 -ipset=/.tw.streetvoice.com/gfwlist -server=/.tw.tomonews.net/127.0.0.1#7913 -ipset=/.tw.tomonews.net/gfwlist -server=/.tw.voa.mobi/127.0.0.1#7913 -ipset=/.tw.voa.mobi/gfwlist -server=/.tw.yahoo.com/127.0.0.1#7913 -ipset=/.tw.yahoo.com/gfwlist server=/.tw01.org/127.0.0.1#7913 ipset=/.tw01.org/gfwlist server=/.twaitter.com/127.0.0.1#7913 ipset=/.twaitter.com/gfwlist +server=/.tw.answers.yahoo.com/127.0.0.1#7913 +ipset=/.tw.answers.yahoo.com/gfwlist server=/.twapperkeeper.com/127.0.0.1#7913 ipset=/.twapperkeeper.com/gfwlist server=/.twaud.io/127.0.0.1#7913 @@ -9520,6 +9486,10 @@ server=/.twbbs.org/127.0.0.1#7913 ipset=/.twbbs.org/gfwlist server=/.twbbs.tw/127.0.0.1#7913 ipset=/.twbbs.tw/gfwlist +server=/.tw.bid.yahoo.com/127.0.0.1#7913 +ipset=/.tw.bid.yahoo.com/gfwlist +server=/.tw-blog.com/127.0.0.1#7913 +ipset=/.tw-blog.com/gfwlist server=/.twblogger.com/127.0.0.1#7913 ipset=/.twblogger.com/gfwlist server=/.tweepguide.com/127.0.0.1#7913 @@ -9566,8 +9536,12 @@ server=/.twerkingbutt.com/127.0.0.1#7913 ipset=/.twerkingbutt.com/gfwlist server=/.twftp.org/127.0.0.1#7913 ipset=/.twftp.org/gfwlist +server=/.tw.gigacircle.com/127.0.0.1#7913 +ipset=/.tw.gigacircle.com/gfwlist server=/.twgreatdaily.com/127.0.0.1#7913 ipset=/.twgreatdaily.com/gfwlist +server=/.tw.hao123.com/127.0.0.1#7913 +ipset=/.tw.hao123.com/gfwlist server=/.twibase.com/127.0.0.1#7913 ipset=/.twibase.com/gfwlist server=/.twibble.de/127.0.0.1#7913 @@ -9602,14 +9576,16 @@ server=/.twip.me/127.0.0.1#7913 ipset=/.twip.me/gfwlist server=/.twipple.jp/127.0.0.1#7913 ipset=/.twipple.jp/gfwlist +server=/.tw.iqiyi.com/127.0.0.1#7913 +ipset=/.tw.iqiyi.com/gfwlist server=/.twishort.com/127.0.0.1#7913 ipset=/.twishort.com/gfwlist server=/.twistar.cc/127.0.0.1#7913 ipset=/.twistar.cc/gfwlist -server=/.twister.net.co/127.0.0.1#7913 -ipset=/.twister.net.co/gfwlist server=/.twisterio.com/127.0.0.1#7913 ipset=/.twisterio.com/gfwlist +server=/.twister.net.co/127.0.0.1#7913 +ipset=/.twister.net.co/gfwlist server=/.twisternow.com/127.0.0.1#7913 ipset=/.twisternow.com/gfwlist server=/.twistory.net/127.0.0.1#7913 @@ -9620,10 +9596,10 @@ server=/.twitbrowser.net/127.0.0.1#7913 ipset=/.twitbrowser.net/gfwlist server=/.twitcause.com/127.0.0.1#7913 ipset=/.twitcause.com/gfwlist -server=/.twitch.tv/127.0.0.1#7913 -ipset=/.twitch.tv/gfwlist server=/.twitchcdn.net/127.0.0.1#7913 ipset=/.twitchcdn.net/gfwlist +server=/.twitch.tv/127.0.0.1#7913 +ipset=/.twitch.tv/gfwlist server=/.twitgether.com/127.0.0.1#7913 ipset=/.twitgether.com/gfwlist server=/.twitgoo.com/127.0.0.1#7913 @@ -9644,18 +9620,18 @@ server=/.twitstat.com/127.0.0.1#7913 ipset=/.twitstat.com/gfwlist server=/.twittbot.net/127.0.0.1#7913 ipset=/.twittbot.net/gfwlist -server=/.twitter.com/127.0.0.1#7913 -ipset=/.twitter.com/gfwlist -server=/.twitter.jp/127.0.0.1#7913 -ipset=/.twitter.jp/gfwlist server=/.twitter4j.org/127.0.0.1#7913 ipset=/.twitter4j.org/gfwlist +server=/.twitter.com/127.0.0.1#7913 +ipset=/.twitter.com/gfwlist server=/.twittercounter.com/127.0.0.1#7913 ipset=/.twittercounter.com/gfwlist server=/.twitterfeed.com/127.0.0.1#7913 ipset=/.twitterfeed.com/gfwlist server=/.twittergadget.com/127.0.0.1#7913 ipset=/.twittergadget.com/gfwlist +server=/.twitter.jp/127.0.0.1#7913 +ipset=/.twitter.jp/gfwlist server=/.twitterkr.com/127.0.0.1#7913 ipset=/.twitterkr.com/gfwlist server=/.twittermail.com/127.0.0.1#7913 @@ -9676,26 +9652,50 @@ server=/.twitzap.com/127.0.0.1#7913 ipset=/.twitzap.com/gfwlist server=/.twiyia.com/127.0.0.1#7913 ipset=/.twiyia.com/gfwlist +server=/.tw.jiepang.com/127.0.0.1#7913 +ipset=/.tw.jiepang.com/gfwlist +server=/.tw.knowledge.yahoo.com/127.0.0.1#7913 +ipset=/.tw.knowledge.yahoo.com/gfwlist +server=/.tw.mall.yahoo.com/127.0.0.1#7913 +ipset=/.tw.mall.yahoo.com/gfwlist +server=/.tw.mobi.yahoo.com/127.0.0.1#7913 +ipset=/.tw.mobi.yahoo.com/gfwlist +server=/.tw.money.yahoo.com/127.0.0.1#7913 +ipset=/.tw.money.yahoo.com/gfwlist +server=/.tw.myblog.yahoo.com/127.0.0.1#7913 +ipset=/.tw.myblog.yahoo.com/gfwlist +server=/.tw.news.yahoo.com/127.0.0.1#7913 +ipset=/.tw.news.yahoo.com/gfwlist server=/.twnorth.org.tw/127.0.0.1#7913 ipset=/.twnorth.org.tw/gfwlist +server=/.tw-npo.org/127.0.0.1#7913 +ipset=/.tw-npo.org/gfwlist server=/.twskype.com/127.0.0.1#7913 ipset=/.twskype.com/gfwlist server=/.twstar.net/127.0.0.1#7913 ipset=/.twstar.net/gfwlist -server=/.twt.tl/127.0.0.1#7913 -ipset=/.twt.tl/gfwlist +server=/.tw.streetvoice.com/127.0.0.1#7913 +ipset=/.tw.streetvoice.com/gfwlist server=/.twtkr.com/127.0.0.1#7913 ipset=/.twtkr.com/gfwlist +server=/.tw.tomonews.net/127.0.0.1#7913 +ipset=/.tw.tomonews.net/gfwlist server=/.twtr2src.ogaoga.org/127.0.0.1#7913 ipset=/.twtr2src.ogaoga.org/gfwlist server=/.twtrland.com/127.0.0.1#7913 ipset=/.twtrland.com/gfwlist +server=/.twt.tl/127.0.0.1#7913 +ipset=/.twt.tl/gfwlist server=/.twttr.com/127.0.0.1#7913 ipset=/.twttr.com/gfwlist server=/.twurl.nl/127.0.0.1#7913 ipset=/.twurl.nl/gfwlist +server=/.tw.voa.mobi/127.0.0.1#7913 +ipset=/.tw.voa.mobi/gfwlist server=/.twyac.org/127.0.0.1#7913 ipset=/.twyac.org/gfwlist +server=/.tw.yahoo.com/127.0.0.1#7913 +ipset=/.tw.yahoo.com/gfwlist server=/.txxx.com/127.0.0.1#7913 ipset=/.txxx.com/gfwlist server=/.tycool.com/127.0.0.1#7913 @@ -9712,20 +9712,20 @@ server=/.ubddns.org/127.0.0.1#7913 ipset=/.ubddns.org/gfwlist server=/.uberproxy.net/127.0.0.1#7913 ipset=/.uberproxy.net/gfwlist -server=/.uc-japan.org/127.0.0.1#7913 -ipset=/.uc-japan.org/gfwlist server=/.ucdc1998.org/127.0.0.1#7913 ipset=/.ucdc1998.org/gfwlist server=/.uchicago.edu/127.0.0.1#7913 ipset=/.uchicago.edu/gfwlist +server=/.uc-japan.org/127.0.0.1#7913 +ipset=/.uc-japan.org/gfwlist server=/.uderzo.it/127.0.0.1#7913 ipset=/.uderzo.it/gfwlist -server=/.udn.com.tw/127.0.0.1#7913 -ipset=/.udn.com.tw/gfwlist -server=/.udn.com/127.0.0.1#7913 -ipset=/.udn.com/gfwlist server=/.udnbkk.com/127.0.0.1#7913 ipset=/.udnbkk.com/gfwlist +server=/.udn.com/127.0.0.1#7913 +ipset=/.udn.com/gfwlist +server=/.udn.com.tw/127.0.0.1#7913 +ipset=/.udn.com.tw/gfwlist server=/.uforadio.com.tw/127.0.0.1#7913 ipset=/.uforadio.com.tw/gfwlist server=/.ufreevpn.com/127.0.0.1#7913 @@ -9736,12 +9736,12 @@ server=/.uhdwallpapers.org/127.0.0.1#7913 ipset=/.uhdwallpapers.org/gfwlist server=/.uhrp.org/127.0.0.1#7913 ipset=/.uhrp.org/gfwlist +server=/.uighurbiz.net/127.0.0.1#7913 +ipset=/.uighurbiz.net/gfwlist server=/.uighur.narod.ru/127.0.0.1#7913 ipset=/.uighur.narod.ru/gfwlist server=/.uighur.nl/127.0.0.1#7913 ipset=/.uighur.nl/gfwlist -server=/.uighurbiz.net/127.0.0.1#7913 -ipset=/.uighurbiz.net/gfwlist server=/.ukcdp.co.uk/127.0.0.1#7913 ipset=/.ukcdp.co.uk/gfwlist server=/.ukliferadio.co.uk/127.0.0.1#7913 @@ -9758,8 +9758,6 @@ server=/.ultraxs.com/127.0.0.1#7913 ipset=/.ultraxs.com/gfwlist server=/.umich.edu/127.0.0.1#7913 ipset=/.umich.edu/gfwlist -server=/.unblock-us.com/127.0.0.1#7913 -ipset=/.unblock-us.com/gfwlist server=/.unblock.cn.com/127.0.0.1#7913 ipset=/.unblock.cn.com/gfwlist server=/.unblockdmm.com/127.0.0.1#7913 @@ -9768,6 +9766,8 @@ server=/.unblocker.yt/127.0.0.1#7913 ipset=/.unblocker.yt/gfwlist server=/.unblocksit.es/127.0.0.1#7913 ipset=/.unblocksit.es/gfwlist +server=/.unblock-us.com/127.0.0.1#7913 +ipset=/.unblock-us.com/gfwlist server=/.uncyclomedia.org/127.0.0.1#7913 ipset=/.uncyclomedia.org/gfwlist server=/.uncyclopedia.hk/127.0.0.1#7913 @@ -9836,8 +9836,6 @@ server=/.urlborg.com/127.0.0.1#7913 ipset=/.urlborg.com/gfwlist server=/.urlparser.com/127.0.0.1#7913 ipset=/.urlparser.com/gfwlist -server=/.us.to/127.0.0.1#7913 -ipset=/.us.to/gfwlist server=/.usacn.com/127.0.0.1#7913 ipset=/.usacn.com/gfwlist server=/.usaip.eu/127.0.0.1#7913 @@ -9862,6 +9860,8 @@ server=/.usno.navy.mil/127.0.0.1#7913 ipset=/.usno.navy.mil/gfwlist server=/.usocctn.com/127.0.0.1#7913 ipset=/.usocctn.com/gfwlist +server=/.us.to/127.0.0.1#7913 +ipset=/.us.to/gfwlist server=/.ustream.tv/127.0.0.1#7913 ipset=/.ustream.tv/gfwlist server=/.usunitednews.com/127.0.0.1#7913 @@ -9880,18 +9880,18 @@ server=/.uwants.com/127.0.0.1#7913 ipset=/.uwants.com/gfwlist server=/.uwants.net/127.0.0.1#7913 ipset=/.uwants.net/gfwlist -server=/.uyghur-j.org/127.0.0.1#7913 -ipset=/.uyghur-j.org/gfwlist -server=/.uyghur.co.uk/127.0.0.1#7913 -ipset=/.uyghur.co.uk/gfwlist server=/.uyghuramerican.org/127.0.0.1#7913 ipset=/.uyghuramerican.org/gfwlist server=/.uyghurcanadiansociety.org/127.0.0.1#7913 ipset=/.uyghurcanadiansociety.org/gfwlist server=/.uyghurcongress.org/127.0.0.1#7913 ipset=/.uyghurcongress.org/gfwlist +server=/.uyghur.co.uk/127.0.0.1#7913 +ipset=/.uyghur.co.uk/gfwlist server=/.uyghurensemble.co.uk/127.0.0.1#7913 ipset=/.uyghurensemble.co.uk/gfwlist +server=/.uyghur-j.org/127.0.0.1#7913 +ipset=/.uyghur-j.org/gfwlist server=/.uyghurpen.org/127.0.0.1#7913 ipset=/.uyghurpen.org/gfwlist server=/.uyghurpress.com/127.0.0.1#7913 @@ -9922,16 +9922,16 @@ server=/.vaticannews.va/127.0.0.1#7913 ipset=/.vaticannews.va/gfwlist server=/.vatn.org/127.0.0.1#7913 ipset=/.vatn.org/gfwlist -server=/.vcf-online.org/127.0.0.1#7913 -ipset=/.vcf-online.org/gfwlist server=/.vcfbuilder.org/127.0.0.1#7913 ipset=/.vcfbuilder.org/gfwlist +server=/.vcf-online.org/127.0.0.1#7913 +ipset=/.vcf-online.org/gfwlist server=/.vds.rightster.com/127.0.0.1#7913 ipset=/.vds.rightster.com/gfwlist -server=/.vegas.williamhill.com/127.0.0.1#7913 -ipset=/.vegas.williamhill.com/gfwlist server=/.vegasred.com/127.0.0.1#7913 ipset=/.vegasred.com/gfwlist +server=/.vegas.williamhill.com/127.0.0.1#7913 +ipset=/.vegas.williamhill.com/gfwlist server=/.velkaepocha.sk/127.0.0.1#7913 ipset=/.velkaepocha.sk/gfwlist server=/.venbbs.com/127.0.0.1#7913 @@ -9960,40 +9960,40 @@ server=/.vica.info/127.0.0.1#7913 ipset=/.vica.info/gfwlist server=/.victimsofcommunism.org/127.0.0.1#7913 ipset=/.victimsofcommunism.org/gfwlist -server=/.vid.me/127.0.0.1#7913 -ipset=/.vid.me/gfwlist server=/.vidble.com/127.0.0.1#7913 ipset=/.vidble.com/gfwlist server=/.video.aol.ca/127.0.0.1#7913 ipset=/.video.aol.ca/gfwlist -server=/.video.aol.co.uk/127.0.0.1#7913 -ipset=/.video.aol.co.uk/gfwlist server=/.video.aol.com/127.0.0.1#7913 ipset=/.video.aol.com/gfwlist +server=/.video.aol.co.uk/127.0.0.1#7913 +ipset=/.video.aol.co.uk/gfwlist server=/.video.ap.org/127.0.0.1#7913 ipset=/.video.ap.org/gfwlist -server=/.video.fdbox.com/127.0.0.1#7913 -ipset=/.video.fdbox.com/gfwlist -server=/.video.foxbusiness.com/127.0.0.1#7913 -ipset=/.video.foxbusiness.com/gfwlist -server=/.video.pbs.org/127.0.0.1#7913 -ipset=/.video.pbs.org/gfwlist -server=/.video.yahoo.com/127.0.0.1#7913 -ipset=/.video.yahoo.com/gfwlist server=/.videobam.com/127.0.0.1#7913 ipset=/.videobam.com/gfwlist server=/.videodetective.com/127.0.0.1#7913 ipset=/.videodetective.com/gfwlist +server=/.video.fdbox.com/127.0.0.1#7913 +ipset=/.video.fdbox.com/gfwlist +server=/.video.foxbusiness.com/127.0.0.1#7913 +ipset=/.video.foxbusiness.com/gfwlist server=/.videomega.tv/127.0.0.1#7913 ipset=/.videomega.tv/gfwlist server=/.videomo.com/127.0.0.1#7913 ipset=/.videomo.com/gfwlist +server=/.video.pbs.org/127.0.0.1#7913 +ipset=/.video.pbs.org/gfwlist server=/.videopediaworld.com/127.0.0.1#7913 ipset=/.videopediaworld.com/gfwlist server=/.videopress.com/127.0.0.1#7913 ipset=/.videopress.com/gfwlist +server=/.video.yahoo.com/127.0.0.1#7913 +ipset=/.video.yahoo.com/gfwlist server=/.vidinfo.org/127.0.0.1#7913 ipset=/.vidinfo.org/gfwlist +server=/.vid.me/127.0.0.1#7913 +ipset=/.vid.me/gfwlist server=/.vietdaikynguyen.com/127.0.0.1#7913 ipset=/.vietdaikynguyen.com/gfwlist server=/.vijayatemple.org/127.0.0.1#7913 @@ -10040,18 +10040,18 @@ server=/.vmixcore.com/127.0.0.1#7913 ipset=/.vmixcore.com/gfwlist server=/.vmpsoft.com/127.0.0.1#7913 ipset=/.vmpsoft.com/gfwlist -server=/.vn.hao123.com/127.0.0.1#7913 -ipset=/.vn.hao123.com/gfwlist server=/.vnet.link/127.0.0.1#7913 ipset=/.vnet.link/gfwlist +server=/.vn.hao123.com/127.0.0.1#7913 +ipset=/.vn.hao123.com/gfwlist server=/.voa-11.akacast.akamaistream.net/127.0.0.1#7913 ipset=/.voa-11.akacast.akamaistream.net/gfwlist server=/.voacantonese.com/127.0.0.1#7913 ipset=/.voacantonese.com/gfwlist -server=/.voachinese.com/127.0.0.1#7913 -ipset=/.voachinese.com/gfwlist server=/.voachineseblog.com/127.0.0.1#7913 ipset=/.voachineseblog.com/gfwlist +server=/.voachinese.com/127.0.0.1#7913 +ipset=/.voachinese.com/gfwlist server=/.voagd.com/127.0.0.1#7913 ipset=/.voagd.com/gfwlist server=/.voanews.com/127.0.0.1#7913 @@ -10076,22 +10076,20 @@ server=/.voxer.com/127.0.0.1#7913 ipset=/.voxer.com/gfwlist server=/.voy.com/127.0.0.1#7913 ipset=/.voy.com/gfwlist -server=/.vpn.ac/127.0.0.1#7913 -ipset=/.vpn.ac/gfwlist -server=/.vpn.cjb.net/127.0.0.1#7913 -ipset=/.vpn.cjb.net/gfwlist -server=/.vpn.cmu.edu/127.0.0.1#7913 -ipset=/.vpn.cmu.edu/gfwlist -server=/.vpn.sv.cmu.edu/127.0.0.1#7913 -ipset=/.vpn.sv.cmu.edu/gfwlist server=/.vpn4all.com/127.0.0.1#7913 ipset=/.vpn4all.com/gfwlist +server=/.vpn.ac/127.0.0.1#7913 server=/.vpnaccount.org/127.0.0.1#7913 ipset=/.vpnaccount.org/gfwlist server=/.vpnaccounts.com/127.0.0.1#7913 ipset=/.vpnaccounts.com/gfwlist +ipset=/.vpn.ac/gfwlist server=/.vpnbook.com/127.0.0.1#7913 ipset=/.vpnbook.com/gfwlist +server=/.vpn.cjb.net/127.0.0.1#7913 +ipset=/.vpn.cjb.net/gfwlist +server=/.vpn.cmu.edu/127.0.0.1#7913 +ipset=/.vpn.cmu.edu/gfwlist server=/.vpncomparison.org/127.0.0.1#7913 ipset=/.vpncomparison.org/gfwlist server=/.vpncoupons.com/127.0.0.1#7913 @@ -10146,6 +10144,8 @@ server=/.vpnshieldapp.com/127.0.0.1#7913 ipset=/.vpnshieldapp.com/gfwlist server=/.vpnsp.com/127.0.0.1#7913 ipset=/.vpnsp.com/gfwlist +server=/.vpn.sv.cmu.edu/127.0.0.1#7913 +ipset=/.vpn.sv.cmu.edu/gfwlist server=/.vpntraffic.com/127.0.0.1#7913 ipset=/.vpntraffic.com/gfwlist server=/.vpntunnel.com/127.0.0.1#7913 @@ -10174,8 +10174,6 @@ server=/.vuku.cc/127.0.0.1#7913 ipset=/.vuku.cc/gfwlist server=/.vultryhw.com/127.0.0.1#7913 ipset=/.vultryhw.com/gfwlist -server=/.w.idaiwan.com/127.0.0.1#7913 -ipset=/.w.idaiwan.com/gfwlist server=/.w3schools.com/127.0.0.1#7913 ipset=/.w3schools.com/gfwlist server=/.waffle1999.com/127.0.0.1#7913 @@ -10236,10 +10234,10 @@ server=/.watchmygf.net/127.0.0.1#7913 ipset=/.watchmygf.net/gfwlist server=/.wattpad.com/127.0.0.1#7913 ipset=/.wattpad.com/gfwlist -server=/.wav.tv/127.0.0.1#7913 -ipset=/.wav.tv/gfwlist server=/.waveprotocol.org/127.0.0.1#7913 ipset=/.waveprotocol.org/gfwlist +server=/.wav.tv/127.0.0.1#7913 +ipset=/.wav.tv/gfwlist server=/.waymo.com/127.0.0.1#7913 ipset=/.waymo.com/gfwlist server=/.wda.gov.tw/127.0.0.1#7913 @@ -10250,12 +10248,12 @@ server=/.wearehairy.com/127.0.0.1#7913 ipset=/.wearehairy.com/gfwlist server=/.wearn.com/127.0.0.1#7913 ipset=/.wearn.com/gfwlist -server=/.web.dev/127.0.0.1#7913 -ipset=/.web.dev/gfwlist server=/.web2project.net/127.0.0.1#7913 ipset=/.web2project.net/gfwlist server=/.webbang.net/127.0.0.1#7913 ipset=/.webbang.net/gfwlist +server=/.web.dev/127.0.0.1#7913 +ipset=/.web.dev/gfwlist server=/.webevader.org/127.0.0.1#7913 ipset=/.webevader.org/gfwlist server=/.webfreer.com/127.0.0.1#7913 @@ -10270,12 +10268,12 @@ server=/.webrtc.org/127.0.0.1#7913 ipset=/.webrtc.org/gfwlist server=/.webrush.net/127.0.0.1#7913 ipset=/.webrush.net/gfwlist -server=/.webs-tv.net/127.0.0.1#7913 -ipset=/.webs-tv.net/gfwlist server=/.website.informer.com/127.0.0.1#7913 ipset=/.website.informer.com/gfwlist server=/.websitepulse.com/127.0.0.1#7913 ipset=/.websitepulse.com/gfwlist +server=/.webs-tv.net/127.0.0.1#7913 +ipset=/.webs-tv.net/gfwlist server=/.webwarper.net/127.0.0.1#7913 ipset=/.webwarper.net/gfwlist server=/.webworkerdaily.com/127.0.0.1#7913 @@ -10374,6 +10372,8 @@ server=/.whylover.com/127.0.0.1#7913 ipset=/.whylover.com/gfwlist server=/.whyx.org/127.0.0.1#7913 ipset=/.whyx.org/gfwlist +server=/.w.idaiwan.com/127.0.0.1#7913 +ipset=/.w.idaiwan.com/gfwlist server=/.widevine.com/127.0.0.1#7913 ipset=/.widevine.com/gfwlist server=/.wikaba.com/127.0.0.1#7913 @@ -10388,14 +10388,6 @@ server=/.wiki.jqueryui.com/127.0.0.1#7913 ipset=/.wiki.jqueryui.com/gfwlist server=/.wiki.keso.cn/127.0.0.1#7913 ipset=/.wiki.keso.cn/gfwlist -server=/.wiki.moegirl.org/127.0.0.1#7913 -ipset=/.wiki.moegirl.org/gfwlist -server=/.wiki.oauth.net/127.0.0.1#7913 -ipset=/.wiki.oauth.net/gfwlist -server=/.wiki.phonegap.com/127.0.0.1#7913 -ipset=/.wiki.phonegap.com/gfwlist -server=/.wikileaks-forum.com/127.0.0.1#7913 -ipset=/.wikileaks-forum.com/gfwlist server=/.wikileaks.ch/127.0.0.1#7913 ipset=/.wikileaks.ch/gfwlist server=/.wikileaks.com/127.0.0.1#7913 @@ -10404,6 +10396,8 @@ server=/.wikileaks.de/127.0.0.1#7913 ipset=/.wikileaks.de/gfwlist server=/.wikileaks.eu/127.0.0.1#7913 ipset=/.wikileaks.eu/gfwlist +server=/.wikileaks-forum.com/127.0.0.1#7913 +ipset=/.wikileaks-forum.com/gfwlist server=/.wikileaks.lu/127.0.0.1#7913 ipset=/.wikileaks.lu/gfwlist server=/.wikileaks.org/127.0.0.1#7913 @@ -10414,8 +10408,14 @@ server=/.wikilivres.info/127.0.0.1#7913 ipset=/.wikilivres.info/gfwlist server=/.wikimapia.org/127.0.0.1#7913 ipset=/.wikimapia.org/gfwlist +server=/.wiki.moegirl.org/127.0.0.1#7913 +ipset=/.wiki.moegirl.org/gfwlist +server=/.wiki.oauth.net/127.0.0.1#7913 +ipset=/.wiki.oauth.net/gfwlist server=/.wikipedia.org/127.0.0.1#7913 ipset=/.wikipedia.org/gfwlist +server=/.wiki.phonegap.com/127.0.0.1#7913 +ipset=/.wiki.phonegap.com/gfwlist server=/.wikiwiki.jp/127.0.0.1#7913 ipset=/.wikiwiki.jp/gfwlist server=/.wildammo.com/127.0.0.1#7913 @@ -10462,14 +10462,12 @@ server=/.wlcnew.jigsy.com/127.0.0.1#7913 ipset=/.wlcnew.jigsy.com/gfwlist server=/.wlx.sowiki.net/127.0.0.1#7913 ipset=/.wlx.sowiki.net/gfwlist -server=/.wn.com/127.0.0.1#7913 -ipset=/.wn.com/gfwlist server=/.wnacg.com/127.0.0.1#7913 ipset=/.wnacg.com/gfwlist server=/.wnacg.org/127.0.0.1#7913 ipset=/.wnacg.org/gfwlist -server=/.wo.tc/127.0.0.1#7913 -ipset=/.wo.tc/gfwlist +server=/.wn.com/127.0.0.1#7913 +ipset=/.wn.com/gfwlist server=/.wo3ttt.wordpress.com/127.0.0.1#7913 ipset=/.wo3ttt.wordpress.com/gfwlist server=/.woeser.com/127.0.0.1#7913 @@ -10502,14 +10500,16 @@ server=/.worldjournal.com/127.0.0.1#7913 ipset=/.worldjournal.com/gfwlist server=/.worldvpn.net/127.0.0.1#7913 ipset=/.worldvpn.net/gfwlist -server=/.wow-life.net/127.0.0.1#7913 -ipset=/.wow-life.net/gfwlist +server=/.wo.tc/127.0.0.1#7913 +ipset=/.wo.tc/gfwlist server=/.wow.com/127.0.0.1#7913 ipset=/.wow.com/gfwlist server=/.wowgirls.com/127.0.0.1#7913 ipset=/.wowgirls.com/gfwlist server=/.wowlegacy.ml/127.0.0.1#7913 ipset=/.wowlegacy.ml/gfwlist +server=/.wow-life.net/127.0.0.1#7913 +ipset=/.wow-life.net/gfwlist server=/.wowporn.com/127.0.0.1#7913 ipset=/.wowporn.com/gfwlist server=/.wowrk.com/127.0.0.1#7913 @@ -10536,10 +10536,10 @@ server=/.wsgzao.github.io/127.0.0.1#7913 ipset=/.wsgzao.github.io/gfwlist server=/.wsj.com/127.0.0.1#7913 ipset=/.wsj.com/gfwlist -server=/.wsj.net/127.0.0.1#7913 -ipset=/.wsj.net/gfwlist server=/.wsjhk.com/127.0.0.1#7913 ipset=/.wsjhk.com/gfwlist +server=/.wsj.net/127.0.0.1#7913 +ipset=/.wsj.net/gfwlist server=/.wtbn.org/127.0.0.1#7913 ipset=/.wtbn.org/gfwlist server=/.wtfpeople.com/127.0.0.1#7913 @@ -10552,10 +10552,10 @@ server=/.wufi.org.tw/127.0.0.1#7913 ipset=/.wufi.org.tw/gfwlist server=/.wuguoguang.com/127.0.0.1#7913 ipset=/.wuguoguang.com/gfwlist -server=/.wujie.net/127.0.0.1#7913 -ipset=/.wujie.net/gfwlist server=/.wujieliulan.com/127.0.0.1#7913 ipset=/.wujieliulan.com/gfwlist +server=/.wujie.net/127.0.0.1#7913 +ipset=/.wujie.net/gfwlist server=/.wukangrui.net/127.0.0.1#7913 ipset=/.wukangrui.net/gfwlist server=/.wuw.red/127.0.0.1#7913 @@ -10564,6 +10564,14 @@ server=/.wuyanblog.com/127.0.0.1#7913 ipset=/.wuyanblog.com/gfwlist server=/.wwitv.com/127.0.0.1#7913 ipset=/.wwitv.com/gfwlist +server=/.www1.american.edu/127.0.0.1#7913 +ipset=/.www1.american.edu/gfwlist +server=/.www1.biz/127.0.0.1#7913 +ipset=/.www1.biz/gfwlist +server=/.www2.ohchr.org/127.0.0.1#7913 +ipset=/.www2.ohchr.org/gfwlist +server=/.www2.rocketbbs.com/127.0.0.1#7913 +ipset=/.www2.rocketbbs.com/gfwlist server=/.www.abclite.net/127.0.0.1#7913 ipset=/.www.abclite.net/gfwlist server=/.www.ajsands.com/127.0.0.1#7913 @@ -10592,6 +10600,8 @@ server=/.www.gmiddle.com/127.0.0.1#7913 ipset=/.www.gmiddle.com/gfwlist server=/.www.gmiddle.net/127.0.0.1#7913 ipset=/.www.gmiddle.net/gfwlist +server=/.wwwhost.biz/127.0.0.1#7913 +ipset=/.wwwhost.biz/gfwlist server=/.www.hustlercash.com/127.0.0.1#7913 ipset=/.www.hustlercash.com/gfwlist server=/.www.idlcoyote.com/127.0.0.1#7913 @@ -10608,14 +10618,14 @@ server=/.www.lib.virginia.edu/127.0.0.1#7913 ipset=/.www.lib.virginia.edu/gfwlist server=/.www.linksalpha.com/127.0.0.1#7913 ipset=/.www.linksalpha.com/gfwlist -server=/.www.m-sport.co.uk/127.0.0.1#7913 -ipset=/.www.m-sport.co.uk/gfwlist server=/.www.metro.taipei/127.0.0.1#7913 ipset=/.www.metro.taipei/gfwlist server=/.www.monlamit.org/127.0.0.1#7913 ipset=/.www.monlamit.org/gfwlist server=/.www.moztw.org/127.0.0.1#7913 ipset=/.www.moztw.org/gfwlist +server=/.www.m-sport.co.uk/127.0.0.1#7913 +ipset=/.www.m-sport.co.uk/gfwlist server=/.www.nbc.com/127.0.0.1#7913 ipset=/.www.nbc.com/gfwlist server=/.www.orchidbbs.com/127.0.0.1#7913 @@ -10644,46 +10654,32 @@ server=/.www.taup.org.tw/127.0.0.1#7913 ipset=/.www.taup.org.tw/gfwlist server=/.www.thechinastory.org/127.0.0.1#7913 ipset=/.www.thechinastory.org/gfwlist -server=/.www.wan-press.org/127.0.0.1#7913 -ipset=/.www.wan-press.org/gfwlist server=/.www.wangruowang.org/127.0.0.1#7913 ipset=/.www.wangruowang.org/gfwlist +server=/.www.wan-press.org/127.0.0.1#7913 +ipset=/.www.wan-press.org/gfwlist server=/.www.websnapr.com/127.0.0.1#7913 ipset=/.www.websnapr.com/gfwlist server=/.www.zensur.freerk.com/127.0.0.1#7913 ipset=/.www.zensur.freerk.com/gfwlist -server=/.www1.american.edu/127.0.0.1#7913 -ipset=/.www1.american.edu/gfwlist -server=/.www1.biz/127.0.0.1#7913 -ipset=/.www1.biz/gfwlist -server=/.www2.ohchr.org/127.0.0.1#7913 -ipset=/.www2.ohchr.org/gfwlist -server=/.www2.rocketbbs.com/127.0.0.1#7913 -ipset=/.www2.rocketbbs.com/gfwlist -server=/.wwwhost.biz/127.0.0.1#7913 -ipset=/.wwwhost.biz/gfwlist server=/.wzyboy.im/127.0.0.1#7913 ipset=/.wzyboy.im/gfwlist -server=/.x-art.com/127.0.0.1#7913 -ipset=/.x-art.com/gfwlist -server=/.x-berry.com/127.0.0.1#7913 -ipset=/.x-berry.com/gfwlist -server=/.x-wall.org/127.0.0.1#7913 -ipset=/.x-wall.org/gfwlist -server=/.x.company/127.0.0.1#7913 -ipset=/.x.company/gfwlist server=/.x1949x.com/127.0.0.1#7913 ipset=/.x1949x.com/gfwlist server=/.x24hr.com/127.0.0.1#7913 ipset=/.x24hr.com/gfwlist server=/.x365x.com/127.0.0.1#7913 ipset=/.x365x.com/gfwlist -server=/.xa.yimg.com/127.0.0.1#7913 -ipset=/.xa.yimg.com/gfwlist server=/.xanga.com/127.0.0.1#7913 ipset=/.xanga.com/gfwlist +server=/.x-art.com/127.0.0.1#7913 +ipset=/.x-art.com/gfwlist +server=/.xa.yimg.com/127.0.0.1#7913 +ipset=/.xa.yimg.com/gfwlist server=/.xbabe.com/127.0.0.1#7913 ipset=/.xbabe.com/gfwlist +server=/.x-berry.com/127.0.0.1#7913 +ipset=/.x-berry.com/gfwlist server=/.xbookcn.com/127.0.0.1#7913 ipset=/.xbookcn.com/gfwlist server=/.xbtce.com/127.0.0.1#7913 @@ -10692,6 +10688,8 @@ server=/.xcafe.in/127.0.0.1#7913 ipset=/.xcafe.in/gfwlist server=/.xcity.jp/127.0.0.1#7913 ipset=/.xcity.jp/gfwlist +server=/.x.company/127.0.0.1#7913 +ipset=/.x.company/gfwlist server=/.xcritic.com/127.0.0.1#7913 ipset=/.xcritic.com/gfwlist server=/.xda-developers.com/127.0.0.1#7913 @@ -10808,6 +10806,8 @@ server=/.xvideos.com/127.0.0.1#7913 ipset=/.xvideos.com/gfwlist server=/.xvideos.es/127.0.0.1#7913 ipset=/.xvideos.es/gfwlist +server=/.x-wall.org/127.0.0.1#7913 +ipset=/.x-wall.org/gfwlist server=/.xxbbx.com/127.0.0.1#7913 ipset=/.xxbbx.com/gfwlist server=/.xxlmovies.com/127.0.0.1#7913 @@ -10816,24 +10816,24 @@ server=/.xxuz.com/127.0.0.1#7913 ipset=/.xxuz.com/gfwlist server=/.xxx.com/127.0.0.1#7913 ipset=/.xxx.com/gfwlist -server=/.xxx.xxx/127.0.0.1#7913 -ipset=/.xxx.xxx/gfwlist server=/.xxxfuckmom.com/127.0.0.1#7913 ipset=/.xxxfuckmom.com/gfwlist server=/.xxxx.com.au/127.0.0.1#7913 ipset=/.xxxx.com.au/gfwlist +server=/.xxx.xxx/127.0.0.1#7913 +ipset=/.xxx.xxx/gfwlist server=/.xxxy.biz/127.0.0.1#7913 ipset=/.xxxy.biz/gfwlist server=/.xxxy.info/127.0.0.1#7913 ipset=/.xxxy.info/gfwlist server=/.xxxymovies.com/127.0.0.1#7913 ipset=/.xxxymovies.com/gfwlist +server=/.xysblogs.org/127.0.0.1#7913 +ipset=/.xysblogs.org/gfwlist server=/.xys.dxiong.com/127.0.0.1#7913 ipset=/.xys.dxiong.com/gfwlist server=/.xys.org/127.0.0.1#7913 ipset=/.xys.org/gfwlist -server=/.xysblogs.org/127.0.0.1#7913 -ipset=/.xysblogs.org/gfwlist server=/.xyy69.com/127.0.0.1#7913 ipset=/.xyy69.com/gfwlist server=/.xyy69.info/127.0.0.1#7913 @@ -10866,18 +10866,18 @@ server=/.yeeyi.com/127.0.0.1#7913 ipset=/.yeeyi.com/gfwlist server=/.yegle.net/127.0.0.1#7913 ipset=/.yegle.net/gfwlist -server=/.yes-news.com/127.0.0.1#7913 -ipset=/.yes-news.com/gfwlist -server=/.yes.xxx/127.0.0.1#7913 -ipset=/.yes.xxx/gfwlist server=/.yes123.com.tw/127.0.0.1#7913 ipset=/.yes123.com.tw/gfwlist -server=/.yesasia.com.hk/127.0.0.1#7913 -ipset=/.yesasia.com.hk/gfwlist server=/.yesasia.com/127.0.0.1#7913 ipset=/.yesasia.com/gfwlist +server=/.yesasia.com.hk/127.0.0.1#7913 +ipset=/.yesasia.com.hk/gfwlist +server=/.yes-news.com/127.0.0.1#7913 +ipset=/.yes-news.com/gfwlist server=/.yespornplease.com/127.0.0.1#7913 ipset=/.yespornplease.com/gfwlist +server=/.yes.xxx/127.0.0.1#7913 +ipset=/.yes.xxx/gfwlist server=/.yeyeclub.com/127.0.0.1#7913 ipset=/.yeyeclub.com/gfwlist server=/.ygto.com/127.0.0.1#7913 @@ -10918,10 +10918,10 @@ server=/.yong.hu/127.0.0.1#7913 ipset=/.yong.hu/gfwlist server=/.yorkbbs.ca/127.0.0.1#7913 ipset=/.yorkbbs.ca/gfwlist -server=/.you-get.org/127.0.0.1#7913 -ipset=/.you-get.org/gfwlist server=/.youdontcare.com/127.0.0.1#7913 ipset=/.youdontcare.com/gfwlist +server=/.you-get.org/127.0.0.1#7913 +ipset=/.you-get.org/gfwlist server=/.youjizz.com/127.0.0.1#7913 ipset=/.youjizz.com/gfwlist server=/.youmaker.com/127.0.0.1#7913 @@ -10936,10 +10936,10 @@ server=/.youporn.com/127.0.0.1#7913 ipset=/.youporn.com/gfwlist server=/.youporngay.com/127.0.0.1#7913 ipset=/.youporngay.com/gfwlist -server=/.your-freedom.net/127.0.0.1#7913 -ipset=/.your-freedom.net/gfwlist server=/.yourepeat.com/127.0.0.1#7913 ipset=/.yourepeat.com/gfwlist +server=/.your-freedom.net/127.0.0.1#7913 +ipset=/.your-freedom.net/gfwlist server=/.yourlisten.com/127.0.0.1#7913 ipset=/.yourlisten.com/gfwlist server=/.yourlust.com/127.0.0.1#7913 @@ -10955,17 +10955,17 @@ ipset=/.youshun12.com/gfwlist server=/.youthnetradio.org/127.0.0.1#7913 ipset=/.youthnetradio.org/gfwlist server=/.youtu.be/127.0.0.1#7913 -ipset=/.youtu.be/gfwlist -server=/.youtube-nocookie.com/127.0.0.1#7913 -ipset=/.youtube-nocookie.com/gfwlist -server=/.youtube.com/127.0.0.1#7913 -ipset=/.youtube.com/gfwlist server=/.youtubecn.com/127.0.0.1#7913 ipset=/.youtubecn.com/gfwlist +server=/.youtube.com/127.0.0.1#7913 +ipset=/.youtube.com/gfwlist server=/.youtubeeducation.com/127.0.0.1#7913 ipset=/.youtubeeducation.com/gfwlist server=/.youtubegaming.com/127.0.0.1#7913 ipset=/.youtubegaming.com/gfwlist +ipset=/.youtu.be/gfwlist +server=/.youtube-nocookie.com/127.0.0.1#7913 +ipset=/.youtube-nocookie.com/gfwlist server=/.youversion.com/127.0.0.1#7913 ipset=/.youversion.com/gfwlist server=/.youwin.com/127.0.0.1#7913 @@ -11008,10 +11008,10 @@ server=/.zalmos.com/127.0.0.1#7913 ipset=/.zalmos.com/gfwlist server=/.zannel.com/127.0.0.1#7913 ipset=/.zannel.com/gfwlist -server=/.zaobao.com.sg/127.0.0.1#7913 -ipset=/.zaobao.com.sg/gfwlist server=/.zaobao.com/127.0.0.1#7913 ipset=/.zaobao.com/gfwlist +server=/.zaobao.com.sg/127.0.0.1#7913 +ipset=/.zaobao.com.sg/gfwlist server=/.zaozon.com/127.0.0.1#7913 ipset=/.zaozon.com/gfwlist server=/.zapto.org/127.0.0.1#7913 @@ -11026,10 +11026,10 @@ server=/.zello.com/127.0.0.1#7913 ipset=/.zello.com/gfwlist server=/.zengjinyan.org/127.0.0.1#7913 ipset=/.zengjinyan.org/gfwlist -server=/.zenmate.com.ru/127.0.0.1#7913 -ipset=/.zenmate.com.ru/gfwlist server=/.zenmate.com/127.0.0.1#7913 ipset=/.zenmate.com/gfwlist +server=/.zenmate.com.ru/127.0.0.1#7913 +ipset=/.zenmate.com.ru/gfwlist server=/.zeronet.io/127.0.0.1#7913 ipset=/.zeronet.io/gfwlist server=/.zeutch.com/127.0.0.1#7913 @@ -11040,20 +11040,6 @@ server=/.zgsddh.com/127.0.0.1#7913 ipset=/.zgsddh.com/gfwlist server=/.zgzcjj.net/127.0.0.1#7913 ipset=/.zgzcjj.net/gfwlist -server=/.zh.bitterwinter.org/127.0.0.1#7913 -ipset=/.zh.bitterwinter.org/gfwlist -server=/.zh.ecdm.wikia.com/127.0.0.1#7913 -ipset=/.zh.ecdm.wikia.com/gfwlist -server=/.zh.pokerstrategy.com/127.0.0.1#7913 -ipset=/.zh.pokerstrategy.com/gfwlist -server=/.zh.pttpedia.wikia.com/127.0.0.1#7913 -ipset=/.zh.pttpedia.wikia.com/gfwlist -server=/.zh.uncyclopedia.wikia.com/127.0.0.1#7913 -ipset=/.zh.uncyclopedia.wikia.com/gfwlist -server=/.zh.wikinews.org/127.0.0.1#7913 -ipset=/.zh.wikinews.org/gfwlist -server=/.zh.wikisource.org/127.0.0.1#7913 -ipset=/.zh.wikisource.org/gfwlist server=/.zhanbin.net/127.0.0.1#7913 ipset=/.zhanbin.net/gfwlist server=/.zhangboli.net/127.0.0.1#7913 @@ -11066,16 +11052,20 @@ server=/.zhao.1984.city/127.0.0.1#7913 ipset=/.zhao.1984.city/gfwlist server=/.zhao.jinhai.de/127.0.0.1#7913 ipset=/.zhao.jinhai.de/gfwlist +server=/.zh.bitterwinter.org/127.0.0.1#7913 +ipset=/.zh.bitterwinter.org/gfwlist +server=/.zh.ecdm.wikia.com/127.0.0.1#7913 +ipset=/.zh.ecdm.wikia.com/gfwlist server=/.zhenghui.org/127.0.0.1#7913 ipset=/.zhenghui.org/gfwlist server=/.zhengjian.org/127.0.0.1#7913 ipset=/.zhengjian.org/gfwlist server=/.zhengwunet.org/127.0.0.1#7913 ipset=/.zhengwunet.org/gfwlist -server=/.zhenlibu.info/127.0.0.1#7913 -ipset=/.zhenlibu.info/gfwlist server=/.zhenlibu1984.com/127.0.0.1#7913 ipset=/.zhenlibu1984.com/gfwlist +server=/.zhenlibu.info/127.0.0.1#7913 +ipset=/.zhenlibu.info/gfwlist server=/.zhenxiang.biz/127.0.0.1#7913 ipset=/.zhenxiang.biz/gfwlist server=/.zhinengluyou.com/127.0.0.1#7913 @@ -11090,6 +11080,10 @@ server=/.zhongmeng.org/127.0.0.1#7913 ipset=/.zhongmeng.org/gfwlist server=/.zhoushuguang.com/127.0.0.1#7913 ipset=/.zhoushuguang.com/gfwlist +server=/.zh.pokerstrategy.com/127.0.0.1#7913 +ipset=/.zh.pokerstrategy.com/gfwlist +server=/.zh.pttpedia.wikia.com/127.0.0.1#7913 +ipset=/.zh.pttpedia.wikia.com/gfwlist server=/.zhreader.com/127.0.0.1#7913 ipset=/.zhreader.com/gfwlist server=/.zhuangbi.me/127.0.0.1#7913 @@ -11100,6 +11094,12 @@ server=/.zhuatieba.com/127.0.0.1#7913 ipset=/.zhuatieba.com/gfwlist server=/.zhuichaguoji.org/127.0.0.1#7913 ipset=/.zhuichaguoji.org/gfwlist +server=/.zh.uncyclopedia.wikia.com/127.0.0.1#7913 +ipset=/.zh.uncyclopedia.wikia.com/gfwlist +server=/.zh.wikinews.org/127.0.0.1#7913 +ipset=/.zh.wikinews.org/gfwlist +server=/.zh.wikisource.org/127.0.0.1#7913 +ipset=/.zh.wikisource.org/gfwlist server=/.ziddu.com/127.0.0.1#7913 ipset=/.ziddu.com/gfwlist server=/.zillionk.com/127.0.0.1#7913 @@ -11142,12 +11142,12 @@ server=/.zspeeder.me/127.0.0.1#7913 ipset=/.zspeeder.me/gfwlist server=/.zsrhao.com/127.0.0.1#7913 ipset=/.zsrhao.com/gfwlist -server=/.zuo.la/127.0.0.1#7913 -ipset=/.zuo.la/gfwlist server=/.zuobiao.me/127.0.0.1#7913 ipset=/.zuobiao.me/gfwlist +server=/.zuo.la/127.0.0.1#7913 server=/.zuola.com/127.0.0.1#7913 ipset=/.zuola.com/gfwlist +ipset=/.zuo.la/gfwlist server=/.zvereff.com/127.0.0.1#7913 ipset=/.zvereff.com/gfwlist server=/.zynaima.com/127.0.0.1#7913 diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh index 835bb9a55a..ea1f303794 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh @@ -101,70 +101,70 @@ gen_laniplist() { load_acl() { local enabled - local aclremarks - local ipaddr - local macaddr + local remarks + local ip + local mac local proxy_mode - local tcp_redir_server - local udp_redir_server + local tcp_node + local udp_node local tcp_redir_ports local udp_redir_ports config_get enabled $1 enabled - config_get aclremarks $1 aclremarks - config_get ipaddr $1 ipaddr - config_get macaddr $1 macaddr + config_get remarks $1 remarks + config_get ip $1 ip + config_get mac $1 mac config_get proxy_mode $1 proxy_mode - config_get tcp_redir_server $1 tcp_redir_server - config_get udp_redir_server $1 udp_redir_server + config_get tcp_node $1 tcp_node + config_get udp_node $1 udp_node config_get tcp_redir_ports $1 tcp_redir_ports config_get udp_redir_ports $1 udp_redir_ports [ -z "$proxy_mode" -o "$proxy_mode" = "default" ] && proxy_mode=$PROXY_MODE [ -z "$tcp_redir_ports" -o "$tcp_redir_ports" = "default" ] && tcp_redir_ports=$TCP_REDIR_PORTS [ -z "$udp_redir_ports" -o "$udp_redir_ports" = "default" ] && udp_redir_ports=$UDP_REDIR_PORTS - eval TCP_REDIR_SERVER=\$TCP_REDIR_SERVER$tcp_redir_server - eval UDP_REDIR_SERVER=\$UDP_REDIR_SERVER$tcp_redir_server - local ip_mark=$(get_ip_mark $ipaddr) + eval TCP_NODE=\$TCP_NODE$tcp_node + eval UDP_NODE=\$UDP_NODE$udp_node + local ip_mark=$(get_ip_mark $ip) [ "$enabled" == "1" -a -n "$proxy_mode" ] && { - if [ -n "$ipaddr" ] || [ -n "$macaddr" ]; then - if [ -n "$ipaddr" -a -n "$macaddr" ]; then - echolog "访问控制：IP：$ipaddr，MAC：$macaddr，代理模式：$(get_action_chain_name $proxy_mode)" + if [ -n "$ip" ] || [ -n "$mac" ]; then + if [ -n "$ip" -a -n "$mac" ]; then + echolog "访问控制：IP：$ip，MAC：$mac，代理模式：$(get_action_chain_name $proxy_mode)" else - [ -n "$ipaddr" ] && echolog "访问控制：IP：$ipaddr，代理模式：$(get_action_chain_name $proxy_mode)" - [ -n "$macaddr" ] && echolog "访问控制：MAC：$macaddr，代理模式：$(get_action_chain_name $proxy_mode)" + [ -n "$ip" ] && echolog "访问控制：IP：$ip，代理模式：$(get_action_chain_name $proxy_mode)" + [ -n "$mac" ] && echolog "访问控制：MAC：$mac，代理模式：$(get_action_chain_name $proxy_mode)" fi - [ "$TCP_REDIR_SERVER" != "nil" ] && { - #local TCP_REDIR_SERVER_TYPE=$(echo $(config_get $TCP_REDIR_SERVER server_type) | tr 'A-Z' 'a-z') - $iptables_mangle -A SS_ACL $(factor $ipaddr "-s") -p tcp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "$aclremarks" -j TTL --ttl-set 14$tcp_redir_server - $iptables_mangle -A SS_ACL $(factor $ipaddr "-s") -p tcp $(factor $macaddr "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") -m comment --comment "$aclremarks" -$(get_jump_mode $proxy_mode) $(get_action_chain $proxy_mode)$tcp_redir_server + [ "$TCP_NODE" != "nil" ] && { + #local TCP_NODE_TYPE=$(echo $(config_get $TCP_NODE type) | tr 'A-Z' 'a-z') + $iptables_mangle -A SS_ACL $(factor $ip "-s") -p tcp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "$remarks" -j TTL --ttl-set 14$tcp_node + $iptables_mangle -A SS_ACL $(factor $ip "-s") -p tcp $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") -m comment --comment "$remarks" -$(get_jump_mode $proxy_mode) $(get_action_chain $proxy_mode)$tcp_node } - [ "$UDP_REDIR_SERVER" != "nil" ] && { - #local UDP_REDIR_SERVER_TYPE=$(echo $(config_get $UDP_REDIR_SERVER server_type) | tr 'A-Z' 'a-z') - eval udp_redir_port=\$UDP_REDIR_PORT$udp_redir_server - $iptables_mangle -A SS_ACL $(factor $ipaddr "-s") -p udp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "$aclremarks" -j TPROXY --on-port $udp_redir_port --tproxy-mark 0x1/0x1 - $iptables_mangle -A SS_ACL $(factor $ipaddr "-s") -p udp $(factor $macaddr "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") -m comment --comment "$aclremarks" -$(get_jump_mode $proxy_mode) $(get_action_chain $proxy_mode)$udp_redir_server + [ "$UDP_NODE" != "nil" ] && { + #local UDP_NODE_TYPE=$(echo $(config_get $UDP_NODE type) | tr 'A-Z' 'a-z') + eval udp_redir_port=\$UDP_REDIR_PORT$udp_node + $iptables_mangle -A SS_ACL $(factor $ip "-s") -p udp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "$remarks" -j TPROXY --on-port $udp_redir_port --tproxy-mark 0x1/0x1 + $iptables_mangle -A SS_ACL $(factor $ip "-s") -p udp $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") -m comment --comment "$remarks" -$(get_jump_mode $proxy_mode) $(get_action_chain $proxy_mode)$udp_node } - [ -z "$ipaddr" ] && { - lower_macaddr=$(echo $macaddr | tr '[A-Z]' '[a-z]') - ipaddr=$(ip neigh show | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}" | grep $lower_macaddr | awk '{print $1}') - [ -z "$ipaddr" ] && { - dhcp_index=$(uci show dhcp | grep $lower_macaddr | awk -F'.' '{print $2}') - ipaddr=$(uci -q get dhcp.$dhcp_index.ip) + [ -z "$ip" ] && { + lower_mac=$(echo $mac | tr '[A-Z]' '[a-z]') + ip=$(ip neigh show | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}" | grep $lower_mac | awk '{print $1}') + [ -z "$ip" ] && { + dhcp_index=$(uci show dhcp | grep $lower_mac | awk -F'.' '{print $2}') + ip=$(uci -q get dhcp.$dhcp_index.ip) } - [ -z "$ipaddr" ] && ipaddr=$(cat /tmp/dhcp.leases | grep -E "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep $lower_macaddr | awk '{print $3}') + [ -z "$ip" ] && ip=$(cat /tmp/dhcp.leases | grep -E "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep $lower_mac | awk '{print $3}') } fi } } filter_vpsip() { - local server_host server_ip use_ipv6 network_type - server_host=$(config_get $1 server) + local address server_ip use_ipv6 network_type + address=$(config_get $1 address) use_ipv6=$(config_get $1 use_ipv6) network_type="ipv4" [ "$use_ipv6" == "1" ] && network_type="ipv6" - server_ip=$(get_host_ip $network_type $server_host) + server_ip=$(get_host_ip $network_type $address) - [ -n "$server_ip" -a "$server_ip" != "$TCP_REDIR_SERVER_IP" ] && { + [ -n "$server_ip" -a "$server_ip" != "$TCP_NODE_IP" ] && { [ "$network_type" == "ipv4" ] && ipset add $IPSET_VPSIPLIST $server_ip >/dev/null 2>&1 & } } @@ -221,7 +221,7 @@ add_firewall_rule() { [ -n "$lan_ipv4" ] && ipset add $IPSET_LANIPLIST $lan_ipv4 >/dev/null 2>&1 & # 过滤所有节点IP - config_foreach filter_vpsip "servers" + config_foreach filter_vpsip "nodes" $iptables_mangle -N SS $iptables_mangle -A SS -m set --match-set $IPSET_LANIPLIST dst -j RETURN @@ -229,9 +229,9 @@ add_firewall_rule() { $iptables_mangle -A SS -m set --match-set $IPSET_WHITELIST dst -j RETURN $iptables_mangle -N SS_ACL - if [[ "$TCP_REDIR_SERVER_NUM" -ge 1 ]] || [[ "$UDP_REDIR_SERVER_NUM" -ge 1 ]]; then + if [[ "$TCP_NODE_NUM" -ge 1 ]] || [[ "$UDP_NODE_NUM" -ge 1 ]]; then local max_num=1 - [ "$TCP_REDIR_SERVER_NUM" -ge "$UDP_REDIR_SERVER_NUM" ] && max_num=$TCP_REDIR_SERVER_NUM + [ "$TCP_NODE_NUM" -ge "$UDP_NODE_NUM" ] && max_num=$TCP_NODE_NUM if [ "$max_num" -ge 1 ]; then for i in $(seq 1 $max_num); do $iptables_mangle -N SS_GLO$i @@ -246,34 +246,34 @@ add_firewall_rule() { fi fi - if [ "$SOCKS5_PROXY_SERVER_NUM" -ge 1 ]; then - for i in $(seq 1 $SOCKS5_PROXY_SERVER_NUM); do + if [ "$SOCKS5_NODE_NUM" -ge 1 ]; then + for i in $(seq 1 $SOCKS5_NODE_NUM); do local k=$i - eval temp_server=\$SOCKS5_PROXY_SERVER$k + eval temp_server=\$SOCKS5_NODE$k if [ "$temp_server" != "nil" ]; then - local server_host=$(config_get $temp_server server) - local SOCKS5_PROXY_SERVER_PORT=$(config_get $temp_server server_port) - local SOCKS5_PROXY_SERVER_IP=$(get_host_ip "ipv4" $server_host) - [ -n "$SOCKS5_PROXY_SERVER_IP" -a -n "$SOCKS5_PROXY_SERVER_PORT" ] && $iptables_mangle -A SS -p tcp -d $SOCKS5_PROXY_SERVER_IP -m multiport --dports $SOCKS5_PROXY_SERVER_PORT -j RETURN + local address=$(config_get $temp_server address) + local SOCKS5_NODE_PORT=$(config_get $temp_server port) + local SOCKS5_NODE_IP=$(get_host_ip "ipv4" $address) + [ -n "$SOCKS5_NODE_IP" -a -n "$SOCKS5_NODE_PORT" ] && $iptables_mangle -A SS -p tcp -d $SOCKS5_NODE_IP -m multiport --dports $SOCKS5_NODE_PORT -j RETURN fi done fi - if [ "$TCP_REDIR_SERVER_NUM" -ge 1 ]; then - for i in $(seq 1 $TCP_REDIR_SERVER_NUM); do + if [ "$TCP_NODE_NUM" -ge 1 ]; then + for i in $(seq 1 $TCP_NODE_NUM); do local k=$i local local_port=104$k local ttl=14$k - eval temp_server=\$TCP_REDIR_SERVER$k + eval temp_server=\$TCP_NODE$k eval local_port=\$TCP_REDIR_PORT$k # 生成TCP转发规则 if [ "$temp_server" != "nil" ]; then - local server_host=$(config_get $temp_server server) - local TCP_REDIR_SERVER_PORT=$(config_get $temp_server server_port) - local TCP_REDIR_SERVER_IP=$(get_host_ip "ipv4" $server_host) - local TCP_REDIR_SERVER_TYPE=$(echo $(config_get $temp_server server_type) | tr 'A-Z' 'a-z') - [ -n "$TCP_REDIR_SERVER_IP" -a -n "$TCP_REDIR_SERVER_PORT" ] && $iptables_mangle -A SS -p tcp -d $TCP_REDIR_SERVER_IP -m multiport --dports $TCP_REDIR_SERVER_PORT -j RETURN - if [ "$TCP_REDIR_SERVER_TYPE" == "brook" ]; then + local address=$(config_get $temp_server address) + local TCP_NODE_PORT=$(config_get $temp_server port) + local TCP_NODE_IP=$(get_host_ip "ipv4" $address) + local TCP_NODE_TYPE=$(echo $(config_get $temp_server type) | tr 'A-Z' 'a-z') + [ -n "$TCP_NODE_IP" -a -n "$TCP_NODE_PORT" ] && $iptables_mangle -A SS -p tcp -d $TCP_NODE_IP -m multiport --dports $TCP_NODE_PORT -j RETURN + if [ "$TCP_NODE_TYPE" == "brook" ]; then $iptables_mangle -A SS_ACL -p tcp -m socket -j MARK --set-mark 1 # $iptables_mangle -A SS$k -p tcp -m set --match-set $IPSET_BLACKLIST dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 @@ -366,26 +366,46 @@ add_firewall_rule() { $iptables_nat -A SS -p tcp -m ttl --ttl-eq $ttl -j REDIRECT --to $local_port echolog "IPv4 防火墙TCP转发规则加载完成！" fi + if [ "$PROXY_IPV6" == "1" ]; then + lan_ipv6=$(ip address show br-lan | grep -w "inet6" | awk '{print $2}') #当前LAN IPv6段 + $ip6tables_nat -N SS + $ip6tables_nat -N SS_ACL + $ip6tables_nat -A PREROUTING -j SS + [ -n "$lan_ipv6" ] && { + for ip in $lan_ipv6; do + $ip6tables_nat -A SS -d $ip -j RETURN + done + } + [ "$use_ipv6" == "1" -a -n "$server_ip" ] && $ip6tables_nat -A SS -d $server_ip -j RETURN + $ip6tables_nat -N SS_GLO$k + $ip6tables_nat -N SS_GFW$k + $ip6tables_nat -N SS_CHN$k + $ip6tables_nat -N SS_HOME$k + $ip6tables_nat -A SS_GLO$k -p tcp -j REDIRECT --to $TCP_REDIR_PORT + $ip6tables_nat -A SS -j SS_GLO$k + #$ip6tables_nat -I OUTPUT -p tcp -j SS + echolog "IPv6防火墙规则加载完成！" + fi fi done else echolog "主服务器未选择，无法转发TCP！" fi - if [ "$UDP_REDIR_SERVER_NUM" -ge 1 ]; then - for i in $(seq 1 $UDP_REDIR_SERVER_NUM); do + if [ "$UDP_NODE_NUM" -ge 1 ]; then + for i in $(seq 1 $UDP_NODE_NUM); do local k=$i local local_port=104$k - eval temp_server=\$UDP_REDIR_SERVER$k + eval temp_server=\$UDP_NODE$k eval local_port=\$UDP_REDIR_PORT$k # 生成UDP转发规则 if [ "$temp_server" != "nil" ]; then - local server_host=$(config_get $temp_server server) - local UDP_REDIR_SERVER_PORT=$(config_get $temp_server server_port) - local UDP_REDIR_SERVER_IP=$(get_host_ip "ipv4" $server_host) - local UDP_REDIR_SERVER_TYPE=$(echo $(config_get $temp_server server_type) | tr 'A-Z' 'a-z') - [ -n "$UDP_REDIR_SERVER_IP" -a -n "$UDP_REDIR_SERVER_PORT" ] && $iptables_mangle -A SS -p udp -d $UDP_REDIR_SERVER_IP -m multiport --dports $UDP_REDIR_SERVER_PORT -j RETURN - [ "$UDP_REDIR_SERVER_TYPE" == "brook" ] && $iptables_mangle -A SS_ACL -p udp -m socket -j MARK --set-mark 1 + local address=$(config_get $temp_server address) + local UDP_NODE_PORT=$(config_get $temp_server port) + local UDP_NODE_IP=$(get_host_ip "ipv4" $address) + local UDP_NODE_TYPE=$(echo $(config_get $temp_server type) | tr 'A-Z' 'a-z') + [ -n "$UDP_NODE_IP" -a -n "$UDP_NODE_PORT" ] && $iptables_mangle -A SS -p udp -d $UDP_NODE_IP -m multiport --dports $UDP_NODE_PORT -j RETURN + [ "$UDP_NODE_TYPE" == "brook" ] && $iptables_mangle -A SS_ACL -p udp -m socket -j MARK --set-mark 1 # 全局模式 $iptables_mangle -A SS_GLO$k -p udp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 @@ -413,47 +433,23 @@ add_firewall_rule() { $iptables_mangle -A PREROUTING -j SS $iptables_mangle -A SS -j SS_ACL + + # 加载ACLS + config_foreach load_acl "acl_rule" - local max_num=1 - [ "$TCP_REDIR_SERVER_NUM" -ge "$UDP_REDIR_SERVER_NUM" ] && max_num=$TCP_REDIR_SERVER_NUM - if [ "$max_num" -ge 1 ]; then - for i in $(seq 1 $max_num); do - local k=$i - # 加载ACLS - [ "$k" == 1 ] && config_foreach load_acl "acl_rule" - - # 加载默认代理模式 - if [ "$PROXY_MODE" == "disable" ]; then - [ "$TCP_REDIR_SERVER" != "nil" ] && $iptables_mangle -A SS_ACL -p tcp -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE) - [ "$UDP_REDIR_SERVER" != "nil" ] && $iptables_mangle -A SS_ACL -p udp -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE) - else - $iptables_mangle -A SS_ACL -p tcp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "$Default" -j TTL --ttl-set 14$k - [ "$PROXY_MODE" == "gfwlist" ] && dns_hijack "force" - [ "$TCP_REDIR_SERVER" != "nil" ] && $iptables_mangle -A SS_ACL -p tcp -m multiport --dport $TCP_REDIR_PORTS -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)$k - [ "$UDP_REDIR_SERVER" != "nil" ] && $iptables_mangle -A SS_ACL -p udp -m multiport --dport $UDP_REDIR_PORTS -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)$k - fi - - if [ "$PROXY_IPV6" == "1" ]; then - lan_ipv6=$(ip address show br-lan | grep -w "inet6" | awk '{print $2}') #当前LAN IPv6段 - $ip6tables_nat -N SS - $ip6tables_nat -N SS_ACL - $ip6tables_nat -A PREROUTING -j SS - [ -n "$lan_ipv6" ] && { - for ip in $lan_ipv6; do - $ip6tables_nat -A SS -d $ip -j RETURN - done - } - [ "$use_ipv6" == "1" -a -n "$server_ip" ] && $ip6tables_nat -A SS -d $server_ip -j RETURN - $ip6tables_nat -N SS_GLO$k - $ip6tables_nat -N SS_GFW$k - $ip6tables_nat -N SS_CHN$k - $ip6tables_nat -N SS_HOME$k - $ip6tables_nat -A SS_GLO$k -p tcp -j REDIRECT --to $TCP_REDIR_PORT - $ip6tables_nat -A SS -j SS_GLO$k - #$ip6tables_nat -I OUTPUT -p tcp -j SS - echolog "IPv6防火墙规则加载完成！" - fi - done + # 加载默认代理模式 + if [ "$PROXY_MODE" == "disable" ]; then + [ "$TCP_NODE1" != "nil" ] && $iptables_mangle -A SS_ACL -p tcp -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE) + [ "$UDP_NODE1" != "nil" ] && $iptables_mangle -A SS_ACL -p udp -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE) + else + [ "$TCP_NODE1" != "nil" ] && { + $iptables_mangle -A SS_ACL -p tcp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "Default" -j TTL --ttl-set 141 + $iptables_mangle -A SS_ACL -p tcp -m multiport --dport $TCP_REDIR_PORTS -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)1 + } + [ "$UDP_NODE1" != "nil" ] && { + $iptables_mangle -A SS_ACL -p udp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "Default" -j TPROXY --on-port $UDP_REDIR_PORT1 --tproxy-mark 0x1/0x1 + $iptables_mangle -A SS_ACL -p udp -m multiport --dport $UDP_REDIR_PORTS -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)1 + } fi } @@ -499,7 +495,7 @@ del_firewall_rule() { $ip6tables_nat -F SS 2>/dev/null && $ip6tables_nat -X SS 2>/dev/null $ip6tables_nat -F SS_ACL 2>/dev/null && $ip6tables_nat -X SS_ACL 2>/dev/null - local max_num=10 + local max_num=5 if [ "$max_num" -ge 1 ]; then for i in $(seq 1 $max_num); do local k=$i diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh index 65877875e5..f0e7222bb3 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh @@ -15,27 +15,27 @@ config_t_get() { echo ${ret:=$3} } -TCP_REDIR_SERVER_NUM=$(config_t_get global_other tcp_redir_server_num 1) -for i in $(seq 1 $TCP_REDIR_SERVER_NUM); do - eval TCP_REDIR_SERVER$i=$(config_t_get global tcp_redir_server$i nil) +TCP_NODE_NUM=$(config_t_get global_other tcp_node_num 1) +for i in $(seq 1 $TCP_NODE_NUM); do + eval TCP_NODE$i=$(config_t_get global tcp_node$i nil) done -UDP_REDIR_SERVER_NUM=$(config_t_get global_other udp_redir_server_num 1) -for i in $(seq 1 $UDP_REDIR_SERVER_NUM); do - eval UDP_REDIR_SERVER$i=$(config_t_get global udp_redir_server$i nil) +UDP_NODE_NUM=$(config_t_get global_other udp_node_num 1) +for i in $(seq 1 $UDP_NODE_NUM); do + eval UDP_NODE$i=$(config_t_get global udp_node$i nil) done -SOCKS5_PROXY_SERVER_NUM=$(config_t_get global_other socks5_proxy_server_num 1) -for i in $(seq 1 $SOCKS5_PROXY_SERVER_NUM); do - eval SOCKS5_PROXY_SERVER$i=$(config_t_get global socks5_proxy_server$i nil) +SOCKS5_NODE_NUM=$(config_t_get global_other socks5_node_num 1) +for i in $(seq 1 $SOCKS5_NODE_NUM); do + eval SOCKS5_NODE$i=$(config_t_get global socks5_node$i nil) done dns_mode=$(config_t_get global dns_mode) use_haproxy=$(config_t_get global_haproxy balancing_enable 0) #tcp -for i in $(seq 1 $TCP_REDIR_SERVER_NUM); do - eval temp_server=\$TCP_REDIR_SERVER$i +for i in $(seq 1 $TCP_NODE_NUM); do + eval temp_server=\$TCP_NODE$i if [ "$temp_server" != "nil" ]; then #kcptun use_kcp=$(config_n_get $temp_server use_kcp 0) @@ -58,10 +58,10 @@ done #udp -for i in $(seq 1 $UDP_REDIR_SERVER_NUM); do - eval temp_server=\$UDP_REDIR_SERVER$i +for i in $(seq 1 $UDP_NODE_NUM); do + eval temp_server=\$UDP_NODE$i if [ "$temp_server" != "nil" ]; then - [ "$temp_server" == "default" ] && temp_server=$TCP_REDIR_SERVER1 + [ "$temp_server" == "default" ] && temp_server=$TCP_NODE1 [ -f "/var/etc/passwall/port/UDP_$i" ] && listen_port=$(echo -n `cat /var/etc/passwall/port/UDP_$i`) icount=$(ps -w | grep -v grep | grep -i -E "${CONFIG}/UDP_${i}|brook tproxy -l 0.0.0.0:${listen_port}|ipt2socks -U -l ${listen_port}" | wc -l) if [ $icount = 0 ]; then @@ -72,8 +72,8 @@ for i in $(seq 1 $UDP_REDIR_SERVER_NUM); do done #socks5 -for i in $(seq 1 $SOCKS5_PROXY_SERVER_NUM); do - eval temp_server=\$SOCKS5_PROXY_SERVER$i +for i in $(seq 1 $SOCKS5_NODE_NUM); do + eval temp_server=\$SOCKS5_NODE$i if [ "$temp_server" != "nil" ]; then [ -f "/var/etc/passwall/port/Socks5_$i" ] && listen_port=$(echo -n `cat /var/etc/passwall/port/Socks5_$i`) icount=$(ps -w | grep -v grep | grep -i -E "${CONFIG}/Socks5_${i}|brook client -l 0.0.0.0:${listen_port}" | wc -l) diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh index 0c3e9479d3..73698c5578 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh @@ -29,22 +29,22 @@ decode_url_link() { fi } -get_server_index(){ +get_node_index(){ [ -f "/etc/config/$CONFIG" ] && { - servers_index=$(uci show $CONFIG | grep -c "=servers") + nodes_index=$(uci show $CONFIG | grep -c "=nodes") } } -get_local_servers(){ - [ -f "/etc/config/$CONFIG" ] && [ "`uci show $CONFIG | grep -c 'sub_server'`" -gt 0 ] && { - get_server_index - for i in `seq $servers_index -1 1` +get_local_nodes(){ + [ -f "/etc/config/$CONFIG" ] && [ "`uci show $CONFIG | grep -c 'sub_node'`" -gt 0 ] && { + get_node_index + for i in `seq $nodes_index -1 1` do - [ "$(uci show $CONFIG.@servers[$(($i-1))]|grep -c "sub_server")" -eq 1 ] && { - if [ ! -f "/usr/share/${CONFIG}/sub/all_localservers" ]; then - echo $(config_t_get servers server $(($i-1))) > /usr/share/${CONFIG}/sub/all_localservers + [ "$(uci show $CONFIG.@nodes[$(($i-1))]|grep -c "sub_node")" -eq 1 ] && { + if [ ! -f "/usr/share/${CONFIG}/sub/all_localnodes" ]; then + echo $(config_t_get nodes address $(($i-1))) > /usr/share/${CONFIG}/sub/all_localnodes else - echo $(config_t_get servers server $(($i-1))) >> /usr/share/${CONFIG}/sub/all_localservers + echo $(config_t_get nodes address $(($i-1))) >> /usr/share/${CONFIG}/sub/all_localnodes fi } done @@ -52,20 +52,19 @@ get_local_servers(){ } get_remote_config(){ - remarks="(订阅)" - [ -n "$3" ] && remarks="(导入)" - group="sub_server" + add_mode="订阅" + [ -n "$3" ] && add_mode="导入" + group="sub_node" if [ "$1" == "ss" ]; then decode_link="$2" - server=$(echo "$decode_link" | awk -F ':' '{print $2}' | awk -F '@' '{print $2}') - server_port=$(echo "$decode_link" | awk -F ':' '{print $3}') + node_address=$(echo "$decode_link" | awk -F ':' '{print $2}' | awk -F '@' '{print $2}') + node_port=$(echo "$decode_link" | awk -F ':' '{print $3}') ssr_encrypt_method=$(echo "$decode_link" | awk -F ':' '{print $1}') password=$(echo "$decode_link" | awk -F ':' '{print $2}' | awk -F '@' '{print $1}') - server_host=$server elif [ "$1" == "ssr" ]; then decode_link="$2" - server=$(echo "$decode_link" | awk -F ':' '{print $1}') - server_port=$(echo "$decode_link" | awk -F ':' '{print $2}') + node_address=$(echo "$decode_link" | awk -F ':' '{print $1}') + node_port=$(echo "$decode_link" | awk -F ':' '{print $2}') protocol=$(echo "$decode_link" | awk -F ':' '{print $3}') ssr_encrypt_method=$(echo "$decode_link" | awk -F ':' '{print $4}') obfs=$(echo "$decode_link" | awk -F ':' '{print $5}') @@ -78,13 +77,12 @@ get_remote_config(){ remarks_temp=$(echo "$decode_link" |grep -Eo "remarks.+" |sed 's/remarks=//g'|awk -F'&' '{print $1}') [ -n "$remarks_temp" ] && remarks="${remarks}$(decode_url_link $remarks_temp 0)" group_temp=$(echo "$decode_link" |grep -Eo "group.+" |sed 's/group=//g'|awk -F'&' '{print $1}') - server_host=$server elif [ "$1" == "v2ray" ]; then json_load "$2" json_get_var json_v v json_get_var json_ps ps - json_get_var json_server add - json_get_var json_server_port port + json_get_var json_node_address add + json_get_var json_node_port port json_get_var json_id id json_get_var json_aid aid json_get_var json_security security @@ -101,34 +99,35 @@ get_remote_config(){ json_tls="none" fi - remarks="${remarks}${json_ps}" - server_host=$json_server + remarks="${json_ps}" + node_address=$json_node_address fi - # 把全部服务器节点写入文件 /usr/share/${CONFIG}/sub/all_onlineservers - if [ ! -f "/usr/share/${CONFIG}/sub/all_onlineservers" ]; then - echo $server_host > /usr/share/${CONFIG}/sub/all_onlineservers + # 把全部服务器节点写入文件 /usr/share/${CONFIG}/sub/all_onlinenodes + if [ ! -f "/usr/share/${CONFIG}/sub/all_onlinenodes" ]; then + echo $node_address > /usr/share/${CONFIG}/sub/all_onlinenodes else - echo $server_host >> /usr/share/${CONFIG}/sub/all_onlineservers + echo $node_address >> /usr/share/${CONFIG}/sub/all_onlinenodes fi } -add_servers(){ - get_server_index - uci_set="uci set $CONFIG.@servers[$servers_index]." - uci add $CONFIG servers > /dev/null +add_nodes(){ + get_node_index + uci_set="uci set $CONFIG.@nodes[$nodes_index]." + uci add $CONFIG nodes > /dev/null [ -z "$3" ] && ${uci_set}group="$group" if [ "$2" == "ss" ]; then + ${uci_set}add_mode="$add_mode" ${uci_set}remarks="$remarks" - ${uci_set}server_type="SSR" - ${uci_set}server="$server_host" + ${uci_set}type="SSR" + ${uci_set}address="$node_address" ${uci_set}use_ipv6=0 - ${uci_set}server_port="$server_port" + ${uci_set}port="$node_port" ${uci_set}password="$password" ${uci_set}ssr_encrypt_method="$ssr_encrypt_method" ${uci_set}timeout=300 - ${uci_set}fast_open=false + ${uci_set}tcp_fast_open=false if [ "$1" == "add" ]; then let addnum_ss+=1 @@ -137,11 +136,12 @@ add_servers(){ fi elif [ "$2" == "ssr" ]; then + ${uci_set}add_mode="$add_mode" ${uci_set}remarks="$remarks" - ${uci_set}server_type="SSR" - ${uci_set}server="$server_host" + ${uci_set}type="SSR" + ${uci_set}address="$node_address" ${uci_set}use_ipv6=0 - ${uci_set}server_port="$server_port" + ${uci_set}port="$node_port" ${uci_set}password="$password" ${uci_set}ssr_encrypt_method="$ssr_encrypt_method" ${uci_set}protocol="$protocol" @@ -149,7 +149,7 @@ add_servers(){ ${uci_set}obfs="$obfs" ${uci_set}obfs_param="$obfsparam" ${uci_set}timeout=300 - ${uci_set}fast_open=false + ${uci_set}tcp_fast_open=false if [ "$1" == "add" ]; then let addnum_ssr+=1 @@ -158,12 +158,13 @@ add_servers(){ fi elif [ "$2" == "v2ray" ]; then + ${uci_set}add_mode="$add_mode" ${uci_set}remarks="$remarks" - ${uci_set}server_type="V2ray" + ${uci_set}type="V2ray" ${uci_set}v2ray_protocol="vmess" - ${uci_set}server="$json_server" + ${uci_set}address="$node_address" ${uci_set}use_ipv6=0 - ${uci_set}server_port="$json_server_port" + ${uci_set}port="$json_node_port" ${uci_set}v2ray_security="auto" ${uci_set}v2ray_VMess_id="$json_id" ${uci_set}v2ray_VMess_alterId="$json_aid" @@ -187,34 +188,34 @@ add_servers(){ } update_config(){ - isadded_server=$(uci show $CONFIG | grep -c "remarks='$remarks'") - if [ "$isadded_server" -eq 0 ]; then - add_servers add "$link_type" + isadded_address=$(uci show $CONFIG | grep -c "remarks='$remarks'") + if [ "$isadded_address" -eq 0 ]; then + add_nodes add "$link_type" else index=$(uci show $CONFIG | grep -w "remarks='$remarks'" | cut -d '[' -f2|cut -d ']' -f1) - local_server_port=$(config_t_get servers server_port $index) - local_vmess_id=$(config_t_get servers v2ray_VMess_id $index) + local_port=$(config_t_get nodes port $index) + local_vmess_id=$(config_t_get nodes v2ray_VMess_id $index) - uci delete $CONFIG.@servers[$index] - add_servers update "$link_type" + uci delete $CONFIG.@nodes[$index] + add_nodes update "$link_type" fi } del_config(){ # 删除订阅服务器已经不存在的节点 - for localserver in $(cat /usr/share/${CONFIG}/sub/all_localservers) + for localaddress in $(cat /usr/share/${CONFIG}/sub/all_localnodes) do - [ "`cat /usr/share/${CONFIG}/sub/all_onlineservers |grep -c "$localserver"`" -eq 0 ] && { - for localindex in $(uci show $CONFIG|grep -w "$localserver" |grep -w "server=" |cut -d '[' -f2|cut -d ']' -f1) + [ "`cat /usr/share/${CONFIG}/sub/all_onlinenodes |grep -c "$localaddress"`" -eq 0 ] && { + for localindex in $(uci show $CONFIG|grep -w "$localaddress" |grep -w "address=" |cut -d '[' -f2|cut -d ']' -f1) do - del_server_type=$(uci get $CONFIG.@servers[$localindex].server_type) - uci delete $CONFIG.@servers[$localindex] + del_type=$(uci get $CONFIG.@nodes[$localindex].type) + uci delete $CONFIG.@nodes[$localindex] uci commit $CONFIG - if [ "$del_server_type" == "SS" ]; then + if [ "$del_type" == "SS" ]; then let delnum_ss+=1 #删除该节点 - elif [ "$del_server_type" == "SSR" ]; then + elif [ "$del_type" == "SSR" ]; then let delnum_ssr+=1 #删除该节点 - elif [ "$del_server_type" == "V2ray" ]; then + elif [ "$del_type" == "V2ray" ]; then let delnum_v2ray+=1 #删除该节点 fi @@ -224,16 +225,16 @@ del_config(){ } del_all_config(){ - get_server_index - [ "`uci show $CONFIG | grep -c 'sub_server'`" -eq 0 ] && exit 0 - current_tcp_redir_server1=$(config_t_get global tcp_redir_server1) - is_sub_server=`uci -q get $CONFIG.$current_tcp_redir_server1.group` - for i in `seq $servers_index -1 1` + get_node_index + [ "`uci show $CONFIG | grep -c 'sub_node'`" -eq 0 ] && exit 0 + current_tcp_node1=$(config_t_get global tcp_node1) + is_sub_node=`uci -q get $CONFIG.$current_tcp_node1.group` + for i in `seq $nodes_index -1 1` do - [ "$(uci show $CONFIG.@servers[$(($i-1))] | grep -c 'sub_server')" -eq 1 ] && uci delete $CONFIG.@servers[$(($i-1))] && uci commit $CONFIG + [ "$(uci show $CONFIG.@nodes[$(($i-1))] | grep -c 'sub_node')" -eq 1 ] && uci delete $CONFIG.@nodes[$(($i-1))] && uci commit $CONFIG done - [ -n "$is_sub_server" ] && { - uci set $CONFIG.global[0].tcp_redir_server1="nil" + [ -n "$is_sub_node" ] && { + uci set $CONFIG.global[0].tcp_node1="nil" uci commit $CONFIG && /etc/init.d/$CONFIG stop } } @@ -261,7 +262,7 @@ add() { get_remote_config "$link_type" "$decode_link" 1 update_config done - [ -f "/usr/share/${CONFIG}/sub/all_onlineservers" ] && rm -f /usr/share/${CONFIG}/sub/all_onlineservers + [ -f "/usr/share/${CONFIG}/sub/all_onlinenodes" ] && rm -f /usr/share/${CONFIG}/sub/all_onlinenodes } rm -f /tmp/links.conf rm -f "$LOCK_FILE" @@ -290,7 +291,7 @@ start() { [ ! -d "/var/${CONFIG}_sub" ] || [ "$(ls /var/${CONFIG}_sub | wc -l)" -eq 0 ] && echo "$Date: 订阅链接下载失败，请重试！" >> $LOG_FILE && rm -f "$LOCK_FILE" && exit 0 mkdir -p /usr/share/${CONFIG}/sub && rm -f /usr/share/${CONFIG}/sub/* - get_local_servers + get_local_nodes for file in /var/${CONFIG}_sub/* do [ -z "$(du -sh $file 2> /dev/null)" ] && echo "$Date: 订阅链接下载 $file 失败，请重试！" >> $LOG_FILE && continue @@ -321,7 +322,7 @@ start() { update_config done done - [ -f "/usr/share/${CONFIG}/sub/all_localservers" ] && del_config + [ -f "/usr/share/${CONFIG}/sub/all_localnodes" ] && del_config echo "$Date: 本次更新，SS新增服务器节点 $addnum_ss 个，修改 $updatenum_ss 个，删除 $delnum_ss 个。" >> $LOG_FILE echo "$Date: 本次更新，SSR新增服务器节点 $addnum_ssr 个，修改 $updatenum_ssr 个，删除 $delnum_ssr 个。" >> $LOG_FILE echo "$Date: 本次更新，V2ray新增服务器节点 $addnum_v2ray 个，修改 $updatenum_v2ray 个，删除 $delnum_v2ray 个。" >> $LOG_FILE @@ -331,7 +332,7 @@ start() { } stop() { - [ "`uci show $CONFIG | grep -c 'sub_server'`" -gt 0 ] && { + [ "`uci show $CONFIG | grep -c 'sub_node'`" -gt 0 ] && { echo "$Date: 在线订阅节点已全部删除" >> $LOG_FILE del_all_config } diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/test.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/test.sh index ab4694712c..12fda1be23 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/test.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/test.sh @@ -30,7 +30,7 @@ test_proxy() { test_auto_switch() { if [ -f "/var/etc/passwall/tcp_server_id" ]; then - TCP_REDIR_SERVER1=$(cat /var/etc/passwall/tcp_server_id) + TCP_NODES1=$(cat /var/etc/passwall/tcp_server_id) else rm -f $LOCK_FILE exit 1 @@ -47,17 +47,17 @@ test_auto_switch() { let "failcount++" [ "$failcount" -ge 6 ] && { echo "$(get_date): 自动切换检测：检测异常，切换节点" >>/var/log/passwall.log - TCP_REDIR_SERVERS=$(uci get passwall.@auto_switch[0].tcp_redir_server) - has_backup_server=$(echo $TCP_REDIR_SERVERS | grep $TCP_REDIR_SERVER1) + TCP_NODES=$(uci get passwall.@auto_switch[0].tcp_node) + has_backup_server=$(echo $TCP_NODES | grep $TCP_NODES1) setserver= if [ -z "$has_backup_server" ]; then - setserver=$(echo $TCP_REDIR_SERVERS | awk -F ' ' '{print $1}') + setserver=$(echo $TCP_NODES | awk -F ' ' '{print $1}') else - setserver=$TCP_REDIR_SERVER1 + setserver=$TCP_NODES1 flag=0 for server in $has_backup_server; do if [ "$flag" == 0 ]; then - if [ "$TCP_REDIR_SERVER1" == "$server" ]; then + if [ "$TCP_NODES1" == "$server" ]; then flag=1 continue fi @@ -73,7 +73,7 @@ test_auto_switch() { done fi rm -f $LOCK_FILE - uci set passwall.@global[0].tcp_redir_server=$setserver + uci set passwall.@global[0].tcp_node=$setserver uci commit passwall /etc/init.d/passwall restart exit 1 @@ -117,7 +117,7 @@ else touch $LOCK_FILE fi -is_auto_switch=$(uci show $CONFIG.@auto_switch[0] | grep "tcp_redir_server") +is_auto_switch=$(uci show $CONFIG.@auto_switch[0] | grep "tcp_node") if [ -z "$is_auto_switch" ]; then test_reconnection else