From ddd37a3219e8bb43431bea183b37fb43e8e06f71 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 3 Aug 2015 13:03:30 +0800 Subject: [PATCH] update dns --- gfwlist/gen.py | 2 +- src/main/res/values/arrays.xml | 39 +++++++++---------- .../shadowsocks/utils/ConfigUtils.scala | 4 +- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/gfwlist/gen.py b/gfwlist/gen.py index de19789e..bac11221 100644 --- a/gfwlist/gen.py +++ b/gfwlist/gen.py @@ -24,6 +24,7 @@ def main(): "0.0.0.0/8", "10.0.0.0/8", "100.64.0.0/10", + "112.124.47.0/24", "114.114.114.0/24", "127.0.0.0/8", "169.254.0.0/16", @@ -35,7 +36,6 @@ def main(): "198.18.0.0/15", "198.51.100.0/24", "203.0.113.0/24", - "223.5.5.0/24", "224.0.0.0/4", "240.0.0.0/4", ])) diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 88fcabaa..3f3fa9ef 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -85,7 +85,23 @@ 101.0.0.0/8 102.0.0.0/7 104.0.0.0/5 - 112.0.0.0/7 + 112.0.0.0/10 + 112.64.0.0/11 + 112.96.0.0/12 + 112.112.0.0/13 + 112.120.0.0/14 + 112.124.0.0/19 + 112.124.32.0/21 + 112.124.40.0/22 + 112.124.44.0/23 + 112.124.46.0/24 + 112.124.48.0/20 + 112.124.64.0/18 + 112.124.128.0/17 + 112.125.0.0/16 + 112.126.0.0/15 + 112.128.0.0/9 + 113.0.0.0/8 114.0.0.0/10 114.64.0.0/11 114.96.0.0/12 @@ -208,25 +224,6 @@ 203.64.0.0/10 203.128.0.0/9 204.0.0.0/6 - 208.0.0.0/5 - 216.0.0.0/6 - 220.0.0.0/7 - 222.0.0.0/8 - 223.0.0.0/14 - 223.4.0.0/16 - 223.5.0.0/22 - 223.5.4.0/24 - 223.5.6.0/23 - 223.5.8.0/21 - 223.5.16.0/20 - 223.5.32.0/19 - 223.5.64.0/18 - 223.5.128.0/17 - 223.6.0.0/15 - 223.8.0.0/13 - 223.16.0.0/12 - 223.32.0.0/11 - 223.64.0.0/10 - 223.128.0.0/9 + 208.0.0.0/4 diff --git a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala index 7f9ad4af..cd2a803e 100644 --- a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala +++ b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala @@ -159,8 +159,8 @@ object ConfigUtils { | |server { | label = "china-servers"; - | ip = 223.5.5.5, 114.114.114.114; - | timeout = 2; + | ip = 114.114.114.114, 112.124.47.27; + | timeout = 4; | reject = %s; | reject_policy = fail; | reject_recursively = on;