From c9363ceabe8be0f5d75a13bfa8d90e0f0b025b94 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 26 Oct 2019 07:59:56 +0800 Subject: [PATCH] luci-app-passwall: bump to latest git HEAD --- .../root/usr/share/passwall/monitor.sh | 76 - .../root/usr/share/passwall/rule_update.sh | 224 -- package/{Lienol => lienol}/brook/Makefile | 0 .../{Lienol => lienol}/dns-forwarder/Makefile | 0 .../dns-forwarder/files/dns-forwarder.config | 0 .../dns-forwarder/files/dns-forwarder.init | 0 package/{Lienol => lienol}/dns2socks/Makefile | 0 .../luci-app-passwall/Makefile | 2 +- .../luasrc/controller/passwall.lua | 4 +- .../luasrc/model/cbi/passwall/acl.lua | 0 .../luasrc/model/cbi/passwall/api/api.lua | 0 .../luasrc/model/cbi/passwall/api/brook.lua | 0 .../api/gen_v2ray_client_config_file.lua | 0 .../luasrc/model/cbi/passwall/api/kcptun.lua | 0 .../luasrc/model/cbi/passwall/api/v2ray.lua | 0 .../luasrc/model/cbi/passwall/auto_switch.lua | 0 .../luasrc/model/cbi/passwall/balancing.lua | 0 .../luasrc/model/cbi/passwall/global.lua | 0 .../luasrc/model/cbi/passwall/log.lua | 0 .../luasrc/model/cbi/passwall/other.lua | 0 .../luasrc/model/cbi/passwall/rule.lua | 0 .../luasrc/model/cbi/passwall/rulelist.lua | 0 .../luasrc/model/cbi/passwall/server_list.lua | 0 .../model/cbi/passwall/serverconfig.lua | 0 .../luasrc/view/passwall/global/status.htm | 56 +- .../luasrc/view/passwall/log/log.htm | 0 .../view/passwall/rule/brook_version.htm | 2 +- .../view/passwall/rule/kcptun_version.htm | 2 +- .../view/passwall/rule/rule_version.htm | 0 .../view/passwall/rule/v2ray_version.htm | 2 +- .../view/passwall/server_list/apply.htm | 0 .../view/passwall/server_list/auto_ping.htm | 0 .../passwall/server_list/link_add_server.htm | 0 .../luasrc/view/passwall/server_list/ping.htm | 0 .../view/passwall/server_list/server_list.htm | 0 .../luci-app-passwall/po/zh-cn/passwall.po | 0 .../luci-app-passwall/po2lmo | Bin .../root/etc/config/passwall | 8 +- .../root/etc/config/passwall_show | 0 .../root/etc/init.d/passwall | 0 .../root/etc/uci-defaults/luci-app-passwall | 0 .../root/usr/share/passwall/app.sh | 768 +++--- .../usr/share/passwall/dnsmasq.d/gfwlist.conf | 2350 ++++++++--------- .../usr/share/passwall/dnsmasq.d/user.conf | 0 .../root/usr/share/passwall/iptables.sh | 327 ++- .../root/usr/share/passwall/monitor.sh | 77 + .../usr/share/passwall/rule/blacklist_host | 3 +- .../root/usr/share/passwall/rule/blacklist_ip | 0 .../root/usr/share/passwall/rule/chnroute | 175 +- .../root/usr/share/passwall/rule/router | 1 + .../usr/share/passwall/rule/whitelist_host | 0 .../root/usr/share/passwall/rule/whitelist_ip | 0 .../root/usr/share/passwall/rule_update.sh | 223 ++ .../root/usr/share/passwall/subscription.sh | 8 +- .../usr/share/passwall/subscription_ssr.sh | 0 .../usr/share/passwall/subscription_v2ray.sh | 0 .../root/usr/share/passwall/test.sh | 86 +- 57 files changed, 2218 insertions(+), 2176 deletions(-) delete mode 100755 package/Lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh delete mode 100755 package/Lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh rename package/{Lienol => lienol}/brook/Makefile (100%) rename package/{Lienol => lienol}/dns-forwarder/Makefile (100%) rename package/{Lienol => lienol}/dns-forwarder/files/dns-forwarder.config (100%) rename package/{Lienol => lienol}/dns-forwarder/files/dns-forwarder.init (100%) rename package/{Lienol => lienol}/dns2socks/Makefile (100%) rename package/{Lienol => lienol}/luci-app-passwall/Makefile (99%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/controller/passwall.lua (98%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/acl.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray_client_config_file.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/global.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/log.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/other.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/rulelist.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/server_list.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/model/cbi/passwall/serverconfig.lua (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/global/status.htm (83%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/log/log.htm (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm (97%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm (97%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm (96%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/server_list/apply.htm (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/server_list/auto_ping.htm (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/server_list/link_add_server.htm (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/server_list/ping.htm (100%) rename package/{Lienol => lienol}/luci-app-passwall/luasrc/view/passwall/server_list/server_list.htm (100%) rename package/{Lienol => lienol}/luci-app-passwall/po/zh-cn/passwall.po (100%) rename package/{Lienol => lienol}/luci-app-passwall/po2lmo (100%) mode change 100755 => 100644 rename package/{Lienol => lienol}/luci-app-passwall/root/etc/config/passwall (90%) rename package/{Lienol => lienol}/luci-app-passwall/root/etc/config/passwall_show (100%) rename package/{Lienol => lienol}/luci-app-passwall/root/etc/init.d/passwall (100%) mode change 100755 => 100644 rename package/{Lienol => lienol}/luci-app-passwall/root/etc/uci-defaults/luci-app-passwall (100%) mode change 100755 => 100644 rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/app.sh (59%) mode change 100755 => 100644 rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/gfwlist.conf (100%) rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/user.conf (100%) rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/iptables.sh (76%) mode change 100755 => 100644 create mode 100644 package/lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/rule/blacklist_host (66%) rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/rule/blacklist_ip (100%) rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/rule/chnroute (98%) rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/rule/router (92%) rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/rule/whitelist_host (100%) rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/rule/whitelist_ip (100%) create mode 100644 package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/subscription.sh (73%) mode change 100755 => 100644 rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/subscription_ssr.sh (100%) mode change 100755 => 100644 rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/subscription_v2ray.sh (100%) mode change 100755 => 100644 rename package/{Lienol => lienol}/luci-app-passwall/root/usr/share/passwall/test.sh (50%) mode change 100755 => 100644 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 deleted file mode 100755 index 62cc9a1c06..0000000000 --- a/package/Lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh - -CONFIG=passwall -CONFIG_PATH=/var/etc/$CONFIG - -uci_get_by_name() { - local ret=$(uci get $CONFIG.$1.$2 2>/dev/null) - echo ${ret:=$3} -} - -uci_get_by_type() { - local ret=$(uci get $CONFIG.@$1[0].$2 2>/dev/null) - echo ${ret:=$3} -} - -TCP_REDIR_SERVER=$(uci_get_by_type global tcp_redir_server nil) -UDP_REDIR_SERVER=$(uci_get_by_type global udp_redir_server nil) -[ "$UDP_REDIR_SERVER" == "default" ] && UDP_REDIR_SERVER=$TCP_REDIR_SERVER -SOCKS5_PROXY_SERVER=$(uci_get_by_type global socks5_proxy_server nil) -dns_mode=$(uci_get_by_type global dns_mode) -use_haproxy=$(uci_get_by_type global_haproxy balancing_enable 0) -haproxy_port=$(uci_get_by_type global_haproxy haproxy_port) -use_kcp=$(uci_get_by_name $TCP_REDIR_SERVER use_kcp 0) -kcp_port=$(uci_get_by_type global_proxy kcptun_port 11183) - -#tcp -if [ $TCP_REDIR_SERVER != "nil" ] ;then - icount=`ps -w | grep -E "ss-redir|ssr-redir|v2ray" | grep $CONFIG_PATH/TCP.json | grep -v grep | wc -l` - if [ $icount = 0 ] ;then - /etc/init.d/passwall restart - exit 0 - fi -fi - -#udp -if [ $UDP_REDIR_SERVER != "nil" ] ;then - icount=`ps -w | grep -E "ss-redir|ssr-redir|v2ray" | grep $CONFIG_PATH/UDP.json | grep -v grep | wc -l` - if [ $icount = 0 ] ;then - /etc/init.d/passwall restart - exit 0 - fi -fi - -#socks5 -if [ $SOCKS5_PROXY_SERVER != "nil" ] ;then - icount=`ps -w | grep -E "ss-redir|ssr-redir|v2ray" | grep $CONFIG_PATH/SOCKS5.json | grep -v grep | wc -l` - if [ $icount = 0 ] ;then - /etc/init.d/passwall restart - exit 0 - fi -fi - -#dns -icount=`netstat -apn | grep 7913 | wc -l` -if [ $icount = 0 ] ;then - /etc/init.d/passwall restart - exit 0 -fi - -#kcptun -if [ $use_kcp -gt 0 ] ;then - icount=`ps -w | grep kcptun_client | grep $kcp_port |grep -v grep | wc -l` - if [ $icount = 0 ] ;then - /etc/init.d/passwall restart - exit 0 - fi -fi - -#haproxy -if [ $use_haproxy -gt 0 ] ;then - icount=`ps -w | grep haproxy | grep $haproxy_port | grep -v grep | wc -l` - if [ $icount = 0 ] ;then - /etc/init.d/passwall restart - exit 0 - fi -fi diff --git a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh b/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh deleted file mode 100755 index d9977e9594..0000000000 --- a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh +++ /dev/null @@ -1,224 +0,0 @@ -#!/bin/sh - -CONFIG=passwall -LOG_FILE=/var/log/$CONFIG.log -url_main="https://raw.githubusercontent.com/hq450/fancyss/master/rules" -SS_PATH=/usr/share/$CONFIG -DNSMASQ_PATH=$SS_PATH/dnsmasq.d -RULE_PATH=$SS_PATH/rule -Date=$(date "+%Y-%m-%d %H:%M:%S") - -update=$1 -gfwlist_update=0 -chnroute_update=0 -Pcap_Routing_update=0 -Pcap_WhiteList_update=0 -if [ -n "$update" ];then - [ -n "$(echo $update | grep "gfwlist_update")" ] && gfwlist_update=1 - [ -n "$(echo $update | grep "chnroute_update")" ] && chnroute_update=1 - [ -n "$(echo $update | grep "Pcap_Routing_update")" ] && Pcap_Routing_update=1 - [ -n "$(echo $update | grep "Pcap_WhiteList_update")" ] && Pcap_WhiteList_update=1 -else - gfwlist_update=`uci get $CONFIG.@global_rules[0].gfwlist_update` - chnroute_update=`uci get $CONFIG.@global_rules[0].chnroute_update` - Pcap_Routing_update=`uci get $CONFIG.@global_rules[0].Pcap_Routing_update` - Pcap_WhiteList_update=`uci get $CONFIG.@global_rules[0].Pcap_WhiteList_update` -fi - -if [ "$gfwlist_update" == 0 -a "$chnroute_update" == 0 -a "$Pcap_Routing_update" == 0 -a "$Pcap_WhiteList_update" == 0 ];then - exit -fi - -uci_get_by_type() { - local index=0 - if [ -n $4 ]; then - index=$4 - fi - local ret=$(uci get $CONFIG.@$1[$index].$2 2>/dev/null) - echo ${ret:=$3} -} - -# detect ss version -#ss_basic_version_web1=`curl -s https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/shadowsocks/version | sed -n 1p` - -# rule update -echo $Date: 开始更新规则，请等待... > $LOG_FILE -#wget -q --no-check-certificate --timeout=15 https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/version1 -O /tmp/version1 -#旧接口https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/version1 -status1=`curl -w %{http_code} --connect-timeout 10 $url_main/version1 --silent -o /tmp/version1` -if [ -z "$status1" ] || [ "$status1" == "404" ];then - echo $Date: 无法访问更新接口，请更新接口！ >> $LOG_FILE - exit -fi -online_content=$(cat /tmp/version1 2>/dev/null) -if [ -z "$online_content" ];then - rm -rf /tmp/version1 - echo $Date: 没有检测到在线版本，可能是访问github有问题，去大陆白名单模式试试吧！ >> $LOG_FILE - exit -fi - -# update gfwlist -if [ "$gfwlist_update" == 1 ];then - gfwlist=$(cat /tmp/version1 | sed -n 1p) - version_gfwlist2=$(echo $gfwlist | sed 's/ /\n/g'| sed -n 1p) - md5sum_gfwlist2=$(echo $gfwlist | sed 's/ /\n/g'| tail -n 2 | head -n 1) - local_md5sum_gfwlist=`md5sum $DNSMASQ_PATH/gfwlist.conf |awk '{print $1}'` - if [ ! -z "$version_gfwlist2" ];then - version_gfwlist1=$(uci_get_by_type global_rules gfwlist_version) - if [ "$version_gfwlist1" != "$version_gfwlist2" -o "$md5sum_gfwlist2" != "$local_md5sum_gfwlist" ];then - echo $Date: 检测到新版本gfwlist，开始更新... >> $LOG_FILE - echo $Date: 下载gfwlist到临时文件... >> $LOG_FILE - #wget --no-check-certificate --timeout=15 -q https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/gfwlist.conf -O /tmp/gfwlist.conf - #旧接口https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/gfwlist.conf - status2=`curl -w %{http_code} --connect-timeout 10 $url_main/gfwlist.conf --silent -o /tmp/gfwlist.conf` - if [ -z "$status2" ] || [ "$status2" == "404" ];then - echo $Date: 无法访问更新接口，请更新接口！ >> $LOG_FILE - exit - fi - md5sum_gfwlist1=$(md5sum /tmp/gfwlist.conf | sed 's/ /\n/g'| sed -n 1p) - if [ "$md5sum_gfwlist1"x = "$md5sum_gfwlist2"x ];then - echo $Date: 下载完成，校验通过，将临时文件覆盖到原始gfwlist文件 >> $LOG_FILE - mv /tmp/gfwlist.conf $DNSMASQ_PATH/gfwlist.conf - uci set $CONFIG.@global_rules[0].gfwlist_version=$version_gfwlist2 - rm -rf /tmp/dnsmasq.d/gfwlist.conf - reboot="1" - echo $Date: 你的gfwlist已经更新到最新了哦~ >> $LOG_FILE - else - echo $Date: 下载完成，但是校验没有通过！ >> $LOG_FILE - fi - else - echo $Date: 检测到gfwlist本地版本号和在线版本号相同，不用更新! >> $LOG_FILE - fi - else - echo $Date: gfwlist文件下载失败！ >> $LOG_FILE - fi - rm -rf /tmp/gfwlist.conf -fi - - -# update chnroute -if [ "$chnroute_update" == 1 ];then - chnroute=$(cat /tmp/version1 | sed -n 2p) - version_chnroute2=$(echo $chnroute | sed 's/ /\n/g'| sed -n 1p) - md5sum_chnroute2=$(echo $chnroute | sed 's/ /\n/g'| tail -n 2 | head -n 1) - local_md5sum_chnroute=`md5sum $RULE_PATH/chnroute |awk '{print $1}'` - if [ ! -z "$version_chnroute2" ];then - version_chnroute1=$(uci_get_by_type global_rules chnroute_version) - if [ "$version_chnroute1" != "$version_chnroute2" -o "$md5sum_chnroute2" != "$local_md5sum_chnroute" ];then - echo $Date: 检测到新版本chnroute，开始更新... >> $LOG_FILE - echo $Date: 下载chnroute到临时文件... >> $LOG_FILE - #wget --no-check-certificate --timeout=15 -q https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/chnroute.txt -O /tmp/chnroute - #旧接口https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/chnroute.txt - status3=`curl -w %{http_code} --connect-timeout 10 $url_main/chnroute.txt --silent -o /tmp/chnroute` - if [ -z "$status3" ] || [ "$status3" == "404" ];then - echo $Date: 无法访问更新接口，请更新接口！ >> $LOG_FILE - exit - fi - md5sum_chnroute1=$(md5sum /tmp/chnroute | sed 's/ /\n/g'| sed -n 1p) - if [ "$md5sum_chnroute1"x = "$md5sum_chnroute2"x ];then - echo $Date: 下载完成，校验通过，将临时文件覆盖到原始chnroute文件 >> $LOG_FILE - mv /tmp/chnroute $RULE_PATH/chnroute - uci set $CONFIG.@global_rules[0].chnroute_version=$version_chnroute2 - ipset flush chnroute - ipset destroy chnroute - reboot="1" - echo $Date: 你的chnroute已经更新到最新了哦~ >> $LOG_FILE - else - echo $Date: 下载完成，但是校验没有通过！ >> $LOG_FILE - fi - else - echo $Date: 检测到chnroute本地版本号和在线版本号相同，不用更新! >> $LOG_FILE - fi - else - echo $Date: chnroute文件下载失败！ >> $LOG_FILE - fi - rm -rf /tmp/chnroute -fi - -# update Routing -if [ "$Pcap_Routing_update" == 1 ];then - Routing=$(cat /tmp/version1 | sed -n 5p) - version_Routing2=$(echo $Routing | sed 's/ /\n/g'| sed -n 1p) - md5sum_Routing2=$(echo $Routing | sed 's/ /\n/g'| tail -n 2 | head -n 1) - local_md5sum_Routing=`md5sum /etc/pcap-dnsproxy/Routing.txt |awk '{print $1}'` - if [ ! -z "$version_Routing2" ];then - version_Routing1=$(uci_get_by_type global_rules pcap_Routing_version) - if [ "$version_Routing1" != "$version_Routing2" -o "$md5sum_Routing2" != "$local_md5sum_Routing" ];then - echo $Date: 检测到新版本Routing，开始更新... >> $LOG_FILE - echo $Date: 下载Routing到临时文件... >> $LOG_FILE - status4=`curl -w %{http_code} --connect-timeout 10 $url_main/Routing.txt --silent -o /tmp/Routing.txt` - if [ -z "$status4" ] || [ "$status4" == "404" ];then - echo $Date: 无法访问更新接口，请更新接口！ >> $LOG_FILE - exit - fi - md5sum_Routing1=$(md5sum /tmp/Routing.txt | sed 's/ /\n/g'| sed -n 1p) - if [ "$md5sum_Routing1"x = "$md5sum_Routing2"x ];then - echo $Date: 下载完成，校验通过，将临时文件覆盖到原始Routing文件 >> $LOG_FILE - mkdir -p /etc/pcap-dnsproxy - mv /tmp/Routing.txt /etc/pcap-dnsproxy/Routing.txt - uci set $CONFIG.@global_rules[0].pcap_Routing_version=$version_Routing2 - reboot="1" - echo $Date: 你的Routing已经更新到最新了哦~ >> $LOG_FILE - else - echo $Date: 下载完成，但是校验没有通过！ >> $LOG_FILE - fi - else - echo $Date: 检测到Routing本地版本号和在线版本号相同，不用更新! >> $LOG_FILE - fi - else - echo $Date: Routing文件下载失败！ >> $LOG_FILE - fi - rm -rf /tmp/Routing.txt -fi - -# update WhiteList -if [ "$Pcap_WhiteList_update" == 1 ];then - WhiteList=$(cat /tmp/version1 | sed -n 7p) - version_WhiteList2=$(echo $WhiteList | sed 's/ /\n/g'| sed -n 1p) - md5sum_WhiteList2=$(echo $WhiteList | sed 's/ /\n/g'| tail -n 2 | head -n 1) - local_md5sum_WhiteList=`md5sum /etc/pcap-dnsproxy/WhiteList.txt |awk '{print $1}'` - if [ ! -z "$version_WhiteList2" ];then - version_WhiteList1=$(uci_get_by_type global_rules pcap_WhiteList_version) - if [ "$version_WhiteList1" != "$version_WhiteList2" -o "$md5sum_WhiteList2" != "$local_md5sum_WhiteList" ];then - echo $Date: 检测到新版本WhiteList，开始更新... >> $LOG_FILE - echo $Date: 下载WhiteList到临时文件... >> $LOG_FILE - status4=`curl -w %{http_code} --connect-timeout 10 $url_main/WhiteList_new.txt --silent -o /tmp/WhiteList.txt` - if [ -z "$status4" ] || [ "$status4" == "404" ];then - echo $Date: 无法访问更新接口，请更新接口！ >> $LOG_FILE - exit - fi - #wget --no-check-certificate --timeout=10 -qO - $url_main/WhiteList_new.txt > /tmp/WhiteList.txt - md5sum_WhiteList1=$(md5sum /tmp/WhiteList.txt | sed 's/ /\n/g'| sed -n 1p) - if [ "$md5sum_WhiteList1"x = "$md5sum_WhiteList2"x ];then - echo $Date: 下载完成，校验通过，将临时文件覆盖到原始WhiteList文件 >> $LOG_FILE - mkdir -p /etc/pcap-dnsproxy - mv /tmp/WhiteList.txt /etc/pcap-dnsproxy/WhiteList.txt - uci set $CONFIG.@global_rules[0].pcap_WhiteList_version=$version_WhiteList2 - reboot="1" - echo $Date: 你的WhiteList已经更新到最新了哦~ >> $LOG_FILE - else - echo $Date: 下载完成，但是校验没有通过！ >> $LOG_FILE - fi - else - echo $Date: 检测到WhiteList本地版本号和在线版本号相同，不用更新! >> $LOG_FILE - fi - else - echo $Date: WhiteList文件下载失败！ >> $LOG_FILE - fi - rm -rf /tmp/WhiteList.txt -fi - -echo $Date: 更新进程运行完毕！ >> $LOG_FILE -rm -rf /tmp/version1 -# write number -uci set $CONFIG.@global_rules[0].gfwlist_update=$gfwlist_update -uci set $CONFIG.@global_rules[0].chnroute_update=$chnroute_update -uci set $CONFIG.@global_rules[0].Pcap_Routing_update=$Pcap_Routing_update -uci set $CONFIG.@global_rules[0].Pcap_WhiteList_update=$Pcap_WhiteList_update -uci commit -# reboot ss -if [ "$reboot" == "1" ];then -echo $Date: 重启软件，以应用新的规则文件！请稍后！ >> $LOG_FILE -/etc/init.d/$CONFIG restart -fi -exit diff --git a/package/Lienol/brook/Makefile b/package/lienol/brook/Makefile similarity index 100% rename from package/Lienol/brook/Makefile rename to package/lienol/brook/Makefile diff --git a/package/Lienol/dns-forwarder/Makefile b/package/lienol/dns-forwarder/Makefile similarity index 100% rename from package/Lienol/dns-forwarder/Makefile rename to package/lienol/dns-forwarder/Makefile diff --git a/package/Lienol/dns-forwarder/files/dns-forwarder.config b/package/lienol/dns-forwarder/files/dns-forwarder.config similarity index 100% rename from package/Lienol/dns-forwarder/files/dns-forwarder.config rename to package/lienol/dns-forwarder/files/dns-forwarder.config diff --git a/package/Lienol/dns-forwarder/files/dns-forwarder.init b/package/lienol/dns-forwarder/files/dns-forwarder.init similarity index 100% rename from package/Lienol/dns-forwarder/files/dns-forwarder.init rename to package/lienol/dns-forwarder/files/dns-forwarder.init diff --git a/package/Lienol/dns2socks/Makefile b/package/lienol/dns2socks/Makefile similarity index 100% rename from package/Lienol/dns2socks/Makefile rename to package/lienol/dns2socks/Makefile diff --git a/package/Lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile similarity index 99% rename from package/Lienol/luci-app-passwall/Makefile rename to package/lienol/luci-app-passwall/Makefile index ec79ad5207..d6c76f2694 100644 --- a/package/Lienol/luci-app-passwall/Makefile +++ b/package/lienol/luci-app-passwall/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=2.0 -PKG_RELEASE:=80-20190824 +PKG_RELEASE:=86-20191024 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PO2LMO:=./po2lmo diff --git a/package/Lienol/luci-app-passwall/luasrc/controller/passwall.lua b/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua similarity index 98% rename from package/Lienol/luci-app-passwall/luasrc/controller/passwall.lua rename to package/lienol/luci-app-passwall/luasrc/controller/passwall.lua index 3e8b01fd9f..53bc0d48a8 100644 --- a/package/Lienol/luci-app-passwall/luasrc/controller/passwall.lua +++ b/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua @@ -107,10 +107,10 @@ end function get_log() -- luci.sys.exec("[ -f /var/log/passwall.log ] && sed '1!G;h;$!d' /var/log/passwall.log > /var/log/passwall_show.log") - luci.http.write(luci.sys.exec("cat /var/log/passwall.log")) + luci.http.write(luci.sys.exec("[ -f '/var/log/passwall.log' ] && cat /var/log/passwall.log")) end -function clear_log() luci.sys.call("rm -rf > /var/log/passwall.log") end +function clear_log() luci.sys.call("echo '' > /var/log/passwall.log") end function server_status() local tcp_redir_port = luci.sys.exec( 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/acl.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/acl.lua 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray_client_config_file.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray_client_config_file.lua 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/global.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/global.lua diff --git a/package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/log.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/log.lua similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/log.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/log.lua 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/other.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/other.lua 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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua diff --git a/package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/rulelist.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rulelist.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/rulelist.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 similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/server_list.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server_list.lua diff --git a/package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/serverconfig.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/serverconfig.lua similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/model/cbi/passwall/serverconfig.lua rename to package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/serverconfig.lua 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 similarity index 83% rename from package/Lienol/luci-app-passwall/luasrc/view/passwall/global/status.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/global/status.htm index df99204f5c..bd8bc64533 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 @@ -14,7 +14,47 @@ local function has_udp_relay() end -%> -
+ + +
<%:Running Status%> @@ -97,8 +137,8 @@ end
- +
@@ -148,16 +188,18 @@ end var s = document.getElementById('_' + type + '_status'); if(s) { if(rv.status) { - s.setAttribute("color","green"); - s.innerHTML = '<%:Working...%> ✓'; + //s.setAttribute("color","green"); + btn.setAttribute("style","background-color: green !important; border-color: green !important;"); + btn.value = '<%:Working...%> ✓'; } else { - s.setAttribute("color","red"); - s.innerHTML = '<%:Problem detected!%> X'; + //s.setAttribute("color","red"); + btn.setAttribute("style","background-color:red !important; border-color: red !important;"); + btn.value = '<%:Problem detected!%> X'; } } btn.disabled = false; - btn.value = '<%:Check%>'; + //btn.value = '<%:Check%>'; } ); return false; diff --git a/package/Lienol/luci-app-passwall/luasrc/view/passwall/log/log.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/log/log.htm similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/view/passwall/log/log.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/log/log.htm 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 similarity index 97% rename from package/Lienol/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm index 6f1442d079..006e2f9b69 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,6 +1,6 @@ <% local brook_path = luci.sys.exec("echo -n `uci get passwall.@global_app[0].brook_client_file`") -local brook_version = luci.sys.exec(brook_path.." -v | awk '{print $3}'") +local brook_version = luci.sys.exec("[ -f '" .. brook_path .. "' ] && " .. brook_path .. " -v | awk '{print $3}'") local dsp = require "luci.dispatcher" -%> diff --git a/package/Lienol/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm similarity index 97% rename from package/Lienol/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm index 329f6ff1ad..4979b85c7f 100644 --- a/package/Lienol/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm @@ -1,6 +1,6 @@ <% local kcptun_path = luci.sys.exec("echo -n `uci get passwall.@global_app[0].kcptun_client_file`") -local kcptun_version = luci.sys.exec(kcptun_path.." -v | awk '{print $3}'") +local kcptun_version = luci.sys.exec("[ -f '" .. kcptun_path .. "' ] && " .. kcptun_path .. " -v | awk '{print $3}'") local dsp = require "luci.dispatcher" -%> diff --git a/package/Lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm diff --git a/package/Lienol/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm similarity index 96% rename from package/Lienol/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm index c9a1287048..f60b24469f 100644 --- a/package/Lienol/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm @@ -1,6 +1,6 @@ <% local V2ray_path = luci.sys.exec("echo -n `uci get passwall.@global_app[0].v2ray_client_file`") -local V2ray_version = luci.sys.exec(V2ray_path.."/v2ray -version | awk '{print $2}' | sed -n 1P") +local V2ray_version = luci.sys.exec("[ -f '" .. V2ray_path .. "/v2ray' ] && " .. V2ray_path .. "/v2ray -version | awk '{print $2}' | sed -n 1P") local dsp = require "luci.dispatcher" -%> diff --git a/package/Lienol/luci-app-passwall/luasrc/view/passwall/server_list/apply.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/apply.htm similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/view/passwall/server_list/apply.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/apply.htm 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/server_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/server_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/server_list/link_add_server.htm similarity index 100% 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/server_list/link_add_server.htm diff --git a/package/Lienol/luci-app-passwall/luasrc/view/passwall/server_list/ping.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/ping.htm similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/view/passwall/server_list/ping.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/ping.htm diff --git a/package/Lienol/luci-app-passwall/luasrc/view/passwall/server_list/server_list.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/server_list.htm similarity index 100% rename from package/Lienol/luci-app-passwall/luasrc/view/passwall/server_list/server_list.htm rename to package/lienol/luci-app-passwall/luasrc/view/passwall/server_list/server_list.htm diff --git a/package/Lienol/luci-app-passwall/po/zh-cn/passwall.po b/package/lienol/luci-app-passwall/po/zh-cn/passwall.po similarity index 100% rename from package/Lienol/luci-app-passwall/po/zh-cn/passwall.po rename to package/lienol/luci-app-passwall/po/zh-cn/passwall.po diff --git a/package/Lienol/luci-app-passwall/po2lmo b/package/lienol/luci-app-passwall/po2lmo old mode 100755 new mode 100644 similarity index 100% rename from package/Lienol/luci-app-passwall/po2lmo rename to package/lienol/luci-app-passwall/po2lmo diff --git a/package/Lienol/luci-app-passwall/root/etc/config/passwall b/package/lienol/luci-app-passwall/root/etc/config/passwall similarity index 90% rename from package/Lienol/luci-app-passwall/root/etc/config/passwall rename to package/lienol/luci-app-passwall/root/etc/config/passwall index 9aca057383..bc1b020910 100644 --- a/package/Lienol/luci-app-passwall/root/etc/config/passwall +++ b/package/lienol/luci-app-passwall/root/etc/config/passwall @@ -45,11 +45,11 @@ config global_other config global_rules option gfwlist_update '1' option chnroute_update '1' - option Pcap_Routing_update '1' - option Pcap_WhiteList_update '1' + option Pcap_Routing_update '0' + option Pcap_WhiteList_update '0' option auto_update '0' - option gfwlist_version '2019-08-14' - option chnroute_version '2019-08-14' + option gfwlist_version '2019-10-18' + option chnroute_version '2019-10-18' config global_app option v2ray_client_file '/usr/bin/v2ray/' diff --git a/package/Lienol/luci-app-passwall/root/etc/config/passwall_show b/package/lienol/luci-app-passwall/root/etc/config/passwall_show similarity index 100% rename from package/Lienol/luci-app-passwall/root/etc/config/passwall_show rename to package/lienol/luci-app-passwall/root/etc/config/passwall_show diff --git a/package/Lienol/luci-app-passwall/root/etc/init.d/passwall b/package/lienol/luci-app-passwall/root/etc/init.d/passwall old mode 100755 new mode 100644 similarity index 100% rename from package/Lienol/luci-app-passwall/root/etc/init.d/passwall rename to package/lienol/luci-app-passwall/root/etc/init.d/passwall diff --git a/package/Lienol/luci-app-passwall/root/etc/uci-defaults/luci-app-passwall b/package/lienol/luci-app-passwall/root/etc/uci-defaults/luci-app-passwall old mode 100755 new mode 100644 similarity index 100% rename from package/Lienol/luci-app-passwall/root/etc/uci-defaults/luci-app-passwall rename to package/lienol/luci-app-passwall/root/etc/uci-defaults/luci-app-passwall 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 old mode 100755 new mode 100644 similarity index 59% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/app.sh rename to package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh index 5d6b7b29fc..54fc3a9a6d --- a/package/Lienol/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh @@ -20,18 +20,17 @@ TMP_DNSMASQ_PATH=/var/etc/dnsmasq-passwall.d DNSMASQ_PATH=/etc/dnsmasq.d lanip=$(uci get network.lan.ipaddr) -get_date(){ +get_date() { echo "$(date "+%Y-%m-%d %H:%M:%S")" } -echolog() -{ - echo -e "$(get_date): $1" >> $LOG_FILE +echolog() { + echo -e "$(get_date): $1" >>$LOG_FILE } -find_bin(){ +find_bin() { bin_name=$1 - result=`find /usr/*bin -iname "$bin_name" -type f` + result=$(find /usr/*bin -iname "$bin_name" -type f) if [ -z "$result" ]; then echo "" echolog "找不到$bin_name主程序，无法启动！" @@ -59,55 +58,55 @@ get_host_ip() { isip="" ip=$host if [ "$network_type" == "ipv6" ]; then - isip=`echo $host | grep -E "([[a-f0-9]{1,4}(:[a-f0-9]{1,4}){7}|[a-f0-9]{1,4}(:[a-f0-9]{1,4}){0,7}::[a-f0-9]{0,4}(:[a-f0-9]{1,4}){0,7}])"` - if [ -n "$isip" ];then - isip=`echo $host | cut -d '[' -f2 | cut -d ']' -f1` + isip=$(echo $host | grep -E "([[a-f0-9]{1,4}(:[a-f0-9]{1,4}){7}|[a-f0-9]{1,4}(:[a-f0-9]{1,4}){0,7}::[a-f0-9]{0,4}(:[a-f0-9]{1,4}){0,7}])") + if [ -n "$isip" ]; then + isip=$(echo $host | cut -d '[' -f2 | cut -d ']' -f1) else - isip=`echo $host | grep -E "([a-f0-9]{1,4}(:[a-f0-9]{1,4}){7}|[a-f0-9]{1,4}(:[a-f0-9]{1,4}){0,7}::[a-f0-9]{0,4}(:[a-f0-9]{1,4}){0,7})"` + isip=$(echo $host | grep -E "([a-f0-9]{1,4}(:[a-f0-9]{1,4}){7}|[a-f0-9]{1,4}(:[a-f0-9]{1,4}){0,7}::[a-f0-9]{0,4}(:[a-f0-9]{1,4}){0,7})") fi else - isip=`echo $host|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}"` + isip=$(echo $host | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}") fi - if [ -z "$isip" ];then + if [ -z "$isip" ]; then vpsrip="" - if [ "$use_ipv6" == "1" ];then - vpsrip=`resolveip -6 -t 2 $host|awk 'NR==1{print}'` - [ -z "$vpsrip" ] && vpsrip=`dig @208.67.222.222 $host AAAA 2>/dev/null |grep 'IN'|awk -F ' ' '{print $5}'|grep -E "([a-f0-9]{1,4}(:[a-f0-9]{1,4}){7}|[a-f0-9]{1,4}(:[a-f0-9]{1,4}){0,7}::[a-f0-9]{0,4}(:[a-f0-9]{1,4}){0,7})"|head -n1` + if [ "$use_ipv6" == "1" ]; then + vpsrip=$(resolveip -6 -t 2 $host | awk 'NR==1{print}') + [ -z "$vpsrip" ] && vpsrip=$(dig @208.67.222.222 $host AAAA 2>/dev/null | grep 'IN' | awk -F ' ' '{print $5}' | grep -E "([a-f0-9]{1,4}(:[a-f0-9]{1,4}){7}|[a-f0-9]{1,4}(:[a-f0-9]{1,4}){0,7}::[a-f0-9]{0,4}(:[a-f0-9]{1,4}){0,7})" | head -n1) else - vpsrip=`resolveip -4 -t 2 $host|awk 'NR==1{print}'` - [ -z "$vpsrip" ] && vpsrip=`dig @208.67.222.222 $host 2>/dev/null |grep 'IN'|awk -F ' ' '{print $5}'|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}"|head -n1` + vpsrip=$(resolveip -4 -t 2 $host | awk 'NR==1{print}') + [ -z "$vpsrip" ] && vpsrip=$(dig @208.67.222.222 $host 2>/dev/null | grep 'IN' | awk -F ' ' '{print $5}' | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}" | head -n1) fi ip=$vpsrip fi echo $ip } -check_port_exists(){ +check_port_exists() { port=$1 protocol=$2 result= - if [ "$protocol" = "tcp" ];then - result=`netstat -tlpn | grep "\<$port\>"` - elif [ "$protocol" = "udp" ];then - result=`netstat -ulpn | grep "\<$port\>"` + if [ "$protocol" = "tcp" ]; then + result=$(netstat -tlpn | grep "\<$port\>") + elif [ "$protocol" = "udp" ]; then + result=$(netstat -ulpn | grep "\<$port\>") fi - if [ -n "$result" ];then + if [ -n "$result" ]; then echo 1 else echo 0 fi } -get_not_exists_port_after(){ +get_not_exists_port_after() { port=$1 protocol=$2 result=$(check_port_exists $port $protocol) - if [ "$result" = 1 ];then + if [ "$result" = 1 ]; then temp= - if [ "$port" -lt 65535 ];then - temp=`expr $port + 1` - elif [ "$port" -gt 1 ];then - temp=`expr $port - 1` + if [ "$port" -lt 65535 ]; then + temp=$(expr $port + 1) + elif [ "$port" -gt 1 ]; then + temp=$(expr $port - 1) fi get_not_exists_port_after $temp $protocol else @@ -127,21 +126,18 @@ UDP_REDIR_SERVER3= TCP_REDIR_SERVER_NUM=$(config_t_get global_other tcp_redir_server_num 1) UDP_REDIR_SERVER_NUM=$(config_t_get global_other udp_redir_server_num 1) -if [ "$TCP_REDIR_SERVER_NUM" -ge 2 ] ;then - for i in $(seq 2 $TCP_REDIR_SERVER_NUM) - do +if [ "$TCP_REDIR_SERVER_NUM" -ge 2 ]; then + for i in $(seq 2 $TCP_REDIR_SERVER_NUM); do eval TCP_REDIR_SERVER$i=$(config_t_get global tcp_redir_server$i nil) done fi -if [ "$UDP_REDIR_SERVER_NUM" -ge 2 ] ;then - for i in $(seq 2 $UDP_REDIR_SERVER_NUM) - do +if [ "$UDP_REDIR_SERVER_NUM" -ge 2 ]; then + for i in $(seq 2 $UDP_REDIR_SERVER_NUM); do eval UDP_REDIR_SERVER$i=$(config_t_get global udp_redir_server$i nil) done fi - TCP_REDIR_SERVER_IP="" UDP_REDIR_SERVER_IP="" SOCKS5_PROXY_SERVER_IP="" @@ -166,13 +162,13 @@ PROXY_MODE=$(config_t_get global proxy_mode gfwlist) load_config() { [ "$TCP_REDIR_SERVER" == "nil" -a "$UDP_REDIR_SERVER" == "nil" -a "$SOCKS5_PROXY_SERVER" == "nil" ] && { - echolog "没有选择服务器！" + echolog "没有选择服务器！" return 1 } DNS_MODE=$(config_t_get global dns_mode ChinaDNS) UP_CHINADNS_MODE=$(config_t_get global up_chinadns_mode OpenDNS_1) process=1 - if [ "$(config_t_get global_forwarding process 0)" = "0" ] ;then + if [ "$(config_t_get global_forwarding process 0)" = "0" ]; then process=$(cat /proc/cpuinfo | grep 'processor' | wc -l) else process=$(config_t_get global_forwarding process) @@ -194,19 +190,19 @@ load_config() { mkdir -p /var/etc $CONFIG_PATH $RUN_PID_PATH config_load $CONFIG [ "$TCP_REDIR_SERVER" != "nil" ] && { - TCP_REDIR_SERVER_TYPE=`echo $(config_get $TCP_REDIR_SERVER server_type) | tr 'A-Z' 'a-z'` + TCP_REDIR_SERVER_TYPE=$(echo $(config_get $TCP_REDIR_SERVER server_type) | tr 'A-Z' 'a-z') gen_config_file $TCP_REDIR_SERVER $TCP_REDIR_PORT TCP $CONFIG_TCP_FILE - echo "$TCP_REDIR_SERVER" > $CONFIG_PATH/tcp_server_id + echo "$TCP_REDIR_SERVER" >$CONFIG_PATH/tcp_server_id } [ "$UDP_REDIR_SERVER" != "nil" ] && { - UDP_REDIR_SERVER_TYPE=`echo $(config_get $UDP_REDIR_SERVER server_type) | tr 'A-Z' 'a-z'` + UDP_REDIR_SERVER_TYPE=$(echo $(config_get $UDP_REDIR_SERVER server_type) | tr 'A-Z' 'a-z') gen_config_file $UDP_REDIR_SERVER $UDP_REDIR_PORT UDP $CONFIG_UDP_FILE - echo "$UDP_REDIR_SERVER" > $CONFIG_PATH/udp_server_id + echo "$UDP_REDIR_SERVER" >$CONFIG_PATH/udp_server_id } [ "$SOCKS5_PROXY_SERVER" != "nil" ] && { - SOCKS5_PROXY_SERVER_TYPE=`echo $(config_get $SOCKS5_PROXY_SERVER server_type) | tr 'A-Z' 'a-z'` + SOCKS5_PROXY_SERVER_TYPE=$(echo $(config_get $SOCKS5_PROXY_SERVER server_type) | tr 'A-Z' 'a-z') gen_config_file $SOCKS5_PROXY_SERVER $SOCKS5_PROXY_PORT Socks5 $CONFIG_SOCKS5_FILE - echo "$SOCKS5_PROXY_SERVER" > $CONFIG_PATH/socks5_server_id + echo "$SOCKS5_PROXY_SERVER" >$CONFIG_PATH/socks5_server_id } return 0 @@ -229,27 +225,27 @@ gen_ss_ssr_config_file() { server_port=$KCPTUN_REDIR_PORT } cat <<-EOF >$configfile - { - "server": "$server_host", - "_comment": "$server_ip", - "server_port": $server_port, - "local_address": "0.0.0.0", - "local_port": $local_port, - "password": "$(config_get $server password)", - "timeout": $(config_get $server timeout), - "method": "$encrypt_method", - "fast_open": $(config_get $server fast_open), - "reuse_port": true, + { + "server": "$server_host", + "_comment": "$server_ip", + "server_port": $server_port, + "local_address": "0.0.0.0", + "local_port": $local_port, + "password": "$(config_get $server password)", + "timeout": $(config_get $server timeout), + "method": "$encrypt_method", + "fast_open": $(config_get $server fast_open), + "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_get $server protocol)", + "protocol_param": "$(config_get $server protocol_param)", + "obfs": "$(config_get $server obfs)", + "obfs_param": "$(config_get $server obfs_param)" EOF } - echo -e "}" >> $configfile + echo -e "}" >>$configfile } gen_config_file() { @@ -264,11 +260,11 @@ gen_config_file() { [ "$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'` + server_type=$(echo $(config_get $server server_type) | tr 'A-Z' 'a-z') echolog "$redir_type服务器IP地址:$server_ip" - + if [ "$redir_type" == "Socks5" ]; then - if [ "$network_type" == "ipv6" ];then + if [ "$network_type" == "ipv6" ]; then SOCKS5_PROXY_SERVER_IPV6=$server_ip else SOCKS5_PROXY_SERVER_IP=$server_ip @@ -278,15 +274,15 @@ gen_config_file() { gen_ss_ssr_config_file $server_type $local_port 0 $server $config_file_path fi if [ "$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 + lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_v2ray_client_config_file.lua $server nil nil $local_port >$config_file_path fi if [ "$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)" fi fi - + if [ "$redir_type" == "UDP" ]; then - if [ "$network_type" == "ipv6" ];then + if [ "$network_type" == "ipv6" ]; then UDP_REDIR_SERVER_IPV6=$server_ip else UDP_REDIR_SERVER_IP=$server_ip @@ -296,22 +292,22 @@ gen_config_file() { gen_ss_ssr_config_file $server_type $local_port 0 $server $config_file_path fi if [ "$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 + lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_v2ray_client_config_file.lua $server udp $local_port nil >$config_file_path fi if [ "$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)" fi fi - + if [ "$redir_type" == "TCP" ]; then - if [ "$network_type" == "ipv6" ];then + if [ "$network_type" == "ipv6" ]; then TCP_REDIR_SERVER_IPV6=$server_ip else TCP_REDIR_SERVER_IP=$server_ip fi TCP_REDIR_SERVER_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 + lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_v2ray_client_config_file.lua $server tcp $local_port nil >$config_file_path else local kcptun_use kcptun_server_host kcptun_port kcptun_config kcptun_use=$(config_get $server use_kcp) @@ -323,24 +319,24 @@ gen_config_file() { if [ "$kcptun_use" == "1" ] && ([ -z "$kcptun_port" ] || [ -z "$kcptun_config" ]); then echolog "【检测到启用KCP，但未配置KCP参数】，跳过~" fi - if [ "$kcptun_use" == "1" -a -n "$kcptun_port" -a -n "$kcptun_config" -a "$lbenabled" == "1" ];then + if [ "$kcptun_use" == "1" -a -n "$kcptun_port" -a -n "$kcptun_config" -a "$lbenabled" == "1" ]; then echolog "【检测到启用KCP，但KCP与负载均衡二者不能同时开启】，跳过~" fi - - if [ "$kcptun_use" == "1" ];then - if [ -f "$(config_t_get global_kcptun kcptun_client_file)" ];then + + if [ "$kcptun_use" == "1" ]; then + if [ -f "$(config_t_get global_kcptun kcptun_client_file)" ]; then kcptun_path=$(config_t_get global_kcptun kcptun_client_file) else temp=$(find_bin kcptun_client) [ -n "$temp" ] && kcptun_path=$temp fi fi - - if [ "$kcptun_use" == "1" -a -z "$kcptun_path" ] && ([ -n "$kcptun_port" ] || [ -n "$kcptun_config" ]);then + + if [ "$kcptun_use" == "1" -a -z "$kcptun_path" ] && ([ -n "$kcptun_port" ] || [ -n "$kcptun_config" ]); then echolog "【检测到启用KCP，但未安装KCP主程序，请自行到自动更新下载KCP】，跳过~" fi - - if [ "$kcptun_use" == "1" -a -n "$kcptun_port" -a -n "$kcptun_config" -a "$lbenabled" == "0" -a -n "$kcptun_path" ];then + + if [ "$kcptun_use" == "1" -a -n "$kcptun_port" -a -n "$kcptun_config" -a "$lbenabled" == "0" -a -n "$kcptun_path" ]; then if [ -z "$kcptun_server_host" ]; then start_kcptun "$kcptun_path" $server_ip $kcptun_port "$kcptun_config" else @@ -352,7 +348,7 @@ gen_config_file() { TCP_REDIR_SERVER_IP=$kcptun_server_ip start_kcptun "$kcptun_path" $kcptun_server_ip $kcptun_port "$kcptun_config" fi - echolog "运行Kcptun..." + 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 fi @@ -375,31 +371,30 @@ gen_config_file() { start_kcptun() { kcptun_bin=$1 if [ -z "$kcptun_bin" ]; then - echolog "找不到Kcptun客户端主程序，无法启用！！！" + echolog "找不到Kcptun客户端主程序，无法启用！！！" else $kcptun_bin --log $CONFIG_PATH/kcptun -l 0.0.0.0:$KCPTUN_REDIR_PORT -r $2:$3 $4 >/dev/null 2>&1 & fi } start_tcp_redir_other() { - if [ "$TCP_REDIR_SERVER_NUM" -ge 2 ] ;then - for i in $(seq 2 $TCP_REDIR_SERVER_NUM) - do + if [ "$TCP_REDIR_SERVER_NUM" -ge 2 ]; then + for i in $(seq 2 $TCP_REDIR_SERVER_NUM); do eval temp_server=\$TCP_REDIR_SERVER$i [ "$temp_server" != "nil" ] && { - TYPE=`echo $(config_get $temp_server server_type) | tr 'A-Z' 'a-z'` + TYPE=$(echo $(config_get $temp_server server_type) | tr 'A-Z' 'a-z') local config_file=$CONFIG_PATH/TCP$i.json - local port_temp=`expr $TCP_REDIR_PORT + 1 ` - local port=`echo $(get_not_exists_port_after $port_temp tcp)` + local port_temp=$(expr $TCP_REDIR_PORT + 1) + local port=$(echo $(get_not_exists_port_after $port_temp 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) - if [ -f "${v2ray_path}/v2ray" ];then - ${v2ray_path}/v2ray -config=$config_file > /dev/null & + if [ -f "${v2ray_path}/v2ray" ]; then + ${v2ray_path}/v2ray -config=$config_file >/dev/null & else v2ray_bin=$(find_bin V2ray) - [ -n "$v2ray_bin" ] && $v2ray_bin -config=$config_file > /dev/null & + [ -n "$v2ray_bin" ] && $v2ray_bin -config=$config_file >/dev/null & fi elif [ "$TYPE" == "brook" ]; then brook_bin=$(find_bin Brook) @@ -407,9 +402,8 @@ start_tcp_redir_other() { else ss_bin=$(find_bin "$TYPE"-redir) [ -n "$ss_bin" ] && { - for k in $(seq 1 $process) - do - $ss_bin -c $config_file -f $RUN_PID_PATH/tcp_${TYPE}_$k_$i > /dev/null 2>&1 & + for k in $(seq 1 $process); do + $ss_bin -c $config_file -f $RUN_PID_PATH/tcp_${TYPE}_$k_$i >/dev/null 2>&1 & done } fi @@ -419,24 +413,23 @@ start_tcp_redir_other() { } start_udp_redir_other() { - if [ "$UDP_REDIR_SERVER_NUM" -ge 2 ] ;then - for i in $(seq 2 $UDP_REDIR_SERVER_NUM) - do + if [ "$UDP_REDIR_SERVER_NUM" -ge 2 ]; then + for i in $(seq 2 $UDP_REDIR_SERVER_NUM); do eval temp_server=\$UDP_REDIR_SERVER$i [ "$temp_server" != "nil" ] && { - TYPE=`echo $(config_get $temp_server server_type) | tr 'A-Z' 'a-z'` + TYPE=$(echo $(config_get $temp_server server_type) | tr 'A-Z' 'a-z') local config_file=$CONFIG_PATH/UDP$i.json - local port_temp=`expr $TCP_REDIR_PORT + 1 ` - local port=`echo $(get_not_exists_port_after $port_temp udp)` + local port_temp=$(expr $TCP_REDIR_PORT + 1) + local port=$(echo $(get_not_exists_port_after $port_temp 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) - if [ -f "${v2ray_path}/v2ray" ];then - ${v2ray_path}/v2ray -config=$config_file > /dev/null & + if [ -f "${v2ray_path}/v2ray" ]; then + ${v2ray_path}/v2ray -config=$config_file >/dev/null & else v2ray_bin=$(find_bin V2ray) - [ -n "$v2ray_bin" ] && $v2ray_bin -config=$config_file > /dev/null & + [ -n "$v2ray_bin" ] && $v2ray_bin -config=$config_file >/dev/null & fi elif [ "$TYPE" == "brook" ]; then brook_bin=$(find_bin brook) @@ -444,7 +437,7 @@ start_udp_redir_other() { else ss_bin=$(find_bin "$TYPE"-redir) [ -n "$ss_bin" ] && { - $ss_bin -c $config_file -f $RUN_PID_PATH/udp_${TYPE}_1_$i -U > /dev/null 2>&1 & + $ss_bin -c $config_file -f $RUN_PID_PATH/udp_${TYPE}_1_$i -U >/dev/null 2>&1 & } fi } @@ -453,14 +446,14 @@ start_udp_redir_other() { } start_tcp_redir() { - if [ "$TCP_REDIR_SERVER" != "nil" ];then + if [ "$TCP_REDIR_SERVER" != "nil" ]; then if [ "$TCP_REDIR_SERVER_TYPE" == "v2ray" ]; then v2ray_path=$(config_t_get global_v2ray v2ray_client_file) - if [ -f "${v2ray_path}/v2ray" ];then - ${v2ray_path}/v2ray -config=$CONFIG_TCP_FILE > /dev/null & + if [ -f "${v2ray_path}/v2ray" ]; then + ${v2ray_path}/v2ray -config=$CONFIG_TCP_FILE >/dev/null & else v2ray_bin=$(find_bin V2ray) - [ -n "$v2ray_bin" ] && $v2ray_bin -config=$CONFIG_TCP_FILE > /dev/null & + [ -n "$v2ray_bin" ] && $v2ray_bin -config=$CONFIG_TCP_FILE >/dev/null & fi elif [ "$TCP_REDIR_SERVER_TYPE" == "brook" ]; then brook_bin=$(find_bin Brook) @@ -468,9 +461,8 @@ start_tcp_redir() { else ss_bin=$(find_bin "$TCP_REDIR_SERVER_TYPE"-redir) [ -n "$ss_bin" ] && { - for i in $(seq 1 $process) - do - $ss_bin -c $CONFIG_TCP_FILE -f $RUN_PID_PATH/tcp_${TCP_REDIR_SERVER_TYPE}_$i > /dev/null 2>&1 & + for i in $(seq 1 $process); do + $ss_bin -c $CONFIG_TCP_FILE -f $RUN_PID_PATH/tcp_${TCP_REDIR_SERVER_TYPE}_$i >/dev/null 2>&1 & done } fi @@ -478,14 +470,14 @@ start_tcp_redir() { } start_udp_redir() { - if [ "$UDP_REDIR_SERVER" != "nil" ];then + if [ "$UDP_REDIR_SERVER" != "nil" ]; then if [ "$UDP_REDIR_SERVER_TYPE" == "v2ray" ]; then v2ray_path=$(config_t_get global_v2ray v2ray_client_file) - if [ -f "${v2ray_path}/v2ray" ];then - ${v2ray_path}/v2ray -config=$CONFIG_UDP_FILE > /dev/null & + if [ -f "${v2ray_path}/v2ray" ]; then + ${v2ray_path}/v2ray -config=$CONFIG_UDP_FILE >/dev/null & else v2ray_bin=$(find_bin V2ray) - [ -n "$v2ray_bin" ] && $v2ray_bin -config=$CONFIG_UDP_FILE > /dev/null & + [ -n "$v2ray_bin" ] && $v2ray_bin -config=$CONFIG_UDP_FILE >/dev/null & fi elif [ "$UDP_REDIR_SERVER_TYPE" == "brook" ]; then brook_bin=$(find_bin brook) @@ -493,37 +485,37 @@ start_udp_redir() { else ss_bin=$(find_bin "$UDP_REDIR_SERVER_TYPE"-redir) [ -n "$ss_bin" ] && { - $ss_bin -c $CONFIG_UDP_FILE -f $RUN_PID_PATH/udp_${UDP_REDIR_SERVER_TYPE}_1 -U > /dev/null 2>&1 & + $ss_bin -c $CONFIG_UDP_FILE -f $RUN_PID_PATH/udp_${UDP_REDIR_SERVER_TYPE}_1 -U >/dev/null 2>&1 & } fi fi } start_socks5_proxy() { - if [ "$SOCKS5_PROXY_SERVER" != "nil" ];then + if [ "$SOCKS5_PROXY_SERVER" != "nil" ]; then if [ "$SOCKS5_PROXY_SERVER_TYPE" == "v2ray" ]; then v2ray_path=$(config_t_get global_v2ray v2ray_client_file) - if [ -f "${v2ray_path}/v2ray" ];then - ${v2ray_path}/v2ray -config=$CONFIG_SOCKS5_FILE > /dev/null & + if [ -f "${v2ray_path}/v2ray" ]; then + ${v2ray_path}/v2ray -config=$CONFIG_SOCKS5_FILE >/dev/null & else v2ray_bin=$(find_bin V2ray) - [ -n "$v2ray_bin" ] && $v2ray_bin -config=$CONFIG_SOCKS5_FILE > /dev/null & + [ -n "$v2ray_bin" ] && $v2ray_bin -config=$CONFIG_SOCKS5_FILE >/dev/null & fi elif [ "$SOCKS5_PROXY_SERVER_TYPE" == "brook" ]; then brook_bin=$(find_bin brook) [ -n "$brook_bin" ] && $brook_bin $BROOK_SOCKS5_CMD &>/dev/null & else ss_bin=$(find_bin "$SOCKS5_PROXY_SERVER_TYPE"-local) - [ -n "$ss_bin" ] && $ss_bin -c $CONFIG_SOCKS5_FILE -b 0.0.0.0 > /dev/null 2>&1 & + [ -n "$ss_bin" ] && $ss_bin -c $CONFIG_SOCKS5_FILE -b 0.0.0.0 >/dev/null 2>&1 & fi fi } clean_log() { logsnum=$(cat $LOG_FILE 2>/dev/null | wc -l) - if [ "$logsnum" -gt 300 ];then + if [ "$logsnum" -gt 300 ]; then rm -f $LOG_FILE >/dev/null 2>&1 & - echolog "日志文件过长，清空处理！" + echolog "日志文件过长，清空处理！" fi } @@ -534,25 +526,25 @@ set_cru() { autoupdatesubscribe=$(config_t_get global_subscribe auto_update_subscribe) weekupdatesubscribe=$(config_t_get global_subscribe week_update_subscribe) dayupdatesubscribe=$(config_t_get global_subscribe time_update_subscribe) - if [ "$autoupdate" = "1" ];then - if [ "$weekupdate" = "7" ];then - echo "0 $dayupdate * * * $APP_PATH/rule_update.sh" >> /etc/crontabs/root - echolog "设置自动更新规则在每天 $dayupdate 点。" + if [ "$autoupdate" = "1" ]; then + if [ "$weekupdate" = "7" ]; then + echo "0 $dayupdate * * * $APP_PATH/rule_update.sh" >>/etc/crontabs/root + echolog "设置自动更新规则在每天 $dayupdate 点。" else - echo "0 $dayupdate * * $weekupdate $APP_PATH/rule_update.sh" >> /etc/crontabs/root - echolog "设置自动更新规则在星期 $weekupdate 的 $dayupdate 点。" + echo "0 $dayupdate * * $weekupdate $APP_PATH/rule_update.sh" >>/etc/crontabs/root + echolog "设置自动更新规则在星期 $weekupdate 的 $dayupdate 点。" fi else sed -i '/rule_update.sh/d' /etc/crontabs/root >/dev/null 2>&1 & fi - if [ "$autoupdatesubscribe" = "1" ];then - if [ "$weekupdatesubscribe" = "7" ];then - echo "0 $dayupdatesubscribe * * * $APP_PATH/subscription.sh" >> /etc/crontabs/root - echolog "设置服务器订阅自动更新规则在每天 $dayupdatesubscribe 点。" + if [ "$autoupdatesubscribe" = "1" ]; then + if [ "$weekupdatesubscribe" = "7" ]; then + echo "0 $dayupdatesubscribe * * * $APP_PATH/subscription.sh" >>/etc/crontabs/root + echolog "设置服务器订阅自动更新规则在每天 $dayupdatesubscribe 点。" else - echo "0 $dayupdatesubscribe * * $weekupdate $APP_PATH/subscription.sh" >> /etc/crontabs/root - echolog "设置服务器订阅自动更新规则在星期 $weekupdate 的 $dayupdatesubscribe 点。" + echo "0 $dayupdatesubscribe * * $weekupdate $APP_PATH/subscription.sh" >>/etc/crontabs/root + echolog "设置服务器订阅自动更新规则在星期 $weekupdate 的 $dayupdatesubscribe 点。" fi else sed -i '/subscription.sh/d' /etc/crontabs/root >/dev/null 2>&1 & @@ -562,34 +554,34 @@ set_cru() { start_crontab() { sed -i '/$CONFIG/d' /etc/crontabs/root >/dev/null 2>&1 & start_daemon=$(config_t_get global_delay start_daemon) - if [ "$start_daemon" = "1" ];then - echo "*/2 * * * * nohup $APP_PATH/monitor.sh > /dev/null 2>&1" >> /etc/crontabs/root - echolog "已启动守护进程。" + if [ "$start_daemon" = "1" ]; then + echo "*/2 * * * * nohup $APP_PATH/monitor.sh > /dev/null 2>&1" >>/etc/crontabs/root + echolog "已启动守护进程。" fi - + auto_on=$(config_t_get global_delay auto_on) - if [ "$auto_on" = "1" ];then + if [ "$auto_on" = "1" ]; then time_off=$(config_t_get global_delay time_off) time_on=$(config_t_get global_delay time_on) time_restart=$(config_t_get global_delay time_restart) [ -z "$time_off" -o "$time_off" != "nil" ] && { - echo "0 $time_off * * * /etc/init.d/$CONFIG stop" >> /etc/crontabs/root - echolog "设置自动关闭在每天 $time_off 点。" + echo "0 $time_off * * * /etc/init.d/$CONFIG stop" >>/etc/crontabs/root + echolog "设置自动关闭在每天 $time_off 点。" } [ -z "$time_on" -o "$time_on" != "nil" ] && { - echo "0 $time_on * * * /etc/init.d/$CONFIG start" >> /etc/crontabs/root - echolog "设置自动开启在每天 $time_on 点。" + echo "0 $time_on * * * /etc/init.d/$CONFIG start" >>/etc/crontabs/root + echolog "设置自动开启在每天 $time_on 点。" } [ -z "$time_restart" -o "$time_restart" != "nil" ] && { - echo "0 $time_restart * * * /etc/init.d/$CONFIG restart" >> /etc/crontabs/root - echolog "设置自动重启在每天 $time_restart 点。" + echo "0 $time_restart * * * /etc/init.d/$CONFIG restart" >>/etc/crontabs/root + echolog "设置自动重启在每天 $time_restart 点。" } fi - + [ "$AUTO_SWITCH_ENABLE" = "1" ] && { testing_time=$(config_t_get auto_switch testing_time) [ -n "$testing_time" ] && { - echo "*/$testing_time * * * * nohup $APP_PATH/test.sh > /dev/null 2>&1" >> /etc/crontabs/root + echo "*/$testing_time * * * * nohup $APP_PATH/test.sh > /dev/null 2>&1" >>/etc/crontabs/root echolog "设置每$testing_time分钟执行检测脚本。" } } @@ -601,84 +593,84 @@ stop_crontab() { ps | grep "$APP_PATH/test.sh" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & rm -f /var/lock/passwall_test.lock >/dev/null 2>&1 & /etc/init.d/cron restart - echolog "清除定时执行命令。" + echolog "清除定时执行命令。" } start_dns() { case "$DNS_MODE" in - dns2socks) - dns2socks_bin=$(find_bin dns2socks) - sslocal_bin=$(find_bin "$TCP_REDIR_SERVER_TYPE"-local) - [ -n "$dns2socks_bin" -a -n "$sslocal_bin" ] && { - nohup $sslocal_bin -c $CONFIG_TCP_FILE -l 3080 -f $RUN_PID_PATH/$TCP_REDIR_SERVER_TYPE-local.pid >/dev/null 2>&1 & - nohup $dns2socks_bin 127.0.0.1:3080 $DNS_FORWARD 127.0.0.1:7913 >/dev/null 2>&1 & - echolog "运行DNS转发模式：dns2socks+$TCP_REDIR_SERVER_TYPE-local..." - } + dns2socks) + dns2socks_bin=$(find_bin dns2socks) + sslocal_bin=$(find_bin "$TCP_REDIR_SERVER_TYPE"-local) + [ -n "$dns2socks_bin" -a -n "$sslocal_bin" ] && { + nohup $sslocal_bin -c $CONFIG_TCP_FILE -l 3080 -f $RUN_PID_PATH/$TCP_REDIR_SERVER_TYPE-local.pid >/dev/null 2>&1 & + nohup $dns2socks_bin 127.0.0.1:3080 $DNS_FORWARD 127.0.0.1:7913 >/dev/null 2>&1 & + echolog "运行DNS转发模式：dns2socks+$TCP_REDIR_SERVER_TYPE-local..." + } ;; - Pcap_DNSProxy) - Pcap_DNSProxy_bin=$(find_bin Pcap_DNSProxy) - [ -n "$Pcap_DNSProxy_bin" ] && { - nohup $Pcap_DNSProxy_bin -c /etc/pcap-dnsproxy >/dev/null 2>&1 & - echolog "运行DNS转发模式：Pcap_DNSProxy..." - } + Pcap_DNSProxy) + Pcap_DNSProxy_bin=$(find_bin Pcap_DNSProxy) + [ -n "$Pcap_DNSProxy_bin" ] && { + nohup $Pcap_DNSProxy_bin -c /etc/pcap-dnsproxy >/dev/null 2>&1 & + echolog "运行DNS转发模式：Pcap_DNSProxy..." + } ;; - pdnsd) - pdnsd_bin=$(find_bin pdnsd) - [ -n "$pdnsd_bin" ] && { - gen_pdnsd_config - nohup $pdnsd_bin --daemon -c $CACHEDIR/pdnsd.conf -p $RUN_PID_PATH/pdnsd.pid -d >/dev/null 2>&1 & - echolog "运行DNS转发模式：Pdnsd..." - } + pdnsd) + pdnsd_bin=$(find_bin pdnsd) + [ -n "$pdnsd_bin" ] && { + gen_pdnsd_config + nohup $pdnsd_bin --daemon -c $CACHEDIR/pdnsd.conf -p $RUN_PID_PATH/pdnsd.pid -d >/dev/null 2>&1 & + echolog "运行DNS转发模式：Pdnsd..." + } ;; - local_7913) - echolog "运行DNS转发模式：使用本机7913端口DNS服务解析域名..." + local_7913) + echolog "运行DNS转发模式：使用本机7913端口DNS服务解析域名..." ;; - chinadns) - chinadns_bin=$(find_bin ChinaDNS) - [ -n "$chinadns_bin" ] && { - other=1 - echolog "运行DNS转发模式：ChinaDNS..." - dns1=$(config_t_get global_dns dns_1) - [ "$dns1" = "dnsbyisp" ] && dns1=`cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" |sort -u |grep -v 0.0.0.0 |grep -v 127.0.0.1|sed -n '2P'` - case "$UP_CHINADNS_MODE" in - OpenDNS_1) - other=0 - nohup $chinadns_bin -p 7913 -c $APP_PATH_RULE/chnroute -m -d -s $dns1,208.67.222.222:443,208.67.222.222:5353 >/dev/null 2>&1 & - echolog "运行ChinaDNS上游转发模式：$dns1,208.67.222.222..." - ;; - OpenDNS_2) - other=0 - nohup $chinadns_bin -p 7913 -c $APP_PATH_RULE/chnroute -m -d -s $dns1,208.67.220.220:443,208.67.220.220:5353 >/dev/null 2>&1 & - echolog "运行ChinaDNS上游转发模式：$dns1,208.67.220.220..." - ;; - custom) - other=0 - UP_CHINADNS_CUSTOM=$(config_t_get global up_chinadns_custom '114.114.114.114,208.67.222.222:5353') - nohup $chinadns_bin -p 7913 -c $APP_PATH_RULE/chnroute -m -d -s $UP_CHINADNS_CUSTOM >/dev/null 2>&1 & - echolog "运行ChinaDNS上游转发模式：$UP_CHINADNS_CUSTOM..." - ;; - dnsproxy) - dnsproxy_bin=$(find_bin dnsproxy) - [ -n "$dnsproxy_bin" ] && { - nohup $dnsproxy_bin -d -T -p 7913 -R $DNS_FORWARD_IP -P $DNS_FORWARD_PORT >/dev/null 2>&1 & - echolog "运行ChinaDNS上游转发模式：dnsproxy..." - } - ;; - dns-forwarder) - dnsforwarder_bin=$(find_bin dns-forwarder) - [ -n "$dnsforwarder_bin" ] && { - nohup $dnsforwarder_bin -p 7913 -s $DNS_FORWARD >/dev/null 2>&1 & - echolog "运行ChinaDNS上游转发模式：dns-forwarder..." - } - ;; - esac - if [ "$other" = "1" ];then - nohup $chinadns_bin -p 7923 -c $APP_PATH_RULE/chnroute -m -d -s $dns1,127.0.0.1:7913 >/dev/null 2>&1 & - fi - } + chinadns) + chinadns_bin=$(find_bin ChinaDNS) + [ -n "$chinadns_bin" ] && { + other=1 + echolog "运行DNS转发模式：ChinaDNS..." + dns1=$(config_t_get global_dns dns_1) + [ "$dns1" = "dnsbyisp" ] && dns1=$(cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | sort -u | grep -v 0.0.0.0 | grep -v 127.0.0.1 | sed -n '2P') + case "$UP_CHINADNS_MODE" in + OpenDNS_1) + other=0 + nohup $chinadns_bin -p 7913 -c $APP_PATH_RULE/chnroute -m -d -s $dns1,208.67.222.222:443,208.67.222.222:5353 >/dev/null 2>&1 & + echolog "运行ChinaDNS上游转发模式：$dns1,208.67.222.222..." + ;; + OpenDNS_2) + other=0 + nohup $chinadns_bin -p 7913 -c $APP_PATH_RULE/chnroute -m -d -s $dns1,208.67.220.220:443,208.67.220.220:5353 >/dev/null 2>&1 & + echolog "运行ChinaDNS上游转发模式：$dns1,208.67.220.220..." + ;; + custom) + other=0 + UP_CHINADNS_CUSTOM=$(config_t_get global up_chinadns_custom '114.114.114.114,208.67.222.222:5353') + nohup $chinadns_bin -p 7913 -c $APP_PATH_RULE/chnroute -m -d -s $UP_CHINADNS_CUSTOM >/dev/null 2>&1 & + echolog "运行ChinaDNS上游转发模式：$UP_CHINADNS_CUSTOM..." + ;; + dnsproxy) + dnsproxy_bin=$(find_bin dnsproxy) + [ -n "$dnsproxy_bin" ] && { + nohup $dnsproxy_bin -d -T -p 7913 -R $DNS_FORWARD_IP -P $DNS_FORWARD_PORT >/dev/null 2>&1 & + echolog "运行ChinaDNS上游转发模式：dnsproxy..." + } + ;; + dns-forwarder) + dnsforwarder_bin=$(find_bin dns-forwarder) + [ -n "$dnsforwarder_bin" ] && { + nohup $dnsforwarder_bin -p 7913 -s $DNS_FORWARD >/dev/null 2>&1 & + echolog "运行ChinaDNS上游转发模式：dns-forwarder..." + } + ;; + esac + if [ "$other" = "1" ]; then + nohup $chinadns_bin -p 7923 -c $APP_PATH_RULE/chnroute -m -d -s $dns1,127.0.0.1:7913 >/dev/null 2>&1 & + fi + } ;; esac - echolog "若不正常，请尝试其他模式！" + echolog "若不正常，请尝试其他模式！" } add_dnsmasq() { @@ -687,7 +679,7 @@ add_dnsmasq() { dnsport=$(config_t_get global_dns dns_port) [ -z "$dnsport" ] && dnsport=0 if [ "$DNS1" = "dnsbyisp" -o "$DNS2" = "dnsbyisp" ]; then - cat > /etc/dnsmasq.conf </etc/dnsmasq.conf </dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | sort -u | grep -v 0.0.0.0 | grep -v 127.0.0.1` + isp_dns=$(cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | sort -u | grep -v 0.0.0.0 | grep -v 127.0.0.1) failcount=0 - while [ "$failcount" -lt "10" ] - do - interface=`ifconfig | grep "$dnsport" | awk '{print $1}'` - if [ -z "$interface" ];then - echolog "找不到出口接口：$dnsport，1分钟后再重试" + while [ "$failcount" -lt "10" ]; do + interface=$(ifconfig | grep "$dnsport" | awk '{print $1}') + if [ -z "$interface" ]; then + echolog "找不到出口接口：$dnsport，1分钟后再重试" let "failcount++" [ "$failcount" -ge 10 ] && exit 0 sleep 1m else [ -n "$isp_dns" ] && { - for isp_ip in $isp_dns - do - echo server=$isp_ip >> /etc/dnsmasq.conf + for isp_ip in $isp_dns; do + echo server=$isp_ip >>/etc/dnsmasq.conf route add -host ${isp_ip} dev ${dnsport} - echolog "添加运营商DNS出口路由表：$dnsport" + echolog "添加运营商DNS出口路由表：$dnsport" done } [ "$DNS1" != "dnsbyisp" ] && { route add -host ${DNS1} dev ${dnsport} - echolog "添加DNS1出口路由表：$dnsport" - echo server=$DNS1 >> /etc/dnsmasq.conf + echolog "添加DNS1出口路由表：$dnsport" + echo server=$DNS1 >>/etc/dnsmasq.conf } [ "$DNS2" != "dnsbyisp" ] && { route add -host ${DNS2} dev ${dnsport} - echolog "添加DNS2出口路由表：$dnsport" - echo server=$DNS2 >> /etc/dnsmasq.conf + echolog "添加DNS2出口路由表：$dnsport" + echo server=$DNS2 >>/etc/dnsmasq.conf } break fi done else - isp_dns=`cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | sort -u | grep -v 0.0.0.0 | grep -v 127.0.0.1` + isp_dns=$(cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | sort -u | grep -v 0.0.0.0 | grep -v 127.0.0.1) [ -n "$isp_dns" ] && { - for isp_ip in $isp_dns - do - echo server=$isp_ip >> /etc/dnsmasq.conf + for isp_ip in $isp_dns; do + echo server=$isp_ip >>/etc/dnsmasq.conf done } [ "$DNS1" != "dnsbyisp" ] && { - echo server=$DNS1 >> /etc/dnsmasq.conf + echo server=$DNS1 >>/etc/dnsmasq.conf } [ "$DNS2" != "dnsbyisp" ] && { - echo server=$DNS2 >> /etc/dnsmasq.conf + echo server=$DNS2 >>/etc/dnsmasq.conf } fi else @@ -751,25 +740,24 @@ EOF dnsconf=$(cat /etc/dnsmasq.conf 2>/dev/null | grep "server=$DNS2") if [ "$dnsport" != "0" ]; then failcount=0 - while [ "$failcount" -lt "10" ] - do - interface=`ifconfig | grep "$dnsport" | awk '{print $1}'` - if [ -z "$interface" ];then - echolog "找不到出口接口：$dnsport，1分钟后再重试" + while [ "$failcount" -lt "10" ]; do + interface=$(ifconfig | grep "$dnsport" | awk '{print $1}') + if [ -z "$interface" ]; then + echolog "找不到出口接口：$dnsport，1分钟后再重试" let "failcount++" [ "$failcount" -ge 10 ] && exit 0 sleep 1m else route add -host ${DNS1} dev ${dnsport} - echolog "添加DNS1出口路由表：$dnsport" + echolog "添加DNS1出口路由表：$dnsport" route add -host ${DNS2} dev ${dnsport} - echolog "添加DNS2出口路由表：$dnsport" + echolog "添加DNS2出口路由表：$dnsport" break fi done fi - if [ -z "$wirteconf" ] || [ -z "$dnsconf" ];then - cat > /etc/dnsmasq.conf </etc/dnsmasq.conf </dev/null 2>&1 & # for wanname in $(cat /var/state/network |grep pppoe|awk -F '.' '{print $2}') # do - # echo "except-interface=$(uci get network.$wanname.ifname)" >>/etc/dnsmasq.conf + # echo "except-interface=$(uci get network.$wanname.ifname)" >>/etc/dnsmasq.conf # done -# fi + # fi subscribe_by_ss=$(config_t_get global_subscribe subscribe_by_ss) [ -z "$subscribe_by_ss" ] && subscribe_by_ss=0 [ "$subscribe_by_ss" -eq 1 ] && { baseurl=$(config_t_get global_subscribe baseurl) [ -n "$baseurl" ] && { - for url in $baseurl - do - if [ -n "`echo -n "$url" |grep "//"`" ]; then - echo -n "$url" | awk -F'/' '{print $3}' | sed "s/^/server=&\/./g" | sed "s/$/\/127.0.0.1#7913/g" >> $TMP_DNSMASQ_PATH/subscribe.conf - echo -n "$url" | awk -F'/' '{print $3}' | sed "s/^/ipset=&\/./g" | sed "s/$/\/router/g" >> $TMP_DNSMASQ_PATH/subscribe.conf + for url in $baseurl; do + if [ -n "$(echo -n "$url" | grep "//")" ]; then + echo -n "$url" | awk -F'/' '{print $3}' | sed "s/^/server=&\/./g" | sed "s/$/\/127.0.0.1#7913/g" >>$TMP_DNSMASQ_PATH/subscribe.conf + echo -n "$url" | awk -F'/' '{print $3}' | sed "s/^/ipset=&\/./g" | sed "s/$/\/router/g" >>$TMP_DNSMASQ_PATH/subscribe.conf else - echo -n "$url" | awk -F'/' '{print $1}' | sed "s/^/server=&\/./g" | sed "s/$/\/127.0.0.1#7913/g" >> $TMP_DNSMASQ_PATH/subscribe.conf - echo -n "$url" | awk -F'/' '{print $1}' | sed "s/^/ipset=&\/./g" | sed "s/$/\/router/g" >> $TMP_DNSMASQ_PATH/subscribe.conf + echo -n "$url" | awk -F'/' '{print $1}' | sed "s/^/server=&\/./g" | sed "s/$/\/127.0.0.1#7913/g" >>$TMP_DNSMASQ_PATH/subscribe.conf + echo -n "$url" | awk -F'/' '{print $1}' | sed "s/^/ipset=&\/./g" | sed "s/$/\/router/g" >>$TMP_DNSMASQ_PATH/subscribe.conf fi done - restdns=1 + restdns=1 } } - if [ ! -f "$TMP_DNSMASQ_PATH/gfwlist.conf" ];then + if [ ! -f "$TMP_DNSMASQ_PATH/gfwlist.conf" ]; then ln -s $APP_PATH_DNSMASQ/gfwlist.conf $TMP_DNSMASQ_PATH/gfwlist.conf restdns=1 fi - - if [ ! -f "$TMP_DNSMASQ_PATH/blacklist_host.conf" ];then - cat $APP_PATH_RULE/blacklist_host | awk '{print "server=/."$1"/127.0.0.1#7913\nipset=/."$1"/blacklist"}' >> $TMP_DNSMASQ_PATH/blacklist_host.conf + + if [ ! -f "$TMP_DNSMASQ_PATH/blacklist_host.conf" ]; then + cat $APP_PATH_RULE/blacklist_host | awk '{print "server=/."$1"/127.0.0.1#7913\nipset=/."$1"/blacklist"}' >>$TMP_DNSMASQ_PATH/blacklist_host.conf restdns=1 fi - - if [ ! -f "$TMP_DNSMASQ_PATH/whitelist_host.conf" ];then + + if [ ! -f "$TMP_DNSMASQ_PATH/whitelist_host.conf" ]; then cat $APP_PATH_RULE/whitelist_host | sed "s/^/ipset=&\/./g" | sed "s/$/\/&whitelist/g" | sort | awk '{if ($0!=line) print;line=$0}' >$TMP_DNSMASQ_PATH/whitelist_host.conf restdns=1 fi - - if [ ! -f "$TMP_DNSMASQ_PATH/router.conf" ];then - cat $APP_PATH_RULE/router | awk '{print "server=/."$1"/127.0.0.1#7913\nipset=/."$1"/router"}' >> $TMP_DNSMASQ_PATH/router.conf + + if [ ! -f "$TMP_DNSMASQ_PATH/router.conf" ]; then + cat $APP_PATH_RULE/router | awk '{print "server=/."$1"/127.0.0.1#7913\nipset=/."$1"/router"}' >>$TMP_DNSMASQ_PATH/router.conf restdns=1 fi - + userconf=$(grep -c "" $APP_PATH_DNSMASQ/user.conf) - if [ "$userconf" -gt 0 ];then + if [ "$userconf" -gt 0 ]; then ln -s $APP_PATH_DNSMASQ/user.conf $TMP_DNSMASQ_PATH/user.conf restdns=1 fi - + backhome=$(config_t_get global proxy_mode gfwlist) - if [ "$backhome" == "returnhome" ];then + if [ "$backhome" == "returnhome" ]; then rm -rf $TMP_DNSMASQ_PATH/gfwlist.conf rm -rf $TMP_DNSMASQ_PATH/blacklist_host.conf rm -rf $TMP_DNSMASQ_PATH/whitelist_host.conf restdns=1 - echolog "生成回国模式Dnsmasq配置文件。" + echolog "生成回国模式Dnsmasq配置文件。" fi - - echo "conf-dir=$TMP_DNSMASQ_PATH" > /var/dnsmasq.d/dnsmasq-$CONFIG.conf - echo "conf-dir=$TMP_DNSMASQ_PATH" > $DNSMASQ_PATH/dnsmasq-$CONFIG.conf - if [ "$restdns" == 1 ];then - echolog "重启Dnsmasq。。。" - /etc/init.d/dnsmasq restart 2>/dev/null + + echo "conf-dir=$TMP_DNSMASQ_PATH" >/var/dnsmasq.d/dnsmasq-$CONFIG.conf + echo "conf-dir=$TMP_DNSMASQ_PATH" >$DNSMASQ_PATH/dnsmasq-$CONFIG.conf + if [ "$restdns" == 1 ]; then + echolog "重启Dnsmasq。。。" + /etc/init.d/dnsmasq restart 2>/dev/null fi } @@ -857,45 +844,45 @@ gen_pdnsd_config() { CACHEDIR=/var/pdnsd CACHE=$CACHEDIR/pdnsd.cache if ! test -f "$CACHE"; then - mkdir -p `dirname $CACHE` + mkdir -p $(dirname $CACHE) touch $CACHE chown -R root.nogroup $CACHEDIR fi - cat > $CACHEDIR/pdnsd.conf <<-EOF - global { - perm_cache=1024; - cache_dir="/var/pdnsd"; - run_as="root"; - server_ip = 127.0.0.1; - server_port=7913; - status_ctl = on; - query_method=tcp_only; - min_ttl=1d; - max_ttl=1w; - timeout=10; - tcp_qtimeout=1; - par_queries=2; - neg_domain_pol=on; - udpbufsize=1024; - } - server { - label = "opendns"; - ip = 208.67.222.222, 208.67.220.220; - edns_query=on; - port = 5353; - timeout = 4; - interval=60; - uptest = none; - purge_cache=off; - caching=on; - } - source { - ttl=86400; - owner="localhost."; - serve_aliases=on; - file="/etc/hosts"; - } -EOF + cat >$CACHEDIR/pdnsd.conf <<-EOF + global { + perm_cache=1024; + cache_dir="/var/pdnsd"; + run_as="root"; + server_ip = 127.0.0.1; + server_port=7913; + status_ctl = on; + query_method=tcp_only; + min_ttl=1d; + max_ttl=1w; + timeout=10; + tcp_qtimeout=1; + par_queries=2; + neg_domain_pol=on; + udpbufsize=1024; + } + server { + label = "opendns"; + ip = 208.67.222.222, 208.67.220.220; + edns_query=on; + port = 5353; + timeout = 4; + interval=60; + uptest = none; + purge_cache=off; + caching=on; + } + source { + ttl=86400; + owner="localhost."; + serve_aliases=on; + file="/etc/hosts"; + } + EOF } stop_dnsmasq() { @@ -903,87 +890,85 @@ stop_dnsmasq() { rm -rf /var/dnsmasq.d/dnsmasq-$CONFIG.conf rm -rf $DNSMASQ_PATH/dnsmasq-$CONFIG.conf rm -rf $TMP_DNSMASQ_PATH - /etc/init.d/dnsmasq restart 2>/dev/null - echolog "没有选择服务器！" + /etc/init.d/dnsmasq restart 2>/dev/null + echolog "没有选择服务器！" fi } -start_haproxy(){ +start_haproxy() { enabled=$(config_t_get global_haproxy balancing_enable 0) [ "$enabled" = "1" ] && { haproxy_bin=$(find_bin haproxy) [ -n "$haproxy_bin" ] && { bport=$(config_t_get global_haproxy haproxy_port) cat <<-EOF >$HAPROXY_FILE -global - log 127.0.0.1 local2 - chroot /usr/bin - pidfile $RUN_PID_PATH/haproxy.pid - maxconn 60000 - stats socket $RUN_PID_PATH/haproxy.sock - user root - daemon -defaults - mode tcp - log global - option tcplog - option dontlognull - option http-server-close - #option forwardfor except 127.0.0.0/8 - option redispatch - retries 2 - timeout http-request 10s - timeout queue 1m - timeout connect 10s - timeout client 1m - timeout server 1m - timeout http-keep-alive 10s - timeout check 10s - maxconn 3000 -listen shadowsocks - bind 0.0.0.0:$bport - mode tcp -EOF - for i in $(seq 0 100) - do + global + log 127.0.0.1 local2 + chroot /usr/bin + pidfile $RUN_PID_PATH/haproxy.pid + maxconn 60000 + stats socket $RUN_PID_PATH/haproxy.sock + user root + daemon + defaults + mode tcp + log global + option tcplog + option dontlognull + option http-server-close + #option forwardfor except 127.0.0.0/8 + option redispatch + retries 2 + timeout http-request 10s + timeout queue 1m + timeout connect 10s + timeout client 1m + timeout server 1m + timeout http-keep-alive 10s + timeout check 10s + maxconn 3000 + listen shadowsocks + bind 0.0.0.0:$bport + mode tcp + EOF + for i in $(seq 0 100); do bips=$(config_t_get balancing lbss '' $i) bports=$(config_t_get balancing lbort '' $i) bweight=$(config_t_get balancing lbweight '' $i) exports=$(config_t_get balancing export '' $i) bbackup=$(config_t_get balancing backup '' $i) - if [ -z "$bips" ] || [ -z "$bports" ] ; then + if [ -z "$bips" ] || [ -z "$bports" ]; then break fi - if [ "$bbackup" = "1" ] ; then + if [ "$bbackup" = "1" ]; then bbackup=" backup" - echolog "添加故障转移备服务器$bips" + echolog "添加故障转移备服务器$bips" else bbackup="" - echolog "添加负载均衡主服务器$bips" + echolog "添加负载均衡主服务器$bips" fi - si=`echo $bips|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}"` - if [ -z "$si" ];then - bips=`resolveip -4 -t 2 $bips|awk 'NR==1{print}'` - if [ -z "$bips" ];then - bips=`nslookup $bips localhost | sed '1,4d' | awk '{print $3}' | grep -v :|awk 'NR==1{print}'` + si=$(echo $bips | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}") + if [ -z "$si" ]; then + bips=$(resolveip -4 -t 2 $bips | awk 'NR==1{print}') + if [ -z "$bips" ]; then + bips=$(nslookup $bips localhost | sed '1,4d' | awk '{print $3}' | grep -v : | awk 'NR==1{print}') fi echolog "服务器IP为：$bips" fi - echo " server ss$i $bips:$bports weight $bweight check inter 1500 rise 1 fall 3 $bbackup" >> $HAPROXY_FILE + echo " server ss$i $bips:$bports weight $bweight check inter 1500 rise 1 fall 3 $bbackup" >>$HAPROXY_FILE if [ "$exports" != "0" ]; then failcount=0 - while [ "$failcount" -lt "10" ] - do - interface=`ifconfig | grep "$exports" | awk '{print $1}'` - if [ -z "$interface" ];then - echolog "找不到出口接口：$exports，1分钟后再重试" + while [ "$failcount" -lt "10" ]; do + interface=$(ifconfig | grep "$exports" | awk '{print $1}') + if [ -z "$interface" ]; then + echolog "找不到出口接口：$exports，1分钟后再重试" let "failcount++" [ "$failcount" -ge 10 ] && exit 0 sleep 1m else route add -host ${bips} dev ${exports} - echolog "添加SS出口路由表：$exports" - echo "$bips" >> /tmp/balancing_ip + echolog "添加SS出口路由表：$exports" + echo "$bips" >>/tmp/balancing_ip break fi done @@ -991,45 +976,44 @@ EOF done #生成负载均衡控制台 adminstatus=$(config_t_get global_haproxy admin_enable) - if [ "$adminstatus" = "1" ];then + 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 + 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 nohup $haproxy_bin -f $HAPROXY_FILE 2>&1 - echolog "负载均衡服务运行成功！" + echolog "负载均衡服务运行成功！" } } -} +} add_vps_port() { multiwan=$(config_t_get global_dns wan_port 0) if [ "$multiwan" != "0" ]; then failcount=0 - while [ "$failcount" -lt "10" ] - do - interface=`ifconfig | grep "$multiwan" | awk '{print $1}'` - if [ -z "$interface" ];then - echolog "找不到出口接口：$multiwan，1分钟后再重试" + while [ "$failcount" -lt "10" ]; do + interface=$(ifconfig | grep "$multiwan" | awk '{print $1}') + if [ -z "$interface" ]; then + echolog "找不到出口接口：$multiwan，1分钟后再重试" let "failcount++" [ "$failcount" -ge 10 ] && exit 0 sleep 1m else route add -host ${TCP_REDIR_SERVER_IP} dev ${multiwan} route add -host ${UDP_REDIR_SERVER_IP} dev ${multiwan} - echolog "添加SS出口路由表：$multiwan" - echo "$TCP_REDIR_SERVER_IP" > $CONFIG_PATH/tcp_ip - echo "$UDP_REDIR_SERVER_IP" > $CONFIG_PATH/udp_ip + echolog "添加SS出口路由表：$multiwan" + echo "$TCP_REDIR_SERVER_IP" >$CONFIG_PATH/tcp_ip + echo "$UDP_REDIR_SERVER_IP" >$CONFIG_PATH/udp_ip break fi done @@ -1037,8 +1021,8 @@ add_vps_port() { } del_vps_port() { - tcp_ip=$(cat $CONFIG_PATH/tcp_ip 2> /dev/null) - udp_ip=$(cat $CONFIG_PATH/udp_ip 2> /dev/null) + tcp_ip=$(cat $CONFIG_PATH/tcp_ip 2>/dev/null) + udp_ip=$(cat $CONFIG_PATH/udp_ip 2>/dev/null) [ -n "$tcp_ip" ] && route del -host ${tcp_ip} [ -n "$udp_ip" ] && route del -host ${udp_ip} } @@ -1051,7 +1035,7 @@ boot() { local delay=$(config_t_get global_delay start_delay 0) if [ "$delay" -gt 0 ]; then [ "$TCP_REDIR_SERVER" != "nil" -o "$UDP_REDIR_SERVER" != "nil" ] && { - echolog "执行启动延时 $delay 秒后再启动!" + echolog "执行启动延时 $delay 秒后再启动!" sleep $delay && start >/dev/null 2>&1 & } else @@ -1061,7 +1045,7 @@ boot() { } start() { - echolog "开始运行脚本！" + echolog "开始运行脚本！" ! load_config && return 1 add_vps_port start_haproxy @@ -1080,7 +1064,7 @@ start() { start_crontab set_cru rm -f "$LOCK_FILE" - echolog "运行完成！" + echolog "运行完成！" return 0 } @@ -1116,5 +1100,5 @@ boot) ;; *) echo "Usage: $0 (start|stop|restart)" - ;; + ;; esac 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 similarity index 100% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/gfwlist.conf rename to package/lienol/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/gfwlist.conf index cef7f49452..4edd15e857 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,6 +2,10 @@ 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 @@ -10,8 +14,6 @@ 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 @@ -58,8 +60,6 @@ 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,6 +74,10 @@ 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 @@ -96,16 +100,14 @@ 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 @@ -116,8 +118,6 @@ 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 @@ -182,10 +182,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=/.666kb.com/127.0.0.1#7913 -ipset=/.666kb.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=/.6park.com/127.0.0.1#7913 ipset=/.6park.com/gfwlist server=/.6parker.com/127.0.0.1#7913 @@ -194,6 +194,8 @@ 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 @@ -206,12 +208,10 @@ 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.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=/.89.64.charter.constitutionalism.solutions/127.0.0.1#7913 +ipset=/.89.64.charter.constitutionalism.solutions/gfwlist server=/.8news.com.tw/127.0.0.1#7913 ipset=/.8news.com.tw/gfwlist server=/.8z1.net/127.0.0.1#7913 @@ -238,6 +238,8 @@ 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 @@ -246,16 +248,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 @@ -266,12 +268,14 @@ 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=/.aboutgfw.com/127.0.0.1#7913 -ipset=/.aboutgfw.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=/.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 @@ -282,8 +286,6 @@ 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 @@ -310,46 +312,48 @@ 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=/.adsense.com/127.0.0.1#7913 -ipset=/.adsense.com/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=/.adult.friendfinder.com/127.0.0.1#7913 -server=/.adultfriendfinder.com/127.0.0.1#7913 ipset=/.adult.friendfinder.com/gfwlist +server=/.adultfriendfinder.com/127.0.0.1#7913 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=/.aenhancers.com/127.0.0.1#7913 -ipset=/.aenhancers.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=/.aex.com/127.0.0.1#7913 ipset=/.aex.com/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=/.afantibbs.com/127.0.0.1#7913 +ipset=/.afantibbs.com/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 @@ -364,12 +368,10 @@ 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=/.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=/.aiweiweiblog.com/127.0.0.1#7913 +ipset=/.aiweiweiblog.com/gfwlist server=/.akademiye.org/127.0.0.1#7913 ipset=/.akademiye.org/gfwlist server=/.akamaihd.net/127.0.0.1#7913 @@ -380,6 +382,10 @@ 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 @@ -398,8 +404,6 @@ 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 @@ -434,8 +438,6 @@ 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 @@ -468,10 +470,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/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.org/127.0.0.1#7913 +ipset=/.amnesty.org/gfwlist server=/.amnesty.tw/127.0.0.1#7913 ipset=/.amnesty.tw/gfwlist server=/.amnestyusa.org/127.0.0.1#7913 @@ -490,6 +492,8 @@ 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 @@ -498,8 +502,6 @@ 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 @@ -530,8 +532,6 @@ 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 @@ -550,9 +550,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 @@ -566,16 +566,14 @@ 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 @@ -584,10 +582,12 @@ 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=/.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=/.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=/.apk-dl.com/127.0.0.1#7913 ipset=/.apk-dl.com/gfwlist server=/.apkdler.com/127.0.0.1#7913 @@ -604,30 +604,32 @@ 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=/.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=/.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=/.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 @@ -636,12 +638,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=/.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=/.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=/.arctosia.com/127.0.0.1#7913 ipset=/.arctosia.com/gfwlist server=/.areca-backup.org/127.0.0.1#7913 @@ -650,8 +652,6 @@ 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 @@ -700,10 +700,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=/.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=/.atchinese.com/127.0.0.1#7913 +ipset=/.atchinese.com/gfwlist server=/.atdmt.com/127.0.0.1#7913 ipset=/.atdmt.com/gfwlist server=/.atgfw.org/127.0.0.1#7913 @@ -724,40 +724,40 @@ 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=/.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 @@ -836,36 +836,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=/.bbcchinese.com/127.0.0.1#7913 -ipset=/.bbcchinese.com/gfwlist -server=/.bbc.com/127.0.0.1#7913 -ipset=/.bbc.com/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=/.bb-chat.tv/127.0.0.1#7913 +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=/.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 @@ -876,20 +876,14 @@ 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,12 +896,18 @@ 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=/.bbs-tw.com/127.0.0.1#7913 -ipset=/.bbs-tw.com/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=/.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 @@ -956,10 +956,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=/.bestvpnanalysis.com/127.0.0.1#7913 -ipset=/.bestvpnanalysis.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=/.bestvpnserver.com/127.0.0.1#7913 ipset=/.bestvpnserver.com/gfwlist server=/.bestvpnservice.com/127.0.0.1#7913 @@ -1000,6 +1000,8 @@ 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 @@ -1008,8 +1010,6 @@ 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 @@ -1024,22 +1024,24 @@ 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 @@ -1048,8 +1050,6 @@ 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 @@ -1058,12 +1058,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 @@ -1076,22 +1076,14 @@ 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 @@ -1104,14 +1096,10 @@ 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=/.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.google/127.0.0.1#7913 +ipset=/.blog.google/gfwlist server=/.blog.inoreader.com/127.0.0.1#7913 ipset=/.blog.inoreader.com/gfwlist server=/.blog.istef.info/127.0.0.1#7913 @@ -1124,10 +1112,6 @@ 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 @@ -1138,38 +1122,18 @@ 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 @@ -1180,6 +1144,42 @@ 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 @@ -1224,32 +1224,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=/.botanwang.com/127.0.0.1#7913 -ipset=/.botanwang.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=/.bowenpress.com/127.0.0.1#7913 ipset=/.bowenpress.com/gfwlist server=/.boxpn.com/127.0.0.1#7913 ipset=/.boxpn.com/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=/.boxunblog.com/127.0.0.1#7913 +ipset=/.boxunblog.com/gfwlist +server=/.boxunclub.com/127.0.0.1#7913 +ipset=/.boxunclub.com/gfwlist server=/.boyangu.com/127.0.0.1#7913 ipset=/.boyangu.com/gfwlist server=/.boyfriendtv.com/127.0.0.1#7913 @@ -1258,6 +1258,10 @@ 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 @@ -1278,8 +1282,6 @@ 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 @@ -1292,8 +1294,6 @@ 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 @@ -1330,10 +1330,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=/.bullogger.com/127.0.0.1#7913 -ipset=/.bullogger.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=/.bunbunhk.com/127.0.0.1#7913 ipset=/.bunbunhk.com/gfwlist server=/.busayari.com/127.0.0.1#7913 @@ -1372,6 +1372,10 @@ 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 @@ -1418,12 +1422,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 @@ -1432,10 +1436,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=/.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=/.caribbeancom.com/127.0.0.1#7913 +ipset=/.caribbeancom.com/gfwlist server=/.carmotorshow.com/127.0.0.1#7913 ipset=/.carmotorshow.com/gfwlist server=/.cartoonmovement.com/127.0.0.1#7913 @@ -1444,14 +1448,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 @@ -1470,10 +1474,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=/.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=/.cbsnews.com/127.0.0.1#7913 +ipset=/.cbsnews.com/gfwlist server=/.cbtc.org.hk/127.0.0.1#7913 ipset=/.cbtc.org.hk/gfwlist server=/.cccat.cc/127.0.0.1#7913 @@ -1488,10 +1492,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=/.cclifefl.org/127.0.0.1#7913 -ipset=/.cclifefl.org/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=/.ccthere.com/127.0.0.1#7913 ipset=/.ccthere.com/gfwlist server=/.ccthere.net/127.0.0.1#7913 @@ -1518,26 +1522,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.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.assets.lfpcontent.com/127.0.0.1#7913 +ipset=/.cdn.assets.lfpcontent.com/gfwlist +server=/.cdn.helixstudios.net/127.0.0.1#7913 +ipset=/.cdn.helixstudios.net/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 @@ -1570,12 +1574,10 @@ 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.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=/.certificate.revocationcheck.com/127.0.0.1#7913 +ipset=/.certificate.revocationcheck.com/gfwlist server=/.cfhks.org.hk/127.0.0.1#7913 ipset=/.cfhks.org.hk/gfwlist server=/.cfos.de/127.0.0.1#7913 @@ -1586,14 +1588,16 @@ 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 @@ -1624,6 +1628,20 @@ 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 @@ -1672,8 +1690,6 @@ 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 @@ -1688,12 +1704,6 @@ 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 @@ -1704,8 +1714,6 @@ 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 @@ -1724,14 +1732,10 @@ 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 @@ -1740,34 +1744,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 @@ -1794,10 +1798,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=/.chromecast.com/127.0.0.1#7913 -ipset=/.chromecast.com/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=/.chromeexperiments.com/127.0.0.1#7913 ipset=/.chromeexperiments.com/gfwlist server=/.chromercise.com/127.0.0.1#7913 @@ -1806,8 +1810,6 @@ 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 @@ -1858,14 +1860,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 @@ -1912,24 +1914,12 @@ 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=/.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-proxy.com/127.0.0.1#7913 +ipset=/.cn-proxy.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 @@ -1938,20 +1928,8 @@ 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 @@ -1966,6 +1944,32 @@ 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 @@ -2002,10 +2006,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=/.comefromchina.com/127.0.0.1#7913 -ipset=/.comefromchina.com/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=/.comic-mega.me/127.0.0.1#7913 ipset=/.comic-mega.me/gfwlist server=/.commandarms.com/127.0.0.1#7913 @@ -2014,16 +2018,14 @@ 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=/.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=/.communitychoicecu.com/127.0.0.1#7913 +ipset=/.communitychoicecu.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 @@ -2048,10 +2050,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=/.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=/.cosmic.monar.ch/127.0.0.1#7913 +ipset=/.cosmic.monar.ch/gfwlist server=/.cosplayjav.pl/127.0.0.1#7913 ipset=/.cosplayjav.pl/gfwlist server=/.costco.com/127.0.0.1#7913 @@ -2079,9 +2081,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 @@ -2102,14 +2104,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 @@ -2118,8 +2120,6 @@ 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 @@ -2148,6 +2148,8 @@ 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 @@ -2206,14 +2208,20 @@ 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=/.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=/.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=/.dalailamacenter.org/127.0.0.1#7913 +ipset=/.dalailamacenter.org/gfwlist server=/.dalailamafellows.org/127.0.0.1#7913 ipset=/.dalailamafellows.org/gfwlist server=/.dalailamafilm.com/127.0.0.1#7913 @@ -2226,18 +2234,12 @@ 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 @@ -2266,12 +2268,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 @@ -2282,10 +2284,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=/.dbc.hk/127.0.0.1#7913 -ipset=/.dbc.hk/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=/.dcard.tw/127.0.0.1#7913 ipset=/.dcard.tw/gfwlist server=/.dcmilitary.com/127.0.0.1#7913 @@ -2308,6 +2310,8 @@ 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 @@ -2328,16 +2332,14 @@ 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=/.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=/.democrats.org/127.0.0.1#7913 +ipset=/.democrats.org/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 @@ -2362,8 +2364,6 @@ 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 @@ -2400,10 +2400,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=/.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=/.discuss4u.com/127.0.0.1#7913 +ipset=/.discuss4u.com/gfwlist server=/.dish.com/127.0.0.1#7913 ipset=/.dish.com/gfwlist server=/.disp.cc/127.0.0.1#7913 @@ -2420,10 +2420,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.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=/.dl.box.net/127.0.0.1#7913 +ipset=/.dl.box.net/gfwlist server=/.dlsite.com/127.0.0.1#7913 ipset=/.dlsite.com/gfwlist server=/.dlyoutube.com/127.0.0.1#7913 @@ -2434,30 +2434,30 @@ server=/.dmcdn.net/127.0.0.1#7913 ipset=/.dmcdn.net/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=/.dns2go.com/127.0.0.1#7913 -ipset=/.dns2go.com/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=/.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 @@ -2500,10 +2500,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=/.doubibackup.com/127.0.0.1#7913 -ipset=/.doubibackup.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=/.doubmirror.cf/127.0.0.1#7913 ipset=/.doubmirror.cf/gfwlist server=/.dougscripts.com/127.0.0.1#7913 @@ -2568,20 +2568,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.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=/.duckduckgo.com/127.0.0.1#7913 +ipset=/.duckduckgo.com/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=/.duihuahrjournal.org/127.0.0.1#7913 -ipset=/.duihuahrjournal.org/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=/.dumb1.com/127.0.0.1#7913 ipset=/.dumb1.com/gfwlist server=/.dunyabulteni.net/127.0.0.1#7913 @@ -2602,6 +2602,10 @@ 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 @@ -2610,28 +2614,24 @@ 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=/.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=/.dynamic-dns.net/127.0.0.1#7913 +ipset=/.dynamic-dns.net/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.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.org/127.0.0.1#7913 +ipset=/.dyndns.org/gfwlist server=/.dyndns.pro/127.0.0.1#7913 ipset=/.dyndns.pro/gfwlist server=/.dynssl.com/127.0.0.1#7913 @@ -2646,6 +2646,20 @@ 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 @@ -2660,24 +2674,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 @@ -2686,8 +2700,6 @@ 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 @@ -2724,16 +2736,8 @@ 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 @@ -2766,6 +2770,10 @@ 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 @@ -2774,8 +2782,6 @@ 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 @@ -2784,8 +2790,6 @@ 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 @@ -2794,16 +2798,18 @@ 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=/.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=/.epac.to/127.0.0.1#7913 +ipset=/.epac.to/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 @@ -2822,8 +2828,6 @@ 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 @@ -2860,10 +2864,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=/.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=/.eromangadouzin.com/127.0.0.1#7913 +ipset=/.eromangadouzin.com/gfwlist server=/.eromon.net/127.0.0.1#7913 ipset=/.eromon.net/gfwlist server=/.eroprofile.com/127.0.0.1#7913 @@ -2894,18 +2898,16 @@ 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 @@ -2946,14 +2948,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 @@ -2964,22 +2966,20 @@ 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=/.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=/.facebookmail.com/127.0.0.1#7913 +ipset=/.facebookmail.com/gfwlist +server=/.facebookquotes4u.com/127.0.0.1#7913 +ipset=/.facebookquotes4u.com/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 @@ -2992,6 +2992,12 @@ 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 @@ -3000,26 +3006,22 @@ 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=/.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=/.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=/.falungong.club/127.0.0.1#7913 ipset=/.falungong.club/gfwlist server=/.falungong.de/127.0.0.1#7913 @@ -3032,8 +3034,6 @@ 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 @@ -3042,6 +3042,8 @@ 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 @@ -3054,18 +3056,16 @@ 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=/.fangongheike.com/127.0.0.1#7913 -ipset=/.fangongheike.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=/.fanhaodang.com/127.0.0.1#7913 ipset=/.fanhaodang.com/gfwlist -server=/.fan-qiang.com/127.0.0.1#7913 -ipset=/.fan-qiang.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=/.fanqianghou.com/127.0.0.1#7913 +ipset=/.fanqianghou.com/gfwlist server=/.fanqiangyakexi.net/127.0.0.1#7913 ipset=/.fanqiangyakexi.net/gfwlist server=/.fanqiangzhe.com/127.0.0.1#7913 @@ -3084,14 +3084,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 @@ -3100,26 +3100,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=/.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=/.fbaddins.com/127.0.0.1#7913 +ipset=/.fbaddins.com/gfwlist +server=/.fbcdn.net/127.0.0.1#7913 +ipset=/.fbcdn.net/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 @@ -3138,10 +3138,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=/.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=/.feitianacademy.org/127.0.0.1#7913 +ipset=/.feitianacademy.org/gfwlist server=/.feministteacher.com/127.0.0.1#7913 ipset=/.feministteacher.com/gfwlist server=/.fengzhenghu.com/127.0.0.1#7913 @@ -3150,10 +3150,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=/.fffff.at/127.0.0.1#7913 -ipset=/.fffff.at/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=/.fflick.com/127.0.0.1#7913 ipset=/.fflick.com/gfwlist server=/.ffvpn.com/127.0.0.1#7913 @@ -3264,8 +3264,6 @@ 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 @@ -3290,6 +3288,8 @@ 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 @@ -3304,24 +3304,36 @@ 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=/.fpmtmexico.org/127.0.0.1#7913 -ipset=/.fpmtmexico.org/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.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=/.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 @@ -3330,12 +3342,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 @@ -3356,16 +3368,10 @@ 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=/.freeilhamtohti.org/127.0.0.1#7913 ipset=/.freeilhamtohti.org/gfwlist server=/.freekwonpyong.org/127.0.0.1#7913 @@ -3390,22 +3396,16 @@ 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 @@ -3430,26 +3430,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.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=/.friendfeed.com/127.0.0.1#7913 +ipset=/.friendfeed.com/gfwlist server=/.friends-of-tibet.org/127.0.0.1#7913 -server=/.friendsoftibet.org/127.0.0.1#7913 ipset=/.friends-of-tibet.org/gfwlist +server=/.friendsoftibet.org/127.0.0.1#7913 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=/.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=/.fromchinatousa.net/127.0.0.1#7913 +ipset=/.fromchinatousa.net/gfwlist +server=/.frommel.net/127.0.0.1#7913 +ipset=/.frommel.net/gfwlist server=/.frontlinedefenders.org/127.0.0.1#7913 ipset=/.frontlinedefenders.org/gfwlist server=/.frootvpn.com/127.0.0.1#7913 @@ -3500,10 +3500,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=/.fuyindiantai.org/127.0.0.1#7913 -ipset=/.fuyindiantai.org/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=/.fuyu.org.tw/127.0.0.1#7913 ipset=/.fuyu.org.tw/gfwlist server=/.fw.cm/127.0.0.1#7913 @@ -3518,6 +3518,12 @@ 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 @@ -3540,12 +3546,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 @@ -3564,16 +3570,14 @@ 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=/.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=/.gate.io/127.0.0.1#7913 +ipset=/.gate.io/gfwlist +server=/.gatecoin.com/127.0.0.1#7913 +ipset=/.gatecoin.com/gfwlist server=/.gather.com/127.0.0.1#7913 ipset=/.gather.com/gfwlist server=/.gatherproxy.com/127.0.0.1#7913 @@ -3602,8 +3606,6 @@ 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 @@ -3632,22 +3634,24 @@ 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 @@ -3660,8 +3664,6 @@ 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 @@ -3702,10 +3704,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=/.github.com/127.0.0.1#7913 -ipset=/.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=/.gizlen.net/127.0.0.1#7913 ipset=/.gizlen.net/gfwlist server=/.gjczz.com/127.0.0.1#7913 @@ -3724,10 +3726,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=/.globalvoicesonline.org/127.0.0.1#7913 -ipset=/.globalvoicesonline.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=/.globalvpn.net/127.0.0.1#7913 ipset=/.globalvpn.net/gfwlist server=/.glock.com/127.0.0.1#7913 @@ -3754,6 +3756,10 @@ 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 @@ -3772,10 +3778,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/127.0.0.1#7913 -ipset=/.godsdirectcontact.org/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=/.godsimmediatecontact.com/127.0.0.1#7913 ipset=/.godsimmediatecontact.com/gfwlist server=/.gogotunnel.com/127.0.0.1#7913 @@ -3802,16 +3808,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=/.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=/.gongmeng.info/127.0.0.1#7913 +ipset=/.gongmeng.info/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 @@ -3826,21 +3832,10 @@ 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 @@ -3853,34 +3848,29 @@ 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 @@ -3922,7 +3912,6 @@ 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 @@ -3959,8 +3948,6 @@ 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 @@ -4043,10 +4030,8 @@ 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.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/127.0.0.1#7913 +ipset=/.google.com/gfwlist server=/.google.de/127.0.0.1#7913 ipset=/.google.de/gfwlist server=/.google.dev/127.0.0.1#7913 @@ -4055,12 +4040,6 @@ 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 @@ -4075,16 +4054,8 @@ 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 @@ -4093,14 +4064,8 @@ 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 @@ -4111,12 +4076,6 @@ 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 @@ -4125,20 +4084,14 @@ 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 @@ -4147,33 +4100,82 @@ 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=/.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=/.gotdns.ch/127.0.0.1#7913 +ipset=/.gotdns.ch/gfwlist server=/.gotgeeks.com/127.0.0.1#7913 ipset=/.gotgeeks.com/gfwlist server=/.gotrusted.com/127.0.0.1#7913 @@ -4184,8 +4186,6 @@ 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 @@ -4202,21 +4202,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 @@ -4252,6 +4252,8 @@ 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 @@ -4264,18 +4266,16 @@ server=/.guangming.com.my/127.0.0.1#7913 ipset=/.guangming.com.my/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 @@ -4302,6 +4302,10 @@ 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 @@ -4336,10 +4340,10 @@ server=/.handcraftedsoftware.org/127.0.0.1#7913 ipset=/.handcraftedsoftware.org/gfwlist server=/.hanunyi.com/127.0.0.1#7913 ipset=/.hanunyi.com/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=/.haoel.github.io/127.0.0.1#7913 +ipset=/.haoel.github.io/gfwlist server=/.happy-vpn.com/127.0.0.1#7913 ipset=/.happy-vpn.com/gfwlist server=/.haproxy.org/127.0.0.1#7913 @@ -4348,24 +4352,22 @@ 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=/.hautelookcdn.com/127.0.0.1#7913 -ipset=/.hautelookcdn.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=/.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=/.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=/.hdlt.me/127.0.0.1#7913 +ipset=/.hdlt.me/gfwlist server=/.hdtvb.net/127.0.0.1#7913 ipset=/.hdtvb.net/gfwlist server=/.hdzog.com/127.0.0.1#7913 @@ -4374,12 +4376,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 @@ -4396,12 +4398,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 @@ -4430,8 +4432,12 @@ 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 @@ -4440,16 +4446,14 @@ 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 @@ -4474,8 +4478,6 @@ 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 @@ -4485,11 +4487,37 @@ 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 -server=/.hizbuttahrir.org/127.0.0.1#7913 ipset=/.hizb-ut-tahrir.org/gfwlist +server=/.hizbuttahrir.org/127.0.0.1#7913 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 @@ -4536,22 +4564,14 @@ 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 @@ -4564,48 +4584,28 @@ 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 @@ -4626,16 +4626,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 @@ -4700,52 +4700,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=/.hrweb.org/127.0.0.1#7913 -ipset=/.hrweb.org/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=/.hsjp.net/127.0.0.1#7913 ipset=/.hsjp.net/gfwlist server=/.hsselite.com/127.0.0.1#7913 ipset=/.hsselite.com/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=/.hstern.net/127.0.0.1#7913 +ipset=/.hstern.net/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=/.huaren4us.com/127.0.0.1#7913 -ipset=/.huaren4us.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=/.huashangnews.com/127.0.0.1#7913 ipset=/.huashangnews.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=/.huaxiabao.org/127.0.0.1#7913 +ipset=/.huaxiabao.org/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 @@ -4770,16 +4770,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=/.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=/.hungerstrikeforaids.org/127.0.0.1#7913 +ipset=/.hungerstrikeforaids.org/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 @@ -4810,6 +4810,14 @@ 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 @@ -4838,8 +4846,6 @@ 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 @@ -4854,16 +4860,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 @@ -4878,6 +4884,8 @@ 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 @@ -4888,9 +4896,7 @@ 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 @@ -4920,14 +4926,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 @@ -4936,10 +4942,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.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=/.images.comico.tw/127.0.0.1#7913 +ipset=/.images.comico.tw/gfwlist server=/.imageshack.us/127.0.0.1#7913 ipset=/.imageshack.us/gfwlist server=/.imagevenue.com/127.0.0.1#7913 @@ -4950,12 +4956,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 @@ -4972,8 +4978,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=/.im.tv/127.0.0.1#7913 -ipset=/.im.tv/gfwlist +server=/.in-disguise.com/127.0.0.1#7913 +ipset=/.in-disguise.com/gfwlist server=/.in99.org/127.0.0.1#7913 ipset=/.in99.org/gfwlist server=/.incapdns.net/127.0.0.1#7913 @@ -4986,8 +4992,6 @@ 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 @@ -5012,12 +5016,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 @@ -5032,8 +5036,6 @@ 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 @@ -5060,10 +5062,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=/.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=/.iptvbin.com/127.0.0.1#7913 +ipset=/.iptvbin.com/gfwlist server=/.ipvanish.com/127.0.0.1#7913 ipset=/.ipvanish.com/gfwlist server=/.iredmail.org/127.0.0.1#7913 @@ -5074,22 +5076,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=/.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=/.isaacmao.com/127.0.0.1#7913 +ipset=/.isaacmao.com/gfwlist +server=/.isasecret.com/127.0.0.1#7913 +ipset=/.isasecret.com/gfwlist +server=/.isc.sans.edu/127.0.0.1#7913 +ipset=/.isc.sans.edu/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 @@ -5098,8 +5100,6 @@ 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 @@ -5136,10 +5136,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=/.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=/.itsaol.com/127.0.0.1#7913 +ipset=/.itsaol.com/gfwlist server=/.itshidden.com/127.0.0.1#7913 ipset=/.itshidden.com/gfwlist server=/.itsky.it/127.0.0.1#7913 @@ -5166,10 +5166,14 @@ 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=/.izlesem.org/127.0.0.1#7913 -ipset=/.izlesem.org/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=/.jamaat.org/127.0.0.1#7913 ipset=/.jamaat.org/gfwlist server=/.jamyangnorbu.com/127.0.0.1#7913 @@ -5178,12 +5182,14 @@ 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=/.japan-whores.com/127.0.0.1#7913 -ipset=/.japan-whores.com/gfwlist +server=/.jav.com/127.0.0.1#7913 +ipset=/.jav.com/gfwlist server=/.jav101.com/127.0.0.1#7913 ipset=/.jav101.com/gfwlist server=/.jav2be.com/127.0.0.1#7913 @@ -5194,8 +5200,6 @@ 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 @@ -5220,8 +5224,6 @@ 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 @@ -5292,8 +5294,6 @@ 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 @@ -5358,18 +5358,22 @@ 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/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=/.kagyuoffice.org/127.0.0.1#7913 +ipset=/.kagyuoffice.org/gfwlist server=/.kaiyuan.de/127.0.0.1#7913 ipset=/.kaiyuan.de/gfwlist server=/.kakao.com/127.0.0.1#7913 @@ -5394,24 +5398,20 @@ 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.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=/.karmapa.org/127.0.0.1#7913 +ipset=/.karmapa.org/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=/.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=/.kba-tx.org/127.0.0.1#7913 +ipset=/.kba-tx.org/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 @@ -5470,20 +5470,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=/.kobobooks.com/127.0.0.1#7913 -ipset=/.kobobooks.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=/.kodingen.com/127.0.0.1#7913 ipset=/.kodingen.com/gfwlist server=/.kompozer.net/127.0.0.1#7913 @@ -5536,12 +5536,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 @@ -5584,6 +5584,8 @@ 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 @@ -5622,8 +5624,6 @@ 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 @@ -5668,22 +5668,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=/.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=/.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=/.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=/.linglingfa.com/127.0.0.1#7913 ipset=/.linglingfa.com/gfwlist server=/.lingvodics.com/127.0.0.1#7913 ipset=/.lingvodics.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=/.linkideo.com/127.0.0.1#7913 +ipset=/.linkideo.com/gfwlist server=/.linkuswell.com/127.0.0.1#7913 ipset=/.linkuswell.com/gfwlist server=/.linux.org.hk/127.0.0.1#7913 @@ -5702,6 +5702,8 @@ 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 @@ -5710,8 +5712,6 @@ 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 @@ -5788,12 +5788,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 @@ -5820,6 +5820,16 @@ 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 @@ -5842,8 +5852,6 @@ 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 @@ -5944,18 +5952,22 @@ 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 @@ -5980,18 +5992,16 @@ 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=/.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=/.memehk.com/127.0.0.1#7913 +ipset=/.memehk.com/gfwlist server=/.memorybbs.com/127.0.0.1#7913 ipset=/.memorybbs.com/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=/.memrijttm.org/127.0.0.1#7913 +ipset=/.memrijttm.org/gfwlist server=/.mercatox.com/127.0.0.1#7913 ipset=/.mercatox.com/gfwlist server=/.mercyprophet.org/127.0.0.1#7913 @@ -6028,8 +6038,6 @@ 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 @@ -6040,8 +6048,6 @@ 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 @@ -6078,12 +6084,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.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=/.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=/.minghuiyw.wordpress.com/127.0.0.1#7913 ipset=/.minghuiyw.wordpress.com/gfwlist server=/.mingjinglishi.com/127.0.0.1#7913 @@ -6092,10 +6098,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=/.mingpaocanada.com/127.0.0.1#7913 -ipset=/.mingpaocanada.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=/.mingpaomonthly.com/127.0.0.1#7913 ipset=/.mingpaomonthly.com/gfwlist server=/.mingpaonews.com/127.0.0.1#7913 @@ -6130,10 +6136,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=/.mitbbsau.com/127.0.0.1#7913 -ipset=/.mitbbsau.com/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=/.mixero.com/127.0.0.1#7913 ipset=/.mixero.com/gfwlist server=/.mixpod.com/127.0.0.1#7913 @@ -6152,26 +6158,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=/.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=/.mmaaxx.com/127.0.0.1#7913 +ipset=/.mmaaxx.com/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=/.mobypicture.com/127.0.0.1#7913 -ipset=/.mobypicture.com/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=/.moeaic.gov.tw/127.0.0.1#7913 ipset=/.moeaic.gov.tw/gfwlist server=/.moeerolibrary.com/127.0.0.1#7913 @@ -6196,12 +6202,10 @@ 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=/.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=/.moneyhome.biz/127.0.0.1#7913 +ipset=/.moneyhome.biz/gfwlist server=/.monitorchina.org/127.0.0.1#7913 ipset=/.monitorchina.org/gfwlist server=/.monster.com/127.0.0.1#7913 @@ -6240,8 +6244,6 @@ 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 @@ -6262,8 +6264,6 @@ 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 @@ -6298,10 +6298,22 @@ 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=/.mx981.com/127.0.0.1#7913 -ipset=/.mx981.com/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=/.my03.com/127.0.0.1#7913 ipset=/.my03.com/gfwlist server=/.myactimes.com/127.0.0.1#7913 @@ -6340,8 +6352,6 @@ 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 @@ -6362,8 +6372,6 @@ 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 @@ -6378,12 +6386,8 @@ 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 @@ -6392,10 +6396,6 @@ 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 @@ -6408,10 +6408,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=/.myspacecdn.com/127.0.0.1#7913 -ipset=/.myspacecdn.com/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=/.mytalkbox.com/127.0.0.1#7913 ipset=/.mytalkbox.com/gfwlist server=/.mytizi.com/127.0.0.1#7913 @@ -6432,10 +6432,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=/.namgyalmonastery.org/127.0.0.1#7913 -ipset=/.namgyalmonastery.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=/.namsisi.com/127.0.0.1#7913 ipset=/.namsisi.com/gfwlist server=/.nanyang.com/127.0.0.1#7913 @@ -6450,14 +6450,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 @@ -6488,12 +6488,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 @@ -6510,10 +6510,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=/.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=/.new96.ca/127.0.0.1#7913 +ipset=/.new96.ca/gfwlist server=/.newcenturymc.com/127.0.0.1#7913 ipset=/.newcenturymc.com/gfwlist server=/.newcenturynews.com/127.0.0.1#7913 @@ -6528,20 +6528,8 @@ 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 @@ -6554,8 +6542,6 @@ 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 @@ -6566,18 +6552,32 @@ 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=/.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=/.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=/.newtaiwan.com.tw/127.0.0.1#7913 ipset=/.newtaiwan.com.tw/gfwlist server=/.newtalk.tw/127.0.0.1#7913 @@ -6654,16 +6654,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=/.nobelprize.org/127.0.0.1#7913 -ipset=/.nobelprize.org/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=/.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 @@ -6702,10 +6702,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=/.npsboost.com/127.0.0.1#7913 -ipset=/.npsboost.com/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=/.nradio.me/127.0.0.1#7913 ipset=/.nradio.me/gfwlist server=/.nrk.no/127.0.0.1#7913 @@ -6737,6 +6737,7 @@ 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 @@ -6745,13 +6746,12 @@ 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 @@ -6782,6 +6782,10 @@ 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=/.nydus.ca/127.0.0.1#7913 @@ -6790,28 +6794,24 @@ 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=/.ny.stgloballink.com/127.0.0.1#7913 -ipset=/.ny.stgloballink.com/gfwlist +server=/.nyt.com/127.0.0.1#7913 +ipset=/.nyt.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=/.nyt.com/127.0.0.1#7913 -ipset=/.nyt.com/gfwlist +server=/.nyti.ms/127.0.0.1#7913 +ipset=/.nyti.ms/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 @@ -6832,10 +6832,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=/.oculuscdn.com/127.0.0.1#7913 -ipset=/.oculuscdn.com/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=/.oex.com/127.0.0.1#7913 ipset=/.oex.com/gfwlist server=/.offbeatchina.com/127.0.0.1#7913 @@ -6854,14 +6854,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 @@ -6880,12 +6880,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 @@ -6894,10 +6894,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=/.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=/.onlinecha.com/127.0.0.1#7913 +ipset=/.onlinecha.com/gfwlist server=/.onlineyoutube.com/127.0.0.1#7913 ipset=/.onlineyoutube.com/gfwlist server=/.onlytweets.com/127.0.0.1#7913 @@ -6922,10 +6922,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=/.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=/.openallweb.com/127.0.0.1#7913 +ipset=/.openallweb.com/gfwlist server=/.opendemocracy.net/127.0.0.1#7913 ipset=/.opendemocracy.net/gfwlist server=/.opendn.xyz/127.0.0.1#7913 @@ -6958,10 +6958,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=/.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=/.orientaldaily.com.my/127.0.0.1#7913 +ipset=/.orientaldaily.com.my/gfwlist server=/.orn.jp/127.0.0.1#7913 ipset=/.orn.jp/gfwlist server=/.orzistic.org/127.0.0.1#7913 @@ -6992,10 +6992,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=/.owl.li/127.0.0.1#7913 -ipset=/.owl.li/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=/.oyax.com/127.0.0.1#7913 ipset=/.oyax.com/gfwlist server=/.oyghan.com/127.0.0.1#7913 @@ -7020,10 +7020,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=/.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=/.page2rss.com/127.0.0.1#7913 +ipset=/.page2rss.com/gfwlist server=/.pagodabox.com/127.0.0.1#7913 ipset=/.pagodabox.com/gfwlist server=/.palacemoon.com/127.0.0.1#7913 @@ -7052,10 +7052,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=/.paperb.us/127.0.0.1#7913 -ipset=/.paperb.us/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=/.paradisehill.cc/127.0.0.1#7913 ipset=/.paradisehill.cc/gfwlist server=/.paradisepoker.com/127.0.0.1#7913 @@ -7070,10 +7070,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=/.pastebin.com/127.0.0.1#7913 -ipset=/.pastebin.com/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=/.pastie.org/127.0.0.1#7913 ipset=/.pastie.org/gfwlist server=/.pbs.org/127.0.0.1#7913 @@ -7120,14 +7120,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 @@ -7176,26 +7176,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=/.picacomiccn.com/127.0.0.1#7913 -ipset=/.picacomiccn.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=/.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=/.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=/.picturesocial.com/127.0.0.1#7913 +ipset=/.picturesocial.com/gfwlist server=/.pimg.tw/127.0.0.1#7913 ipset=/.pimg.tw/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=/.pin6.com/127.0.0.1#7913 +ipset=/.pin6.com/gfwlist server=/.pincong.rocks/127.0.0.1#7913 ipset=/.pincong.rocks/gfwlist server=/.ping.fm/127.0.0.1#7913 @@ -7212,10 +7212,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.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.com/127.0.0.1#7913 +ipset=/.pinterest.com/gfwlist server=/.pinterest.de/127.0.0.1#7913 ipset=/.pinterest.de/gfwlist server=/.pinterest.dk/127.0.0.1#7913 @@ -7268,12 +7268,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 @@ -7296,10 +7296,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=/.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=/.polymerhk.com/127.0.0.1#7913 +ipset=/.polymerhk.com/gfwlist server=/.popo.tw/127.0.0.1#7913 ipset=/.popo.tw/gfwlist server=/.popvote.hk/127.0.0.1#7913 @@ -7308,14 +7308,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 @@ -7366,10 +7366,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=/.powerapple.com/127.0.0.1#7913 -ipset=/.powerapple.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=/.powercx.com/127.0.0.1#7913 ipset=/.powercx.com/gfwlist server=/.powerphoto.org/127.0.0.1#7913 @@ -7446,12 +7446,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 @@ -7500,10 +7500,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/127.0.0.1#7913 -ipset=/.python.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=/.pythonhackers.com/127.0.0.1#7913 ipset=/.pythonhackers.com/gfwlist server=/.pytorch.org/127.0.0.1#7913 @@ -7514,6 +7514,8 @@ 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 @@ -7522,8 +7524,6 @@ 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 @@ -7552,10 +7552,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=/.quoracdn.net/127.0.0.1#7913 -ipset=/.quoracdn.net/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=/.quran.com/127.0.0.1#7913 ipset=/.quran.com/gfwlist server=/.quranexplorer.com/127.0.0.1#7913 @@ -7568,6 +7568,8 @@ server=/.qxbbs.org/127.0.0.1#7913 ipset=/.qxbbs.org/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 @@ -7582,10 +7584,8 @@ 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 @@ -7620,12 +7620,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 @@ -7666,6 +7666,8 @@ 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 @@ -7673,9 +7675,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 @@ -7684,8 +7686,6 @@ 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 @@ -7724,14 +7724,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 @@ -7762,10 +7762,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=/.rmjdw132.info/127.0.0.1#7913 -ipset=/.rmjdw132.info/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=/.roadshow.hk/127.0.0.1#7913 ipset=/.roadshow.hk/gfwlist server=/.roboforex.com/127.0.0.1#7913 @@ -7802,10 +7802,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=/.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=/.rthklive2-lh.akamaihd.net/127.0.0.1#7913 +ipset=/.rthklive2-lh.akamaihd.net/gfwlist server=/.rti.org.tw/127.0.0.1#7913 ipset=/.rti.org.tw/gfwlist server=/.rtycminnesota.org/127.0.0.1#7913 @@ -7826,20 +7826,26 @@ 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=/.s1heng.com/127.0.0.1#7913 -ipset=/.s1heng.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=/.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=/.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 @@ -7852,8 +7858,6 @@ 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 @@ -7900,12 +7904,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 @@ -7914,32 +7918,28 @@ 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=/.scmpchinese.com/127.0.0.1#7913 -ipset=/.scmpchinese.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=/.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 @@ -7996,6 +7996,8 @@ 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 @@ -8004,12 +8006,10 @@ 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=/.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=/.sexhuang.com/127.0.0.1#7913 +ipset=/.sexhuang.com/gfwlist server=/.sexidude.com/127.0.0.1#7913 ipset=/.sexidude.com/gfwlist server=/.sexinsex.net/127.0.0.1#7913 @@ -8018,10 +8018,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=/.sfileydy.com/127.0.0.1#7913 -ipset=/.sfileydy.com/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=/.sfshibao.com/127.0.0.1#7913 ipset=/.sfshibao.com/gfwlist server=/.sftindia.org/127.0.0.1#7913 @@ -8034,20 +8034,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=/.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=/.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/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.com/127.0.0.1#7913 +ipset=/.shadowsocks.com/gfwlist server=/.shadowsocks.org/127.0.0.1#7913 ipset=/.shadowsocks.org/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=/.shambalapost.com/127.0.0.1#7913 ipset=/.shambalapost.com/gfwlist server=/.shambhalasun.com/127.0.0.1#7913 @@ -8058,26 +8058,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=/.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=/.shattered.io/127.0.0.1#7913 +ipset=/.shattered.io/gfwlist server=/.sheikyermami.com/127.0.0.1#7913 ipset=/.sheikyermami.com/gfwlist server=/.shellfire.de/127.0.0.1#7913 @@ -8128,10 +8128,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=/.shwchurch3.com/127.0.0.1#7913 -ipset=/.shwchurch3.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=/.siddharthasintent.org/127.0.0.1#7913 ipset=/.siddharthasintent.org/gfwlist server=/.sidelinesnews.com/127.0.0.1#7913 @@ -8166,14 +8166,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 @@ -8184,12 +8184,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 @@ -8244,6 +8244,8 @@ 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 @@ -8256,8 +8258,6 @@ 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 @@ -8272,26 +8272,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=/.sodatea.github.io/127.0.0.1#7913 -ipset=/.sodatea.github.io/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=/.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=/.softether.co.jp/127.0.0.1#7913 +ipset=/.softether.co.jp/gfwlist server=/.softether.org/127.0.0.1#7913 ipset=/.softether.org/gfwlist server=/.softfamous.com/127.0.0.1#7913 @@ -8306,12 +8306,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 @@ -8346,10 +8346,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=/.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=/.soulcaliburhentai.net/127.0.0.1#7913 +ipset=/.soulcaliburhentai.net/gfwlist server=/.soumo.info/127.0.0.1#7913 ipset=/.soumo.info/gfwlist server=/.soundcloud.com/127.0.0.1#7913 @@ -8424,34 +8424,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=/.ss7.vzw.com/127.0.0.1#7913 -ipset=/.ss7.vzw.com/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=/.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=/.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=/.ssl443.org/127.0.0.1#7913 +ipset=/.ssl443.org/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=/.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=/.ssrshare.com/127.0.0.1#7913 +ipset=/.ssrshare.com/gfwlist server=/.sss.camp/127.0.0.1#7913 ipset=/.sss.camp/gfwlist server=/.sstmlt.moe/127.0.0.1#7913 @@ -8476,16 +8476,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=/.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.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=/.staticflickr.com/127.0.0.1#7913 +ipset=/.staticflickr.com/gfwlist server=/.statueofdemocracy.org/127.0.0.1#7913 ipset=/.statueofdemocracy.org/gfwlist server=/.stc.com.sa/127.0.0.1#7913 @@ -8526,10 +8526,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=/.stormmediagroup.com/127.0.0.1#7913 -ipset=/.stormmediagroup.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=/.stoweboyd.com/127.0.0.1#7913 ipset=/.stoweboyd.com/gfwlist server=/.stranabg.com/127.0.0.1#7913 @@ -8546,10 +8546,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=/.studentsforafreetibet.org/127.0.0.1#7913 -ipset=/.studentsforafreetibet.org/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=/.stumbleupon.com/127.0.0.1#7913 ipset=/.stumbleupon.com/gfwlist server=/.stupidvideos.com/127.0.0.1#7913 @@ -8608,9 +8608,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 @@ -8648,6 +8648,14 @@ 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 @@ -8668,16 +8676,18 @@ 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=/.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=/.tagwalk.com/127.0.0.1#7913 +ipset=/.tagwalk.com/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 @@ -8696,16 +8706,14 @@ 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/127.0.0.1#7913 -ipset=/.taiwannation.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=/.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 @@ -8750,16 +8758,18 @@ 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=/.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=/.tbicn.org/127.0.0.1#7913 +ipset=/.tbicn.org/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 @@ -8768,8 +8778,6 @@ 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 @@ -8788,8 +8796,6 @@ 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 @@ -8824,12 +8830,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 @@ -8850,8 +8856,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=/.t-g.com/127.0.0.1#7913 -ipset=/.t-g.com/gfwlist +server=/.th.hao123.com/127.0.0.1#7913 +ipset=/.th.hao123.com/gfwlist server=/.thaicn.com/127.0.0.1#7913 ipset=/.thaicn.com/gfwlist server=/.thb.gov.tw/127.0.0.1#7913 @@ -8924,8 +8930,6 @@ 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 @@ -8946,10 +8950,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/127.0.0.1#7913 -ipset=/.thywords.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=/.tiananmenduizhi.com/127.0.0.1#7913 ipset=/.tiananmenduizhi.com/gfwlist server=/.tiananmenmother.org/127.0.0.1#7913 @@ -8964,14 +8968,48 @@ 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=/.tiantibooks.org/127.0.0.1#7913 -ipset=/.tiantibooks.org/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=/.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 @@ -8980,10 +9018,12 @@ 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=/.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=/.tibetan.fr/127.0.0.1#7913 +ipset=/.tibetan.fr/gfwlist +server=/.tibetanaidproject.org/127.0.0.1#7913 +ipset=/.tibetanaidproject.org/gfwlist server=/.tibetanarts.org/127.0.0.1#7913 ipset=/.tibetanarts.org/gfwlist server=/.tibetanbuddhistinstitute.org/127.0.0.1#7913 @@ -8996,8 +9036,6 @@ 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 @@ -9016,16 +9054,10 @@ 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=/.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=/.tibetanyouthcongress.org/127.0.0.1#7913 +ipset=/.tibetanyouthcongress.org/gfwlist server=/.tibetcharity.dk/127.0.0.1#7913 ipset=/.tibetcharity.dk/gfwlist server=/.tibetcharity.in/127.0.0.1#7913 @@ -9036,20 +9068,12 @@ 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 @@ -9064,32 +9088,20 @@ 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 @@ -9104,18 +9116,12 @@ 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 @@ -9128,8 +9134,6 @@ 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 @@ -9174,8 +9178,6 @@ 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 @@ -9194,18 +9196,20 @@ 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 @@ -9216,6 +9220,8 @@ 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 @@ -9226,8 +9232,6 @@ 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 @@ -9236,16 +9240,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=/.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=/.tor.updatestar.com/127.0.0.1#7913 +ipset=/.tor.updatestar.com/gfwlist +server=/.tora.to/127.0.0.1#7913 +ipset=/.tora.to/gfwlist +server=/.torcn.com/127.0.0.1#7913 +ipset=/.torcn.com/gfwlist server=/.torguard.net/127.0.0.1#7913 ipset=/.torguard.net/gfwlist server=/.torproject.org/127.0.0.1#7913 @@ -9258,12 +9262,8 @@ 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 @@ -9288,10 +9288,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=/.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=/.transparency.org/127.0.0.1#7913 +ipset=/.transparency.org/gfwlist server=/.treemall.com.tw/127.0.0.1#7913 ipset=/.treemall.com.tw/gfwlist server=/.trendsmap.com/127.0.0.1#7913 @@ -9306,10 +9306,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=/.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=/.trtc.com.tw/127.0.0.1#7913 +ipset=/.trtc.com.tw/gfwlist server=/.truebuddha-md.org/127.0.0.1#7913 ipset=/.truebuddha-md.org/gfwlist server=/.trulyergonomic.com/127.0.0.1#7913 @@ -9330,10 +9330,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=/.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=/.tsunagarumon.com/127.0.0.1#7913 +ipset=/.tsunagarumon.com/gfwlist server=/.tt1069.com/127.0.0.1#7913 ipset=/.tt1069.com/gfwlist server=/.tttan.com/127.0.0.1#7913 @@ -9344,12 +9344,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 @@ -9362,6 +9362,8 @@ 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 @@ -9370,8 +9372,6 @@ 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 @@ -9424,12 +9424,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 @@ -9438,12 +9438,46 @@ 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 @@ -9456,10 +9490,6 @@ 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 @@ -9506,12 +9536,8 @@ 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 @@ -9546,16 +9572,14 @@ 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=/.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=/.twisterio.com/127.0.0.1#7913 +ipset=/.twisterio.com/gfwlist server=/.twisternow.com/127.0.0.1#7913 ipset=/.twisternow.com/gfwlist server=/.twistory.net/127.0.0.1#7913 @@ -9566,10 +9590,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=/.twitchcdn.net/127.0.0.1#7913 -ipset=/.twitchcdn.net/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=/.twitgether.com/127.0.0.1#7913 ipset=/.twitgether.com/gfwlist server=/.twitgoo.com/127.0.0.1#7913 @@ -9590,18 +9614,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=/.twitter4j.org/127.0.0.1#7913 -ipset=/.twitter4j.org/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=/.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 @@ -9622,50 +9646,26 @@ 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=/.tw.streetvoice.com/127.0.0.1#7913 -ipset=/.tw.streetvoice.com/gfwlist +server=/.twt.tl/127.0.0.1#7913 +ipset=/.twt.tl/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 @@ -9680,20 +9680,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=/.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=/.udn.com/127.0.0.1#7913 +ipset=/.udn.com/gfwlist +server=/.udnbkk.com/127.0.0.1#7913 +ipset=/.udnbkk.com/gfwlist server=/.uforadio.com.tw/127.0.0.1#7913 ipset=/.uforadio.com.tw/gfwlist server=/.ufreevpn.com/127.0.0.1#7913 @@ -9704,12 +9704,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 @@ -9726,6 +9726,8 @@ 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 @@ -9734,8 +9736,6 @@ 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 @@ -9804,6 +9804,8 @@ 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 @@ -9828,8 +9830,6 @@ 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 @@ -9848,18 +9848,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 @@ -9890,16 +9890,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=/.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=/.vcfbuilder.org/127.0.0.1#7913 +ipset=/.vcfbuilder.org/gfwlist server=/.vds.rightster.com/127.0.0.1#7913 ipset=/.vds.rightster.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=/.vegasred.com/127.0.0.1#7913 +ipset=/.vegasred.com/gfwlist server=/.velkaepocha.sk/127.0.0.1#7913 ipset=/.velkaepocha.sk/gfwlist server=/.venbbs.com/127.0.0.1#7913 @@ -9928,40 +9928,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.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.aol.com/127.0.0.1#7913 +ipset=/.video.aol.com/gfwlist server=/.video.ap.org/127.0.0.1#7913 ipset=/.video.ap.org/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=/.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=/.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 @@ -10008,18 +10008,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=/.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=/.vnet.link/127.0.0.1#7913 +ipset=/.vnet.link/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=/.voachineseblog.com/127.0.0.1#7913 -ipset=/.voachineseblog.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=/.voagd.com/127.0.0.1#7913 ipset=/.voagd.com/gfwlist server=/.voanews.com/127.0.0.1#7913 @@ -10044,20 +10044,22 @@ 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=/.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=/.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=/.vpnaccount.org/127.0.0.1#7913 +ipset=/.vpnaccount.org/gfwlist +server=/.vpnaccounts.com/127.0.0.1#7913 +ipset=/.vpnaccounts.com/gfwlist +server=/.vpnbook.com/127.0.0.1#7913 +ipset=/.vpnbook.com/gfwlist server=/.vpncomparison.org/127.0.0.1#7913 ipset=/.vpncomparison.org/gfwlist server=/.vpncoupons.com/127.0.0.1#7913 @@ -10112,8 +10114,6 @@ 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 @@ -10142,6 +10142,8 @@ 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 @@ -10200,10 +10202,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=/.waveprotocol.org/127.0.0.1#7913 -ipset=/.waveprotocol.org/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=/.waymo.com/127.0.0.1#7913 ipset=/.waymo.com/gfwlist server=/.wda.gov.tw/127.0.0.1#7913 @@ -10214,12 +10216,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 @@ -10234,12 +10236,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 @@ -10338,8 +10340,6 @@ 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 @@ -10354,6 +10354,14 @@ 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 @@ -10362,8 +10370,6 @@ 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 @@ -10374,14 +10380,8 @@ 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 @@ -10428,12 +10428,14 @@ 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=/.wn.com/127.0.0.1#7913 -ipset=/.wn.com/gfwlist +server=/.wo.tc/127.0.0.1#7913 +ipset=/.wo.tc/gfwlist server=/.wo3ttt.wordpress.com/127.0.0.1#7913 ipset=/.wo3ttt.wordpress.com/gfwlist server=/.woeser.com/127.0.0.1#7913 @@ -10466,16 +10468,14 @@ 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=/.wo.tc/127.0.0.1#7913 -ipset=/.wo.tc/gfwlist +server=/.wow-life.net/127.0.0.1#7913 +ipset=/.wow-life.net/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 @@ -10502,10 +10502,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=/.wsjhk.com/127.0.0.1#7913 -ipset=/.wsjhk.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=/.wtbn.org/127.0.0.1#7913 ipset=/.wtbn.org/gfwlist server=/.wtfpeople.com/127.0.0.1#7913 @@ -10518,10 +10518,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=/.wujieliulan.com/127.0.0.1#7913 -ipset=/.wujieliulan.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=/.wukangrui.net/127.0.0.1#7913 ipset=/.wukangrui.net/gfwlist server=/.wuw.red/127.0.0.1#7913 @@ -10530,14 +10530,6 @@ 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 @@ -10566,8 +10558,6 @@ 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 @@ -10584,14 +10574,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 @@ -10620,32 +10610,46 @@ 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.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.wangruowang.org/127.0.0.1#7913 +ipset=/.www.wangruowang.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=/.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=/.xanga.com/127.0.0.1#7913 +ipset=/.xanga.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 @@ -10654,8 +10658,6 @@ 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 @@ -10772,8 +10774,6 @@ 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 @@ -10782,24 +10782,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 @@ -10832,18 +10832,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=/.yes123.com.tw/127.0.0.1#7913 -ipset=/.yes123.com.tw/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=/.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=/.yespornplease.com/127.0.0.1#7913 +ipset=/.yespornplease.com/gfwlist server=/.yeyeclub.com/127.0.0.1#7913 ipset=/.yeyeclub.com/gfwlist server=/.ygto.com/127.0.0.1#7913 @@ -10882,10 +10882,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=/.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=/.youdontcare.com/127.0.0.1#7913 +ipset=/.youdontcare.com/gfwlist server=/.youjizz.com/127.0.0.1#7913 ipset=/.youjizz.com/gfwlist server=/.youmaker.com/127.0.0.1#7913 @@ -10900,10 +10900,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=/.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=/.yourepeat.com/127.0.0.1#7913 +ipset=/.yourepeat.com/gfwlist server=/.yourlisten.com/127.0.0.1#7913 ipset=/.yourlisten.com/gfwlist server=/.yourlust.com/127.0.0.1#7913 @@ -10919,17 +10919,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 -server=/.youtubecn.com/127.0.0.1#7913 -ipset=/.youtubecn.com/gfwlist +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=/.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 @@ -10972,10 +10972,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/127.0.0.1#7913 -ipset=/.zaobao.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=/.zaozon.com/127.0.0.1#7913 ipset=/.zaozon.com/gfwlist server=/.zapto.org/127.0.0.1#7913 @@ -10990,10 +10990,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/127.0.0.1#7913 -ipset=/.zenmate.com/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=/.zeronet.io/127.0.0.1#7913 ipset=/.zeronet.io/gfwlist server=/.zeutch.com/127.0.0.1#7913 @@ -11004,6 +11004,20 @@ 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 @@ -11016,20 +11030,16 @@ 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=/.zhenlibu1984.com/127.0.0.1#7913 -ipset=/.zhenlibu1984.com/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=/.zhenxiang.biz/127.0.0.1#7913 ipset=/.zhenxiang.biz/gfwlist server=/.zhinengluyou.com/127.0.0.1#7913 @@ -11044,10 +11054,6 @@ 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 @@ -11058,12 +11064,6 @@ 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 @@ -11106,12 +11106,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/dnsmasq.d/user.conf b/package/lienol/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/user.conf similarity index 100% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/user.conf rename to package/lienol/luci-app-passwall/root/usr/share/passwall/dnsmasq.d/user.conf 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 old mode 100755 new mode 100644 similarity index 76% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh rename to package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh index 4a55369a86..005a8ec6f2 --- a/package/Lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh @@ -2,7 +2,7 @@ IPSET_LANIPLIST="laniplist" IPSET_VPSIPLIST="vpsiplist" -IPSET_ROUTER="router" +IPSET_ROUTER="router" IPSET_GFW="gfwlist" IPSET_CHN="chnroute" IPSET_BLACKLIST="blacklist" @@ -12,7 +12,7 @@ iptables_nat="iptables -t nat" iptables_mangle="iptables -t mangle" ip6tables_nat="ip6tables -t nat" -factor(){ +factor() { if [ -z "$1" ] || [ -z "$2" ]; then echo "" else @@ -20,18 +20,18 @@ factor(){ fi } -get_jump_mode(){ +get_jump_mode() { case "$1" in - disable) - echo "j" + disable) + echo "j" ;; - *) - echo "g" + *) + echo "g" ;; esac } -get_ip_mark(){ +get_ip_mark() { if [ -z "$1" ]; then echo "" else @@ -41,46 +41,46 @@ get_ip_mark(){ get_action_chain() { case "$1" in - disable) - echo "RETURN" + disable) + echo "RETURN" ;; - global) - echo "SS_GLO" + global) + echo "SS_GLO" ;; - gfwlist) - echo "SS_GFW" + gfwlist) + echo "SS_GFW" ;; - chnroute) - echo "SS_CHN" + chnroute) + echo "SS_CHN" ;; - gamemode) - echo "SS_GAME" + gamemode) + echo "SS_GAME" ;; - returnhome) - echo "SS_HOME" + returnhome) + echo "SS_HOME" ;; esac } get_action_chain_name() { case "$1" in - disable) - echo "不代理" + disable) + echo "不代理" ;; - global) - echo "全局" + global) + echo "全局" ;; - gfwlist) - echo "GFW" + gfwlist) + echo "GFW" ;; - chnroute) - echo "大陆白名单" + chnroute) + echo "大陆白名单" ;; - gamemode) - echo "游戏" + gamemode) + echo "游戏" ;; - returnhome) - echo "回国" + returnhome) + echo "回国" ;; esac } @@ -96,10 +96,10 @@ gen_laniplist() { 192.168.0.0/16 224.0.0.0/4 240.0.0.0/4 -EOF + EOF } -load_acl(){ +load_acl() { local enabled local aclremarks local ipaddr @@ -121,60 +121,60 @@ load_acl(){ [ -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 - local ip_mark=`get_ip_mark $ipaddr` + local ip_mark=$(get_ip_mark $ipaddr) [ "$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)" + echolog "访问控制：IP：$ipaddr，MAC：$macaddr，代理模式：$(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 "$ipaddr" ] && echolog "访问控制：IP：$ipaddr，代理模式：$(get_action_chain_name $proxy_mode)" + [ -n "$macaddr" ] && echolog "访问控制：MAC：$macaddr，代理模式：$(get_action_chain_name $proxy_mode)" fi [ "$tcp_redir_server" != "nil" ] && { - $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 -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 } [ "$udp_redir_server" != "nil" ] && { - $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 104$udp_redir_server --tproxy-mark 0x1/0x1 + $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 104$udp_redir_server --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 } [ -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}'` + 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` + dhcp_index=$(uci show dhcp | grep $lower_macaddr | awk -F'.' '{print $2}') + ipaddr=$(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 "$ipaddr" ] && ipaddr=$(cat /tmp/dhcp.leases | grep -E "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep $lower_macaddr | awk '{print $3}') } fi } } -filter_vpsip(){ +filter_vpsip() { local server_host server_ip use_ipv6 network_type server_host=$(config_get $1 server) 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) - + [ -n "$server_ip" -a "$server_ip" != "$TCP_REDIR_SERVER_IP" ] && { [ "$network_type" == "ipv4" ] && ipset add $IPSET_VPSIPLIST $server_ip >/dev/null 2>&1 & } } -dns_hijack(){ +dns_hijack() { dnshijack=$(config_t_get global_dns dns_53) - if [ "$dnshijack" = "1" -o "$1" = "force" ];then - chromecast_nu=`$iptables_nat -L SS -v -n --line-numbers|grep "dpt:53"|awk '{print $1}'` - is_right_lanip=`$iptables_nat -L SS -v -n --line-numbers|grep "dpt:53" |grep "$lanip"` + if [ "$dnshijack" = "1" -o "$1" = "force" ]; then + chromecast_nu=$($iptables_nat -L SS -v -n --line-numbers | grep "dpt:53" | awk '{print $1}') + is_right_lanip=$($iptables_nat -L SS -v -n --line-numbers | grep "dpt:53" | grep "$lanip") if [ -z "$chromecast_nu" ]; then - echolog "添加接管局域网DNS解析规则..." + echolog "添加接管局域网DNS解析规则..." $iptables_nat -I SS -i br-lan -p udp --dport 53 -j DNAT --to $lanip 2>/dev/null else if [ -z "$is_right_lanip" ]; then - echolog "添加接管局域网DNS解析规则..." + echolog "添加接管局域网DNS解析规则..." $iptables_nat -D SS $chromecast_nu >/dev/null 2>&1 & $iptables_nat -I SS -i br-lan -p udp --dport 53 -j DNAT --to $lanip 2>/dev/null else @@ -185,8 +185,8 @@ dns_hijack(){ } add_firewall_rule() { - echolog "开始加载防火墙规则..." - echolog "默认代理模式：$(get_action_chain_name $PROXY_MODE)" + echolog "开始加载防火墙规则..." + echolog "默认代理模式：$(get_action_chain_name $PROXY_MODE)" ipset -! create $IPSET_LANIPLIST nethash && ipset flush $IPSET_LANIPLIST ipset -! create $IPSET_VPSIPLIST nethash && ipset flush $IPSET_VPSIPLIST ipset -! create $IPSET_ROUTER nethash && ipset flush $IPSET_ROUTER @@ -194,58 +194,55 @@ add_firewall_rule() { ipset -! create $IPSET_CHN nethash && ipset flush $IPSET_CHN ipset -! create $IPSET_BLACKLIST nethash && ipset flush $IPSET_BLACKLIST ipset -! create $IPSET_WHITELIST nethash && ipset flush $IPSET_WHITELIST - + sed -e "s/^/add $IPSET_CHN &/g" $APP_PATH_RULE/chnroute | awk '{print $0} END{print "COMMIT"}' | ipset -R sed -e "s/^/add $IPSET_BLACKLIST &/g" $APP_PATH_RULE/blacklist_ip | awk '{print $0} END{print "COMMIT"}' | ipset -R sed -e "s/^/add $IPSET_WHITELIST &/g" $APP_PATH_RULE/whitelist_ip | awk '{print $0} END{print "COMMIT"}' | ipset -R - + ipset -! -R <<-EOF || return 1 - $(gen_laniplist | sed -e "s/^/add $IPSET_LANIPLIST /") -EOF - - ISP_DNS=`cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | sort -u |grep -v 0.0.0.0 |grep -v 127.0.0.1` + $(gen_laniplist | sed -e "s/^/add $IPSET_LANIPLIST /") + EOF + + ISP_DNS=$(cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | sort -u | grep -v 0.0.0.0 | grep -v 127.0.0.1) [ -n "$ISP_DNS" ] && { - for ispip in $ISP_DNS - do + for ispip in $ISP_DNS; do ipset -! add $IPSET_WHITELIST $ispip >/dev/null 2>&1 & done } - + # 忽略特殊IP段 - lan_ip=`ifconfig br-lan | grep "inet addr" | awk '{print $2}' | awk -F : '{print $2}'` #路由器lan IP - lan_ipv4=`ip address show br-lan | grep -w "inet" |awk '{print $2}'` #当前LAN IPv4段 + lan_ip=$(ifconfig br-lan | grep "inet addr" | awk '{print $2}' | awk -F : '{print $2}') #路由器lan IP + lan_ipv4=$(ip address show br-lan | grep -w "inet" | awk '{print $2}') #当前LAN IPv4段 [ -n "$lan_ipv4" ] && ipset add $IPSET_LANIPLIST $lan_ipv4 >/dev/null 2>&1 & - + # 过滤所有节点IP config_foreach filter_vpsip "servers" - + $iptables_mangle -N SS $iptables_mangle -A SS -m set --match-set $IPSET_LANIPLIST dst -j RETURN $iptables_mangle -A SS -m set --match-set $IPSET_VPSIPLIST dst -j RETURN $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_REDIR_SERVER_NUM" -ge 1 ]] || [[ "$UDP_REDIR_SERVER_NUM" -ge 1 ]]; then 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 + if [ "$max_num" -ge 1 ]; then + for i in $(seq 1 $max_num); do $iptables_mangle -N SS_GLO$i $iptables_mangle -N SS_GFW$i $iptables_mangle -N SS_CHN$i $iptables_mangle -N SS_HOME$i $iptables_mangle -N SS_GAME$i - + ip rule add fwmark 1 lookup 100 ip route add local 0.0.0.0/0 dev lo table 100 done fi fi - - if [ "$TCP_REDIR_SERVER_NUM" -ge 1 ] ;then - for i in $(seq 1 $TCP_REDIR_SERVER_NUM) - do + + if [ "$TCP_REDIR_SERVER_NUM" -ge 1 ]; then + for i in $(seq 1 $TCP_REDIR_SERVER_NUM); do local k=$i local local_port=104$k local ttl=14$k @@ -256,7 +253,7 @@ EOF temp_server=$TCP_REDIR_SERVER } # 生成TCP转发规则 - if [ "$temp_server" != "nil" ];then + 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) @@ -265,25 +262,25 @@ EOF if [ "$TCP_REDIR_SERVER_TYPE" == "brook" ]; then $iptables_mangle -A PREROUTING -p tcp -m socket -j MARK --set-mark 1 $iptables_mangle -A PREROUTING -p tcp -j SS$k - + $iptables_mangle -A SS$k -p tcp -m set --match-set $IPSET_BLACKLIST dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 # 全局模式 $iptables_mangle -A SS_GLO$k -p tcp -j TPROXY --tproxy-mark 0x1/0x1 --on-port $local_port - + # GFWLIST模式 $iptables_mangle -A SS_GFW$k -p tcp -m set --match-set $IPSET_GFW dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 $iptables_mangle -A SS_GFW$k -p tcp -m set --match-set $IPSET_ROUTER dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 - + # 大陆白名单模式 $iptables_mangle -A SS_CHN$k -p tcp -m set --match-set $IPSET_CHN dst -j RETURN $iptables_mangle -A SS_CHN$k -p tcp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 - + # 回国模式 $iptables_mangle -A SS_HOME$k -p tcp -m set --match-set $IPSET_CHN dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 - + # 游戏模式 $iptables_mangle -A SS_GAME$k -p tcp -m set --match-set $IPSET_CHN dst -j RETURN - + # 用于本机流量转发，默认只走router $iptables_mangle -A SS$k -s $lan_ip -p tcp -m set --match-set $IPSET_ROUTER dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 $iptables_mangle -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_ROUTER dst -j MARK --set-mark 1 @@ -291,47 +288,47 @@ EOF #$iptables_mangle -I SS_ACL 1 -p tcp -m set --match-set $IPSET_BLACKLIST dst -j TTL --ttl-set $ttl # 全局模式 $iptables_mangle -A SS_GLO$k -p tcp -j TTL --ttl-set $ttl - + # GFWLIST模式 $iptables_mangle -A SS_GFW$k -p tcp -m set --match-set $IPSET_GFW dst -j TTL --ttl-set $ttl $iptables_mangle -A SS_GFW$k -p tcp -m set --match-set $IPSET_ROUTER dst -j TTL --ttl-set $ttl - + # 大陆白名单模式 $iptables_mangle -A SS_CHN$k -p tcp -m set --match-set $IPSET_CHN dst -j RETURN #$iptables_mangle -A SS_CHN$k -p tcp -m geoip ! --destination-country CN -j TTL --ttl-set $ttl $iptables_mangle -A SS_CHN$k -p tcp -j TTL --ttl-set $ttl - + # 回国模式 #$iptables_mangle -A SS_HOME$k -p tcp -m geoip --destination-country CN -j TTL --ttl-set $ttl $iptables_mangle -A SS_HOME$k -p tcp -m set --match-set $IPSET_CHN dst -j TTL --ttl-set $ttl - + # 游戏模式 $iptables_mangle -A SS_GAME$k -p tcp -m set --match-set $IPSET_CHN dst -j RETURN - + [ "$k" == 1 ] && { $iptables_nat -N SS - + is_add_prerouting=0 - - KP_INDEX=`$iptables_nat -L PREROUTING|tail -n +3|sed -n -e '/^KOOLPROXY/='` + + KP_INDEX=$($iptables_nat -L PREROUTING | tail -n +3 | sed -n -e '/^KOOLPROXY/=') if [ -n "$KP_INDEX" ]; then let KP_INDEX+=1 #确保添加到KOOLPROXY规则之后 $iptables_nat -I PREROUTING $KP_INDEX -j SS is_add_prerouting=1 fi - - ADBYBY_INDEX=`$iptables_nat -L PREROUTING|tail -n +3|sed -n -e '/^ADBYBY/='` + + ADBYBY_INDEX=$($iptables_nat -L PREROUTING | tail -n +3 | sed -n -e '/^ADBYBY/=') if [ -n "$ADBYBY_INDEX" ]; then let ADBYBY_INDEX+=1 #确保添加到ADBYBY规则之后 $iptables_nat -I PREROUTING $ADBYBY_INDEX -j SS is_add_prerouting=1 fi - + if [ "$is_add_prerouting" == 0 ]; then #如果去广告没有运行，确保添加到prerouting_rule规则之后 - PR_INDEX=`$iptables_nat -L PREROUTING|tail -n +3|sed -n -e '/^prerouting_rule/='` + PR_INDEX=$($iptables_nat -L PREROUTING | tail -n +3 | sed -n -e '/^prerouting_rule/=') if [ -z "$PR_INDEX" ]; then PR_INDEX=1 else @@ -341,32 +338,30 @@ EOF fi # 用于本机流量转发，默认只走router #$iptables_nat -I OUTPUT -j SS - $iptables_nat -A OUTPUT -m set --match-set $IPSET_LANIPLIST dst -j RETURN - $iptables_nat -A OUTPUT -m set --match-set $IPSET_VPSIPLIST dst -j RETURN - $iptables_nat -A OUTPUT -m set --match-set $IPSET_WHITELIST dst -j RETURN - $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_ROUTER dst -j REDIRECT --to-ports $TCP_REDIR_PORT - $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_BLACKLIST dst -j REDIRECT --to-ports $TCP_REDIR_PORT - - [ "$LOCALHOST_PROXY_MODE" == "global" ] && $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -j REDIRECT --to-ports $TCP_REDIR_PORT - [ "$LOCALHOST_PROXY_MODE" == "gfwlist" ] && $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_GFW dst -j REDIRECT --to-ports $TCP_REDIR_PORT + $iptables_nat -A OUTPUT -m set --match-set $IPSET_LANIPLIST dst -m comment --comment "PassWall" -j RETURN + $iptables_nat -A OUTPUT -m set --match-set $IPSET_VPSIPLIST dst -m comment --comment "PassWall" -j RETURN + $iptables_nat -A OUTPUT -m set --match-set $IPSET_WHITELIST dst -m comment --comment "PassWall" -j RETURN + $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_ROUTER dst -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT + $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT + + [ "$LOCALHOST_PROXY_MODE" == "global" ] && $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT + [ "$LOCALHOST_PROXY_MODE" == "gfwlist" ] && $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_GFW dst -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT [ "$LOCALHOST_PROXY_MODE" == "chnroute" ] && { - $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_CHN dst -j RETURN - $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -j REDIRECT --to-ports $TCP_REDIR_PORT + $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set ! --match-set $IPSET_CHN dst -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT } } # 重定所有流量到透明代理端口 $iptables_nat -A SS -p tcp -m ttl --ttl-eq $ttl -j REDIRECT --to $local_port - echolog "IPv4 防火墙TCP转发规则加载完成！" + echolog "IPv4 防火墙TCP转发规则加载完成！" fi fi done else - echolog "主服务器未选择，无法转发TCP！" + echolog "主服务器未选择，无法转发TCP！" fi - - if [ "$UDP_REDIR_SERVER_NUM" -ge 1 ] ;then - for i in $(seq 1 $UDP_REDIR_SERVER_NUM) - do + + if [ "$UDP_REDIR_SERVER_NUM" -ge 1 ]; then + for i in $(seq 1 $UDP_REDIR_SERVER_NUM); do local k=$i local local_port=104$k local ttl=14$k @@ -377,7 +372,7 @@ EOF temp_server=$UDP_REDIR_SERVER } # 生成UDP转发规则 - if [ "$temp_server" != "nil" ];then + 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) @@ -389,43 +384,42 @@ EOF #$iptables_mangle -I SS_ACL$k 1 -p udp -m set --match-set $IPSET_BLACKLIST dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 # 全局模式 $iptables_mangle -A SS_GLO$k -p udp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 - + # GFWLIST模式 $iptables_mangle -A SS_GFW$k -p udp -m set --match-set $IPSET_GFW dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 $iptables_mangle -A SS_GFW$k -p udp -m set --match-set $IPSET_ROUTER dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 - + # 大陆白名单模式 $iptables_mangle -A SS_CHN$k -p udp -m set --match-set $IPSET_CHN dst -j RETURN $iptables_mangle -A SS_CHN$k -p udp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 - + # 回国模式 $iptables_mangle -A SS_HOME$k -p udp -m set --match-set $IPSET_CHN dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 - + # 游戏模式 $iptables_mangle -A SS_GAME$k -p udp -m set --match-set $IPSET_CHN dst -j RETURN $iptables_mangle -A SS_GAME$k -p udp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1 - + echolog "IPv4 防火墙UDP转发规则加载完成！" fi done else - echolog "UDP服务器未选择，无法转发UDP！" + echolog "UDP服务器未选择，无法转发UDP！" fi - + $iptables_mangle -A PREROUTING -j SS $iptables_mangle -A SS -j SS_ACL - + 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 + 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 + 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 @@ -433,15 +427,14 @@ EOF [ "$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段 + + 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 + for ip in $lan_ipv6; do $ip6tables_nat -A SS -d $ip -j RETURN done } @@ -453,7 +446,7 @@ EOF $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防火墙规则加载完成！" + echolog "IPv6防火墙规则加载完成！" fi done fi @@ -461,79 +454,73 @@ EOF del_firewall_rule() { echolog "删除所有防火墙规则..." - ipv4_output_exist=`$iptables_nat -L OUTPUT 2>/dev/null | grep -c -E "SS|$TCP_REDIR_PORTS|$IPSET_LANIPLIST|$IPSET_VPSIPLIST|$IPSET_WHITELIST|$IPSET_ROUTER|$IPSET_BLACKLIST|$IPSET_GFW|$IPSET_CHN"` + ipv4_output_exist=$($iptables_nat -L OUTPUT 2>/dev/null | grep -c -E "PassWall") [ -n "$ipv4_output_exist" ] && { - until [ "$ipv4_output_exist" = 0 ] - do - rules=`$iptables_nat -L OUTPUT --line-numbers | grep -E "SS|$TCP_REDIR_PORTS|$IPSET_LANIPLIST|$IPSET_VPSIPLIST|$IPSET_WHITELIST|$IPSET_ROUTER|$IPSET_BLACKLIST|$IPSET_GFW|$IPSET_CHN" | awk '{print $1}'` - for rule in $rules - do - $iptables_nat -D OUTPUT $rule 2> /dev/null + until [ "$ipv4_output_exist" = 0 ]; do + rules=$($iptables_nat -L OUTPUT --line-numbers | grep -E "PassWall" | awk '{print $1}') + for rule in $rules; do + $iptables_nat -D OUTPUT $rule 2>/dev/null break done - ipv4_output_exist=`expr $ipv4_output_exist - 1` + ipv4_output_exist=$(expr $ipv4_output_exist - 1) done } - - ipv6_output_ss_exist=`$ip6tables_nat -L OUTPUT 2>/dev/null | grep -c "SS"` + + ipv6_output_ss_exist=$($ip6tables_nat -L OUTPUT 2>/dev/null | grep -c "SS") [ -n "$ipv6_output_ss_exist" ] && { - until [ "$ipv6_output_ss_exist" = 0 ] - do - rules=`$ip6tables_nat -L OUTPUT --line-numbers | grep "SS" | awk '{print $1}'` - for rule in $rules - do - $ip6tables_nat -D OUTPUT $rule 2> /dev/null + until [ "$ipv6_output_ss_exist" = 0 ]; do + rules=$($ip6tables_nat -L OUTPUT --line-numbers | grep "SS" | awk '{print $1}') + for rule in $rules; do + $ip6tables_nat -D OUTPUT $rule 2>/dev/null break done - ipv6_output_ss_exist=`expr $ipv6_output_ss_exist - 1` + ipv6_output_ss_exist=$(expr $ipv6_output_ss_exist - 1) done } - + $iptables_mangle -D PREROUTING -p tcp -m socket -j MARK --set-mark 1 2>/dev/null $iptables_mangle -D PREROUTING -p udp -m socket -j MARK --set-mark 1 2>/dev/null $iptables_mangle -D OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_ROUTER dst -j MARK --set-mark 1 2>/dev/null $iptables_mangle -D OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_GFW dst -j MARK --set-mark 1 2>/dev/null $iptables_mangle -D OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -j MARK --set-mark 1 2>/dev/null - - $iptables_nat -D PREROUTING -j SS 2> /dev/null + + $iptables_nat -D PREROUTING -j SS 2>/dev/null $iptables_nat -F SS 2>/dev/null && $iptables_nat -X SS 2>/dev/null $iptables_mangle -D PREROUTING -j SS$k 2>/dev/null $iptables_mangle -F SS 2>/dev/null && $iptables_mangle -X SS 2>/dev/null $iptables_mangle -F SS_ACL 2>/dev/null && $iptables_mangle -X SS_ACL 2>/dev/null - + $ip6tables_nat -D PREROUTING -j SS 2>/dev/null $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=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 + if [ "$max_num" -ge 1 ]; then + for i in $(seq 1 $max_num); do local k=$i $iptables_mangle -F SS_GLO$k 2>/dev/null && $iptables_mangle -X SS_GLO$k 2>/dev/null $iptables_mangle -F SS_GFW$k 2>/dev/null && $iptables_mangle -X SS_GFW$k 2>/dev/null $iptables_mangle -F SS_CHN$k 2>/dev/null && $iptables_mangle -X SS_CHN$k 2>/dev/null $iptables_mangle -F SS_GAME$k 2>/dev/null && $iptables_mangle -X SS_GAME$k 2>/dev/null $iptables_mangle -F SS_HOME$k 2>/dev/null && $iptables_mangle -X SS_HOME$k 2>/dev/null - + $ip6tables_nat -F SS_GLO$k 2>/dev/null && $ip6tables_nat -X SS_GLO$k 2>/dev/null $ip6tables_nat -F SS_GFW$k 2>/dev/null && $ip6tables_nat -X SS_GFW$k 2>/dev/null $ip6tables_nat -F SS_CHN$k 2>/dev/null && $ip6tables_nat -X SS_CHN$k 2>/dev/null $ip6tables_nat -F SS_HOME$k 2>/dev/null && $ip6tables_nat -X SS_HOME$k 2>/dev/null - - ip_rule_exist=`ip rule show | grep "from all fwmark 0x1 lookup 100" | grep -c 100` - if [ ! -z "$ip_rule_exist" ];then - until [ "$ip_rule_exist" = 0 ] - do + + ip_rule_exist=$(ip rule show | grep "from all fwmark 0x1 lookup 100" | grep -c 100) + if [ ! -z "$ip_rule_exist" ]; then + until [ "$ip_rule_exist" = 0 ]; do ip rule del fwmark 1 lookup 100 - ip_rule_exist=`expr $ip_rule_exist - 1` + ip_rule_exist=$(expr $ip_rule_exist - 1) done fi ip route del local 0.0.0.0/0 dev lo table 100 2>/dev/null done fi - + ipset -F $IPSET_ROUTER >/dev/null 2>&1 && ipset -X $IPSET_ROUTER >/dev/null 2>&1 & ipset -F $IPSET_GFW >/dev/null 2>&1 && ipset -X $IPSET_GFW >/dev/null 2>&1 & #ipset -F $IPSET_CHN >/dev/null 2>&1 && ipset -X $IPSET_CHN >/dev/null 2>&1 & @@ -543,12 +530,12 @@ del_firewall_rule() { ipset -F $IPSET_LANIPLIST >/dev/null 2>&1 && ipset -X $IPSET_LANIPLIST >/dev/null 2>&1 & } -start(){ +start() { add_firewall_rule dns_hijack } -stop(){ +stop() { del_firewall_rule } @@ -559,5 +546,5 @@ stop) start) start ;; -*) -esac \ No newline at end of file +*) ;; +esac 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 new file mode 100644 index 0000000000..ab2b87c679 --- /dev/null +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/monitor.sh @@ -0,0 +1,77 @@ +#!/bin/sh + +CONFIG=passwall +CONFIG_PATH=/var/etc/$CONFIG + +uci_get_by_name() { + local ret=$(uci get $CONFIG.$1.$2 2>/dev/null) + echo ${ret:=$3} +} + +uci_get_by_type() { + local ret=$(uci get $CONFIG.@$1[0].$2 2>/dev/null) + echo ${ret:=$3} +} + +TCP_REDIR_SERVER=$(uci_get_by_type global tcp_redir_server nil) +TCP_REDIR_PORT=$(uci_get_by_type global_proxy tcp_redir_port nil) +UDP_REDIR_SERVER=$(uci_get_by_type global udp_redir_server nil) +UDP_REDIR_PORT=$(uci_get_by_type global_proxy udp_redir_port nil) +[ "$UDP_REDIR_SERVER" == "default" ] && UDP_REDIR_SERVER=$TCP_REDIR_SERVER +SOCKS5_PROXY_SERVER=$(uci_get_by_type global socks5_proxy_server nil) +dns_mode=$(uci_get_by_type global dns_mode) +use_haproxy=$(uci_get_by_type global_haproxy balancing_enable 0) +use_kcp=$(uci_get_by_name $TCP_REDIR_SERVER use_kcp 0) +kcp_port=$(uci_get_by_type global_proxy kcptun_port 11183) + +#tcp +if [ $TCP_REDIR_SERVER != "nil" ]; then + icount=$(ps -w | grep -i -E "ss-redir|ssr-redir|v2ray|brook tproxy -l 0.0.0.0:$TCP_REDIR_PORT" | grep $CONFIG_PATH/TCP.json | grep -v grep | wc -l) + if [ $icount = 0 ]; then + /etc/init.d/passwall restart + exit 0 + fi +fi + +#udp +if [ $UDP_REDIR_SERVER != "nil" ]; then + icount=$(ps -w | grep -i -E "ss-redir|ssr-redir|v2ray|brook tproxy -l 0.0.0.0:$UDP_REDIR_PORT" | grep $CONFIG_PATH/UDP.json | grep -v grep | wc -l) + if [ $icount = 0 ]; then + /etc/init.d/passwall restart + exit 0 + fi +fi + +#socks5 +if [ $SOCKS5_PROXY_SERVER != "nil" ]; then + icount=$(ps -w | grep -i -E "ss-redir|ssr-redir|v2ray|brook client" | grep $CONFIG_PATH/SOCKS5.json | grep -v grep | wc -l) + if [ $icount = 0 ]; then + /etc/init.d/passwall restart + exit 0 + fi +fi + +#dns +icount=$(netstat -apn | grep 7913 | wc -l) +if [ $icount = 0 ]; then + /etc/init.d/passwall restart + exit 0 +fi + +#kcptun +if [ $use_kcp -gt 0 ]; then + icount=$(ps -w | grep kcptun_client | grep $kcp_port | grep -v grep | wc -l) + if [ $icount = 0 ]; then + /etc/init.d/passwall restart + exit 0 + fi +fi + +#haproxy +if [ $use_haproxy -gt 0 ]; then + icount=$(ps -w | grep haproxy | grep $CONFIG_PATH/haproxy.cfg | grep -v grep | wc -l) + if [ $icount = 0 ]; then + /etc/init.d/passwall restart + exit 0 + fi +fi diff --git a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/blacklist_host b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule/blacklist_host similarity index 66% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/blacklist_host rename to package/lienol/luci-app-passwall/root/usr/share/passwall/rule/blacklist_host index f5c71dd637..9ea3d6783c 100644 --- a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/blacklist_host +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule/blacklist_host @@ -1,3 +1,4 @@ formyip.com myepisodecalendar.com -subhd.com \ No newline at end of file +subhd.com +msi.com \ No newline at end of file diff --git a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/blacklist_ip b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule/blacklist_ip similarity index 100% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/blacklist_ip rename to package/lienol/luci-app-passwall/root/usr/share/passwall/rule/blacklist_ip diff --git a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/chnroute b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule/chnroute similarity index 98% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/chnroute rename to package/lienol/luci-app-passwall/root/usr/share/passwall/rule/chnroute index 4132e8c4c5..a96d23f752 100644 --- a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/chnroute +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule/chnroute @@ -71,12 +71,9 @@ 1.202.0.0/15 1.204.0.0/14 8.128.0.0/10 -8.208.64.0/18 -8.209.0.0/21 -8.209.8.0/23 -8.209.12.0/22 -8.209.16.0/20 -8.209.32.0/19 +8.209.36.0/22 +8.209.40.0/21 +8.209.48.0/20 8.209.128.0/17 8.210.0.0/15 8.212.0.0/14 @@ -102,7 +99,6 @@ 14.208.0.0/12 20.134.160.0/20 20.139.160.0/20 -23.48.214.0/24 27.0.128.0/21 27.0.160.0/21 27.0.188.0/22 @@ -313,7 +309,6 @@ 43.224.44.0/22 43.224.52.0/22 43.224.56.0/22 -43.224.64.0/24 43.224.68.0/22 43.224.72.0/22 43.224.80.0/22 @@ -573,12 +568,12 @@ 43.255.224.0/21 43.255.232.0/22 43.255.244.0/22 -45.12.227.0/24 45.40.192.0/20 45.40.208.0/21 45.40.224.0/19 45.65.16.0/20 -45.94.120.0/22 +45.85.196.0/22 +45.88.101.0/24 45.112.132.0/22 45.112.188.0/22 45.112.208.0/22 @@ -600,7 +595,6 @@ 45.113.252.0/22 45.114.0.0/22 45.114.32.0/22 -45.114.40.0/22 45.114.52.0/22 45.114.96.0/22 45.114.136.0/22 @@ -712,7 +706,11 @@ 45.127.128.0/22 45.127.144.0/21 45.127.156.0/22 +45.133.148.0/22 45.136.44.0/24 +45.136.46.0/24 +45.136.180.0/22 +45.138.160.0/22 45.248.8.0/22 45.248.80.0/22 45.248.88.0/22 @@ -785,7 +783,9 @@ 45.253.136.0/21 45.253.144.0/20 45.253.160.0/19 -45.253.192.0/18 +45.253.192.0/19 +45.253.224.0/20 +45.253.240.0/22 45.254.0.0/20 45.254.16.0/21 45.254.28.0/22 @@ -1316,7 +1316,6 @@ 103.42.76.0/22 103.42.232.0/22 103.43.26.0/23 -103.43.86.0/23 103.43.96.0/21 103.43.104.0/22 103.43.124.0/22 @@ -1326,7 +1325,6 @@ 103.43.220.0/22 103.43.224.0/22 103.43.240.0/22 -103.44.56.0/24 103.44.58.0/23 103.44.80.0/22 103.44.120.0/21 @@ -1465,7 +1463,7 @@ 103.60.164.0/22 103.60.228.0/22 103.60.236.0/22 -103.61.60.0/22 +103.61.60.0/24 103.61.104.0/22 103.61.140.0/22 103.61.152.0/21 @@ -1557,7 +1555,8 @@ 103.72.16.0/20 103.72.32.0/20 103.72.48.0/21 -103.72.112.0/20 +103.72.112.0/21 +103.72.124.0/22 103.72.128.0/21 103.72.149.0/24 103.72.150.0/23 @@ -1945,8 +1944,6 @@ 103.118.72.0/22 103.118.88.0/22 103.118.173.0/24 -103.119.104.0/23 -103.119.106.0/24 103.119.115.0/24 103.119.156.0/22 103.119.180.0/22 @@ -1988,7 +1985,7 @@ 103.125.196.0/22 103.125.236.0/22 103.126.0.0/22 -103.126.16.0/22 +103.126.16.0/23 103.126.44.0/22 103.126.124.0/22 103.126.128.0/22 @@ -2015,8 +2012,6 @@ 103.133.12.0/22 103.133.40.0/22 103.133.128.0/22 -103.133.136.0/23 -103.133.138.0/24 103.133.232.0/22 103.134.196.0/22 103.135.80.0/22 @@ -2037,7 +2032,6 @@ 103.137.180.0/22 103.137.236.0/22 103.138.2.0/23 -103.138.13.0/24 103.138.81.0/24 103.138.82.0/23 103.138.134.0/23 @@ -2055,15 +2049,35 @@ 103.140.70.0/23 103.140.140.0/23 103.140.144.0/23 -103.140.152.0/23 103.140.192.0/23 103.140.228.0/23 103.141.10.0/23 103.141.58.0/23 103.141.128.0/23 103.141.186.0/23 -103.141.190.0/23 103.141.242.0/23 +103.142.0.0/23 +103.142.28.0/23 +103.142.58.0/23 +103.142.82.0/23 +103.142.96.0/23 +103.142.122.0/23 +103.142.128.0/23 +103.142.140.0/24 +103.142.154.0/23 +103.142.156.0/23 +103.142.180.0/23 +103.142.186.0/23 +103.142.190.0/23 +103.142.220.0/23 +103.142.230.0/24 +103.142.234.0/23 +103.142.238.0/23 +103.143.16.0/22 +103.143.31.0/24 +103.143.74.0/23 +103.143.174.0/23 +103.143.228.0/23 103.192.0.0/19 103.192.48.0/21 103.192.56.0/22 @@ -2229,7 +2243,6 @@ 103.212.164.0/22 103.212.196.0/22 103.212.200.0/22 -103.212.230.0/23 103.212.252.0/22 103.213.40.0/21 103.213.48.0/20 @@ -2299,9 +2312,8 @@ 103.220.200.0/22 103.220.240.0/20 103.221.0.0/19 -103.221.32.0/20 -103.221.48.0/22 -103.221.88.0/21 +103.221.32.0/22 +103.221.88.0/22 103.221.96.0/19 103.221.128.0/18 103.221.192.0/20 @@ -2391,7 +2403,6 @@ 103.231.244.0/22 103.232.4.0/22 103.232.144.0/22 -103.232.213.0/24 103.233.4.0/22 103.233.44.0/22 103.233.52.0/22 @@ -2922,7 +2933,13 @@ 116.196.16.0/20 116.196.32.0/19 116.196.64.0/18 -116.196.128.0/17 +116.196.128.0/18 +116.196.192.0/21 +116.196.200.0/23 +116.196.203.0/24 +116.196.204.0/22 +116.196.208.0/20 +116.196.224.0/19 116.197.160.0/21 116.197.180.0/23 116.198.0.0/16 @@ -3005,7 +3022,6 @@ 117.128.0.0/10 118.24.0.0/15 118.26.0.0/19 -118.26.34.0/23 118.26.36.0/22 118.26.40.0/21 118.26.48.0/20 @@ -3071,7 +3087,10 @@ 118.191.24.0/21 118.191.32.0/19 118.191.64.0/18 -118.191.144.0/20 +118.191.144.0/21 +118.191.153.0/24 +118.191.154.0/23 +118.191.156.0/22 118.191.160.0/19 118.191.192.0/20 118.191.209.0/24 @@ -3228,21 +3247,13 @@ 120.90.0.0/15 120.92.0.0/17 120.92.128.0/18 -120.92.194.0/23 +120.92.192.0/22 120.92.198.0/23 120.92.200.0/21 120.92.208.0/20 120.92.224.0/19 120.94.0.0/15 -120.128.0.0/14 -120.132.0.0/17 -120.132.128.0/18 -120.132.192.0/19 -120.132.224.0/21 -120.132.232.0/22 -120.132.240.0/20 -120.133.0.0/16 -120.134.0.0/15 +120.128.0.0/13 120.136.16.0/21 120.136.128.0/18 120.137.0.0/17 @@ -3361,7 +3372,6 @@ 123.0.160.0/19 123.4.0.0/14 123.8.0.0/13 -123.49.129.0/24 123.49.130.0/23 123.49.132.0/22 123.49.136.0/22 @@ -3454,7 +3464,24 @@ 124.108.8.0/21 124.108.40.0/21 124.109.96.0/21 -124.112.0.0/13 +124.112.0.0/14 +124.116.0.0/15 +124.118.0.0/16 +124.119.0.0/17 +124.119.128.0/18 +124.119.192.0/19 +124.119.224.0/20 +124.119.240.0/22 +124.119.244.0/23 +124.119.246.0/25 +124.119.246.128/26 +124.119.246.192/27 +124.119.246.224/28 +124.119.246.240/29 +124.119.246.248/30 +124.119.246.254/31 +124.119.247.0/24 +124.119.248.0/21 124.126.0.0/15 124.128.0.0/13 124.147.128.0/17 @@ -3474,12 +3501,7 @@ 124.243.192.0/18 124.248.0.0/17 124.249.0.0/16 -124.250.0.0/17 -124.250.136.0/21 -124.250.144.0/20 -124.250.160.0/19 -124.250.192.0/18 -124.251.0.0/16 +124.250.0.0/15 124.254.0.0/18 125.31.192.0/18 125.32.0.0/12 @@ -3510,15 +3532,10 @@ 129.204.0.0/16 129.211.0.0/16 129.223.254.0/24 -129.227.0.0/20 -129.227.32.0/19 -129.227.64.0/18 -129.227.128.0/23 -129.227.132.0/22 -129.227.136.0/21 -129.227.144.0/20 -129.227.160.0/19 -129.227.192.0/18 +129.227.98.0/23 +129.227.100.0/22 +129.227.104.0/21 +129.227.112.0/20 130.214.218.0/23 131.228.96.0/24 131.253.12.0/29 @@ -3657,6 +3674,7 @@ 150.129.192.0/22 150.129.252.0/22 150.138.0.0/15 +150.158.0.0/16 150.222.88.0/23 150.223.0.0/16 150.242.0.0/21 @@ -3683,10 +3701,11 @@ 150.242.248.0/22 150.255.0.0/16 152.32.178.0/23 -152.32.205.0/24 -152.32.206.0/23 -152.32.208.0/20 -152.32.224.0/19 +152.32.225.0/24 +152.32.226.0/23 +152.32.228.0/22 +152.32.232.0/21 +152.32.240.0/20 152.104.128.0/17 152.136.0.0/16 153.0.0.0/16 @@ -3697,6 +3716,7 @@ 153.101.0.0/16 153.118.0.0/15 154.8.128.0/17 +155.126.176.0/23 156.107.160.0/24 156.107.170.0/24 156.154.62.0/23 @@ -3771,6 +3791,7 @@ 163.179.0.0/16 163.204.0.0/16 163.244.246.0/24 +164.52.80.0/24 165.156.30.0/24 166.111.0.0/16 167.139.0.0/16 @@ -3786,6 +3807,7 @@ 170.225.224.0/23 170.252.152.0/21 171.8.0.0/13 +171.22.147.0/24 171.34.0.0/15 171.36.0.0/14 171.40.0.0/13 @@ -3794,6 +3816,7 @@ 171.112.0.0/12 171.208.0.0/12 172.81.192.0/18 +173.39.200.0/23 175.0.0.0/12 175.16.0.0/13 175.24.0.0/14 @@ -3868,7 +3891,12 @@ 180.210.236.0/22 180.212.0.0/15 180.222.224.0/19 -180.223.0.0/18 +180.223.0.0/19 +180.223.32.0/20 +180.223.48.0/21 +180.223.57.0/24 +180.223.58.0/23 +180.223.60.0/22 180.223.80.0/20 180.223.96.0/19 180.223.128.0/17 @@ -3934,6 +3962,9 @@ 183.184.0.0/13 183.192.0.0/10 185.109.236.0/24 +185.203.36.0/22 +185.223.134.0/23 +185.224.116.0/22 188.131.128.0/17 192.11.23.0/24 192.11.26.0/24 @@ -3957,6 +3988,7 @@ 192.144.128.0/17 192.163.11.0/24 192.232.97.0/24 +193.17.120.0/22 193.20.64.0/22 193.112.0.0/16 194.138.136.0/24 @@ -4085,6 +4117,7 @@ 202.27.12.0/24 202.27.14.0/24 202.27.136.0/23 +202.30.124.0/24 202.36.226.0/24 202.38.0.0/22 202.38.8.0/21 @@ -4225,7 +4258,6 @@ 202.84.24.0/21 202.85.208.0/20 202.86.249.0/24 -202.86.252.0/22 202.87.80.0/20 202.88.32.0/22 202.89.8.0/21 @@ -4349,8 +4381,7 @@ 202.162.75.0/24 202.164.0.0/20 202.164.96.0/19 -202.165.96.0/21 -202.165.104.0/22 +202.165.96.0/22 202.165.176.0/20 202.165.208.0/20 202.165.239.0/24 @@ -4732,7 +4763,9 @@ 203.20.122.0/24 203.20.126.0/23 203.20.135.0/24 -203.20.136.0/21 +203.20.137.0/24 +203.20.138.0/23 +203.20.140.0/22 203.20.150.0/24 203.20.230.0/24 203.20.232.0/24 @@ -5567,12 +5600,10 @@ 220.242.124.0/23 220.242.126.0/24 220.242.173.0/24 -220.242.196.0/23 +220.242.197.0/24 220.242.205.0/24 220.242.206.0/23 -220.242.209.0/24 -220.242.210.0/23 -220.242.212.0/22 +220.242.214.0/23 220.242.216.0/21 220.242.224.0/19 220.243.0.0/17 diff --git a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/router b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule/router similarity index 92% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/router rename to package/lienol/luci-app-passwall/root/usr/share/passwall/rule/router index 696c35a498..20ad64dfcc 100644 --- a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/router +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule/router @@ -5,3 +5,4 @@ github-production-release-asset-2e65be.s3.amazonaws.com openwrt.proxy.ustclug.org easylist-downloads.adblockplus.org adblockplus.org +caddyserver.com \ No newline at end of file diff --git a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/whitelist_host b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule/whitelist_host similarity index 100% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/whitelist_host rename to package/lienol/luci-app-passwall/root/usr/share/passwall/rule/whitelist_host diff --git a/package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/whitelist_ip b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule/whitelist_ip similarity index 100% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/rule/whitelist_ip rename to package/lienol/luci-app-passwall/root/usr/share/passwall/rule/whitelist_ip diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh new file mode 100644 index 0000000000..096d2b468c --- /dev/null +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh @@ -0,0 +1,223 @@ +#!/bin/sh + +CONFIG=passwall +LOG_FILE=/var/log/$CONFIG.log +url_main="https://raw.githubusercontent.com/hq450/fancyss/master/rules" +SS_PATH=/usr/share/$CONFIG +DNSMASQ_PATH=$SS_PATH/dnsmasq.d +RULE_PATH=$SS_PATH/rule +Date=$(date "+%Y-%m-%d %H:%M:%S") + +update=$1 +gfwlist_update=0 +chnroute_update=0 +Pcap_Routing_update=0 +Pcap_WhiteList_update=0 +if [ -n "$update" ]; then + [ -n "$(echo $update | grep "gfwlist_update")" ] && gfwlist_update=1 + [ -n "$(echo $update | grep "chnroute_update")" ] && chnroute_update=1 + [ -n "$(echo $update | grep "Pcap_Routing_update")" ] && Pcap_Routing_update=1 + [ -n "$(echo $update | grep "Pcap_WhiteList_update")" ] && Pcap_WhiteList_update=1 +else + gfwlist_update=$(uci get $CONFIG.@global_rules[0].gfwlist_update) + chnroute_update=$(uci get $CONFIG.@global_rules[0].chnroute_update) + Pcap_Routing_update=$(uci get $CONFIG.@global_rules[0].Pcap_Routing_update) + Pcap_WhiteList_update=$(uci get $CONFIG.@global_rules[0].Pcap_WhiteList_update) +fi + +if [ "$gfwlist_update" == 0 -a "$chnroute_update" == 0 -a "$Pcap_Routing_update" == 0 -a "$Pcap_WhiteList_update" == 0 ]; then + exit +fi + +uci_get_by_type() { + local index=0 + if [ -n $4 ]; then + index=$4 + fi + local ret=$(uci get $CONFIG.@$1[$index].$2 2>/dev/null) + echo ${ret:=$3} +} + +# detect ss version +#ss_basic_version_web1=`curl -s https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/shadowsocks/version | sed -n 1p` + +# rule update +echo $Date: 开始更新规则，请等待... >$LOG_FILE +#wget -q --no-check-certificate --timeout=15 https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/version1 -O /tmp/version1 +#旧接口https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/version1 +status1=$(curl -w %{http_code} --connect-timeout 10 $url_main/version1 --silent -o /tmp/version1) +if [ -z "$status1" ] || [ "$status1" == "404" ]; then + echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE + exit +fi +online_content=$(cat /tmp/version1 2>/dev/null) +if [ -z "$online_content" ]; then + rm -rf /tmp/version1 + echo $Date: 没有检测到在线版本，可能是访问github有问题，去大陆白名单模式试试吧！ >>$LOG_FILE + exit +fi + +# update gfwlist +if [ "$gfwlist_update" == 1 ]; then + gfwlist=$(cat /tmp/version1 | sed -n 1p) + version_gfwlist2=$(echo $gfwlist | sed 's/ /\n/g' | sed -n 1p) + md5sum_gfwlist2=$(echo $gfwlist | sed 's/ /\n/g' | tail -n 2 | head -n 1) + local_md5sum_gfwlist=$(md5sum $DNSMASQ_PATH/gfwlist.conf | awk '{print $1}') + if [ ! -z "$version_gfwlist2" ]; then + version_gfwlist1=$(uci_get_by_type global_rules gfwlist_version) + if [ "$version_gfwlist1" != "$version_gfwlist2" -o "$md5sum_gfwlist2" != "$local_md5sum_gfwlist" ]; then + echo $Date: 检测到新版本gfwlist，开始更新... >>$LOG_FILE + echo $Date: 下载gfwlist到临时文件... >>$LOG_FILE + #wget --no-check-certificate --timeout=15 -q https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/gfwlist.conf -O /tmp/gfwlist.conf + #旧接口https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/gfwlist.conf + status2=$(curl -w %{http_code} --connect-timeout 10 $url_main/gfwlist.conf --silent -o /tmp/gfwlist.conf) + if [ -z "$status2" ] || [ "$status2" == "404" ]; then + echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE + exit + fi + md5sum_gfwlist1=$(md5sum /tmp/gfwlist.conf | sed 's/ /\n/g' | sed -n 1p) + if [ "$md5sum_gfwlist1"x = "$md5sum_gfwlist2"x ]; then + echo $Date: 下载完成，校验通过，将临时文件覆盖到原始gfwlist文件 >>$LOG_FILE + mv /tmp/gfwlist.conf $DNSMASQ_PATH/gfwlist.conf + uci set $CONFIG.@global_rules[0].gfwlist_version=$version_gfwlist2 + rm -rf /tmp/dnsmasq.d/gfwlist.conf + reboot="1" + echo $Date: 你的gfwlist已经更新到最新了哦~ >>$LOG_FILE + else + echo $Date: 下载完成，但是校验没有通过！ >>$LOG_FILE + fi + else + echo $Date: 检测到gfwlist本地版本号和在线版本号相同，不用更新! >>$LOG_FILE + fi + else + echo $Date: gfwlist文件下载失败！ >>$LOG_FILE + fi + rm -rf /tmp/gfwlist.conf +fi + +# update chnroute +if [ "$chnroute_update" == 1 ]; then + chnroute=$(cat /tmp/version1 | sed -n 2p) + version_chnroute2=$(echo $chnroute | sed 's/ /\n/g' | sed -n 1p) + md5sum_chnroute2=$(echo $chnroute | sed 's/ /\n/g' | tail -n 2 | head -n 1) + local_md5sum_chnroute=$(md5sum $RULE_PATH/chnroute | awk '{print $1}') + if [ ! -z "$version_chnroute2" ]; then + version_chnroute1=$(uci_get_by_type global_rules chnroute_version) + if [ "$version_chnroute1" != "$version_chnroute2" -o "$md5sum_chnroute2" != "$local_md5sum_chnroute" ]; then + echo $Date: 检测到新版本chnroute，开始更新... >>$LOG_FILE + echo $Date: 下载chnroute到临时文件... >>$LOG_FILE + #wget --no-check-certificate --timeout=15 -q https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/chnroute.txt -O /tmp/chnroute + #旧接口https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/chnroute.txt + status3=$(curl -w %{http_code} --connect-timeout 10 $url_main/chnroute.txt --silent -o /tmp/chnroute) + if [ -z "$status3" ] || [ "$status3" == "404" ]; then + echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE + exit + fi + md5sum_chnroute1=$(md5sum /tmp/chnroute | sed 's/ /\n/g' | sed -n 1p) + if [ "$md5sum_chnroute1"x = "$md5sum_chnroute2"x ]; then + echo $Date: 下载完成，校验通过，将临时文件覆盖到原始chnroute文件 >>$LOG_FILE + mv /tmp/chnroute $RULE_PATH/chnroute + uci set $CONFIG.@global_rules[0].chnroute_version=$version_chnroute2 + ipset flush chnroute + ipset destroy chnroute + reboot="1" + echo $Date: 你的chnroute已经更新到最新了哦~ >>$LOG_FILE + else + echo $Date: 下载完成，但是校验没有通过！ >>$LOG_FILE + fi + else + echo $Date: 检测到chnroute本地版本号和在线版本号相同，不用更新! >>$LOG_FILE + fi + else + echo $Date: chnroute文件下载失败！ >>$LOG_FILE + fi + rm -rf /tmp/chnroute +fi + +# update Routing +if [ "$Pcap_Routing_update" == 1 ]; then + Routing=$(cat /tmp/version1 | sed -n 5p) + version_Routing2=$(echo $Routing | sed 's/ /\n/g' | sed -n 1p) + md5sum_Routing2=$(echo $Routing | sed 's/ /\n/g' | tail -n 2 | head -n 1) + local_md5sum_Routing=$(md5sum /etc/pcap-dnsproxy/Routing.txt | awk '{print $1}') + if [ ! -z "$version_Routing2" ]; then + version_Routing1=$(uci_get_by_type global_rules pcap_Routing_version) + if [ "$version_Routing1" != "$version_Routing2" -o "$md5sum_Routing2" != "$local_md5sum_Routing" ]; then + echo $Date: 检测到新版本Routing，开始更新... >>$LOG_FILE + echo $Date: 下载Routing到临时文件... >>$LOG_FILE + status4=$(curl -w %{http_code} --connect-timeout 10 $url_main/Routing.txt --silent -o /tmp/Routing.txt) + if [ -z "$status4" ] || [ "$status4" == "404" ]; then + echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE + exit + fi + md5sum_Routing1=$(md5sum /tmp/Routing.txt | sed 's/ /\n/g' | sed -n 1p) + if [ "$md5sum_Routing1"x = "$md5sum_Routing2"x ]; then + echo $Date: 下载完成，校验通过，将临时文件覆盖到原始Routing文件 >>$LOG_FILE + mkdir -p /etc/pcap-dnsproxy + mv /tmp/Routing.txt /etc/pcap-dnsproxy/Routing.txt + uci set $CONFIG.@global_rules[0].pcap_Routing_version=$version_Routing2 + reboot="1" + echo $Date: 你的Routing已经更新到最新了哦~ >>$LOG_FILE + else + echo $Date: 下载完成，但是校验没有通过！ >>$LOG_FILE + fi + else + echo $Date: 检测到Routing本地版本号和在线版本号相同，不用更新! >>$LOG_FILE + fi + else + echo $Date: Routing文件下载失败！ >>$LOG_FILE + fi + rm -rf /tmp/Routing.txt +fi + +# update WhiteList +if [ "$Pcap_WhiteList_update" == 1 ]; then + WhiteList=$(cat /tmp/version1 | sed -n 7p) + version_WhiteList2=$(echo $WhiteList | sed 's/ /\n/g' | sed -n 1p) + md5sum_WhiteList2=$(echo $WhiteList | sed 's/ /\n/g' | tail -n 2 | head -n 1) + local_md5sum_WhiteList=$(md5sum /etc/pcap-dnsproxy/WhiteList.txt | awk '{print $1}') + if [ ! -z "$version_WhiteList2" ]; then + version_WhiteList1=$(uci_get_by_type global_rules pcap_WhiteList_version) + if [ "$version_WhiteList1" != "$version_WhiteList2" -o "$md5sum_WhiteList2" != "$local_md5sum_WhiteList" ]; then + echo $Date: 检测到新版本WhiteList，开始更新... >>$LOG_FILE + echo $Date: 下载WhiteList到临时文件... >>$LOG_FILE + status4=$(curl -w %{http_code} --connect-timeout 10 $url_main/WhiteList_new.txt --silent -o /tmp/WhiteList.txt) + if [ -z "$status4" ] || [ "$status4" == "404" ]; then + echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE + exit + fi + #wget --no-check-certificate --timeout=10 -qO - $url_main/WhiteList_new.txt > /tmp/WhiteList.txt + md5sum_WhiteList1=$(md5sum /tmp/WhiteList.txt | sed 's/ /\n/g' | sed -n 1p) + if [ "$md5sum_WhiteList1"x = "$md5sum_WhiteList2"x ]; then + echo $Date: 下载完成，校验通过，将临时文件覆盖到原始WhiteList文件 >>$LOG_FILE + mkdir -p /etc/pcap-dnsproxy + mv /tmp/WhiteList.txt /etc/pcap-dnsproxy/WhiteList.txt + uci set $CONFIG.@global_rules[0].pcap_WhiteList_version=$version_WhiteList2 + reboot="1" + echo $Date: 你的WhiteList已经更新到最新了哦~ >>$LOG_FILE + else + echo $Date: 下载完成，但是校验没有通过！ >>$LOG_FILE + fi + else + echo $Date: 检测到WhiteList本地版本号和在线版本号相同，不用更新! >>$LOG_FILE + fi + else + echo $Date: WhiteList文件下载失败！ >>$LOG_FILE + fi + rm -rf /tmp/WhiteList.txt +fi + +echo $Date: 更新进程运行完毕！ >>$LOG_FILE +rm -rf /tmp/version1 +# write number +uci set $CONFIG.@global_rules[0].gfwlist_update=$gfwlist_update +uci set $CONFIG.@global_rules[0].chnroute_update=$chnroute_update +uci set $CONFIG.@global_rules[0].Pcap_Routing_update=$Pcap_Routing_update +uci set $CONFIG.@global_rules[0].Pcap_WhiteList_update=$Pcap_WhiteList_update +uci commit +# reboot ss +if [ "$reboot" == "1" ]; then + echo $Date: 重启软件，以应用新的规则文件！请稍后！ >>$LOG_FILE + /etc/init.d/$CONFIG restart +fi +exit 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 old mode 100755 new mode 100644 similarity index 73% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh rename to package/lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh index f17661ed45..f3e6dd57f8 --- a/package/Lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh @@ -17,19 +17,19 @@ start() { #防止并发开启服务 [ -f "$LOCK_FILE" ] && return 3 touch "$LOCK_FILE" - echo "$Date: 开始执行在线订阅脚本..." >> $LOG_FILE + echo "$Date: 开始执行在线订阅脚本..." >>$LOG_FILE /usr/share/$CONFIG/subscription_ssr.sh start 2>/dev/null /usr/share/$CONFIG/subscription_v2ray.sh start 2>/dev/null - echo "$Date: 在线订阅脚本执行完毕..." >> $LOG_FILE + echo "$Date: 在线订阅脚本执行完毕..." >>$LOG_FILE rm -f "$LOCK_FILE" exit 0 } stop() { - echo "$Date: 开始执行删除所有订阅脚本..." >> $LOG_FILE + echo "$Date: 开始执行删除所有订阅脚本..." >>$LOG_FILE /usr/share/$CONFIG/subscription_ssr.sh stop 2>/dev/null /usr/share/$CONFIG/subscription_v2ray.sh stop 2>/dev/null - echo "$Date: 删除所有订阅脚本执行完毕..." >> $LOG_FILE + echo "$Date: 删除所有订阅脚本执行完毕..." >>$LOG_FILE rm -f "$LOCK_FILE" exit 0 } diff --git a/package/Lienol/luci-app-passwall/root/usr/share/passwall/subscription_ssr.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription_ssr.sh old mode 100755 new mode 100644 similarity index 100% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/subscription_ssr.sh rename to package/lienol/luci-app-passwall/root/usr/share/passwall/subscription_ssr.sh diff --git a/package/Lienol/luci-app-passwall/root/usr/share/passwall/subscription_v2ray.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription_v2ray.sh old mode 100755 new mode 100644 similarity index 100% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/subscription_v2ray.sh rename to package/lienol/luci-app-passwall/root/usr/share/passwall/subscription_v2ray.sh 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 old mode 100755 new mode 100644 similarity index 50% rename from package/Lienol/luci-app-passwall/root/usr/share/passwall/test.sh rename to package/lienol/luci-app-passwall/root/usr/share/passwall/test.sh index 395e36a78e..10065e148b --- a/package/Lienol/luci-app-passwall/root/usr/share/passwall/test.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/test.sh @@ -3,23 +3,23 @@ CONFIG=passwall LOCK_FILE=/var/lock/passwall_test.lock -get_date(){ +get_date() { echo "$(date "+%Y-%m-%d %H:%M:%S")" } -test_url(){ - status=$(curl -I -o /dev/null -s --connect-timeout 5 -w %{http_code} "$1" |grep 200) +test_url() { + status=$(curl -I -o /dev/null -s --connect-timeout 5 -w %{http_code} "$1" | grep 200) echo $status } -test_proxy(){ +test_proxy() { result=0 status=$(test_url "https://www.google.com") - if [ "$status" = "200" ];then + if [ "$status" = "200" ]; then result=0 else status2=$(test_url "https://www.baidu.com") - if [ "$status2" = "200" ];then + if [ "$status2" = "200" ]; then result=1 else result=2 @@ -28,47 +28,45 @@ test_proxy(){ echo $result } -test_auto_switch(){ - if [ -f "/var/etc/passwall/tcp_server_id" ];then - TCP_REDIR_SERVER=`cat /var/etc/passwall/tcp_server_id` +test_auto_switch() { + if [ -f "/var/etc/passwall/tcp_server_id" ]; then + TCP_REDIR_SERVER=$(cat /var/etc/passwall/tcp_server_id) else rm -f $LOCK_FILE exit 1 fi - + failcount=1 - while [ "$failcount" -lt "6" ] - do + while [ "$failcount" -lt "6" ]; do status=$(test_proxy) - if [ "$status" == 2 ];then - echo "$(get_date): 自动切换检测：无法连接到网络，请检查网络是否正常！" >> /var/log/passwall.log + if [ "$status" == 2 ]; then + echo "$(get_date): 自动切换检测：无法连接到网络，请检查网络是否正常！" >>/var/log/passwall.log break - elif [ "$status" == 1 ];then - echo "$(get_date): 自动切换检测：第$failcount次检测异常" >> /var/log/passwall.log + elif [ "$status" == 1 ]; then + echo "$(get_date): 自动切换检测：第$failcount次检测异常" >>/var/log/passwall.log 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_SERVER` + 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_SERVER) setserver= - if [ -z "$has_backup_server" ];then - setserver=`echo $TCP_REDIR_SERVERS | awk -F ' ' '{print $1}'` + if [ -z "$has_backup_server" ]; then + setserver=$(echo $TCP_REDIR_SERVERS | awk -F ' ' '{print $1}') else setserver=$TCP_REDIR_SERVER flag=0 - for server in $has_backup_server - do - if [ "$flag" == 0 ];then - if [ "$TCP_REDIR_SERVER" == "$server" ];then + for server in $has_backup_server; do + if [ "$flag" == 0 ]; then + if [ "$TCP_REDIR_SERVER" == "$server" ]; then flag=1 continue fi fi - if [ "$flag" == 1 ];then + if [ "$flag" == 1 ]; then flag=2 continue fi - if [ "$flag" == 2 ];then + if [ "$flag" == 2 ]; then setserver=$server break fi @@ -81,48 +79,46 @@ test_auto_switch(){ exit 1 } sleep 5s - elif [ "$status" == 0 ];then - echo "$(get_date): 自动切换检测：检测正常" >> /var/log/passwall.log + elif [ "$status" == 0 ]; then + echo "$(get_date): 自动切换检测：检测正常" >>/var/log/passwall.log break fi done } -test_reconnection(){ +test_reconnection() { failcount=1 - while [ "$failcount" -lt "6" ] - do + while [ "$failcount" -lt "6" ]; do status=$(test_proxy) - if [ "$status" == 2 ];then - echo "$(get_date): 掉线重连检测：无法连接到网络，请检查网络是否正常！" >> /var/log/passwall.log + if [ "$status" == 2 ]; then + echo "$(get_date): 掉线重连检测：无法连接到网络，请检查网络是否正常！" >>/var/log/passwall.log break - elif [ "$status" == 1 ];then - echo "$(get_date): 掉线重连检测：第$failcount次检测异常" >> /var/log/passwall.log + elif [ "$status" == 1 ]; then + echo "$(get_date): 掉线重连检测：第$failcount次检测异常" >>/var/log/passwall.log let "failcount++" [ "$failcount" -ge 6 ] && { - echo "$(get_date): 掉线重连检测：检测异常，重启服务" >> /var/log/passwall.log + echo "$(get_date): 掉线重连检测：检测异常，重启服务" >>/var/log/passwall.log rm -f $LOCK_FILE /etc/init.d/passwall restart exit 1 } sleep 5s - elif [ "$status" == 0 ];then - echo "$(get_date): 掉线重连检测：检测正常" >> /var/log/passwall.log + elif [ "$status" == 0 ]; then + echo "$(get_date): 掉线重连检测：检测正常" >>/var/log/passwall.log break fi done } - #防止并发执行 -if [ -f "$LOCK_FILE" ];then - exit 1 +if [ -f "$LOCK_FILE" ]; then + exit 1 else - touch $LOCK_FILE + touch $LOCK_FILE fi -is_auto_switch=`uci show $CONFIG.@auto_switch[0] | grep "tcp_redir_server"` -if [ -z "$is_auto_switch" ];then +is_auto_switch=$(uci show $CONFIG.@auto_switch[0] | grep "tcp_redir_server") +if [ -z "$is_auto_switch" ]; then test_reconnection else test_auto_switch