fix #368

add tcp_nagle_disable in tun2socks

build.sbt

@@ -31,9 +31,10 @@ libraryDependencies ++= Seq(
   "com.joanzapata.android" % "android-iconify" % "1.0.9",
   "net.glxn.qrgen" % "android" % "2.0",
   "net.simonvt.menudrawer" % "menudrawer" % "3.0.6",
-  "com.google.android.gms" % "play-services-base" % "6.5.87",
+  "com.google.android.gms" % "play-services-base" % "8.1.0",
-  "com.google.android.gms" % "play-services-ads" % "6.5.87",
+  "com.google.android.gms" % "play-services-ads" % "8.1.0",
-  "com.android.support" % "support-v4" % "21.0.3"
+  "com.google.android.gms" % "play-services-analytics" % "8.1.0",
+  "com.android.support" % "support-v4" % "23.0.1"
 )
 
 libraryDependencies ++= Seq(
@@ -52,5 +53,6 @@ proguardOptions in Android ++= Seq("-keep class android.support.v4.app.** { *; }
           "-keep class * extends com.j256.ormlite.** { *; }",
           "-keep class com.joanzapata.** { *; }",
           "-keepattributes *Annotation*",
+          "-dontwarn com.google.android.gms.internal.zzhu",
           "-dontwarn org.xbill.**",
           "-dontwarn com.actionbarsherlock.**")

build.sh

@@ -7,7 +7,7 @@ function try () {
 try pushd src/main
 
 # Build
-try $ANDROID_NDK_HOME/ndk-build clean
+#try $ANDROID_NDK_HOME/ndk-build clean
 try $ANDROID_NDK_HOME/ndk-build -j8
 
 # copy executables

gfwlist/gen.py

@@ -24,6 +24,8 @@ 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",
         "172.16.0.0/12",
@@ -39,16 +41,18 @@ def main():
     ]))
     china_list_set += internal_list
 
-    # 取反
+    all = china_list_set
-    all = IPy.IPSet([IPy.IP("0.0.0.0/0")])
-    # 剔除所有孤立的C段
-    for ip in china_list_set:
-        all.discard(ip)
 
-    filter = itertools.ifilter(lambda x: len(x) <= 65536, all)
+    # 取反
-    for ip in filter:
+    # all = IPy.IPSet([IPy.IP("0.0.0.0/0")])
-        all.discard(ip)
+    # 剔除所有孤立的C段
-        all.add(IPy.IP(ip.strNormal(0)).make_net('255.255.0.0'))
+    # for ip in china_list_set:
+    #     all.discard(ip)
+
+    # filter = itertools.ifilter(lambda x: len(x) <= 65536, all)
+    # for ip in filter:
+    #     all.discard(ip)
+    #     all.add(IPy.IP(ip.strNormal(0)).make_net('255.255.0.0'))
 
     # 输出结果
     for ip in all:

project/plugins.sbt

@@ -1,7 +1,7 @@
 resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.4.6")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.0")
 
-resolvers += Resolver.sbtPluginRepo("snapshots")
+resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 
-addSbtPlugin("com.hanhuy.sbt" % "sbt-idea" % "1.7.0-SNAPSHOT")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.7.0-SNAPSHOT")

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="108"
+    android:versionCode="117"
-    android:versionName="2.7.0">
+    android:versionName="2.8.0">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/aidl/com/github/shadowsocks/aidl/Config.java

@@ -10,6 +10,8 @@ public class Config implements Parcelable {
   public boolean isBypassApps = false;
   public boolean isTrafficStat = false;
   public boolean isUdpDns = false;
+  public boolean isAuth = false;
+  public boolean isIpv6 = false;
 
   public String profileName = "Untitled";
   public String proxy = "127.0.0.1";
@@ -33,13 +35,15 @@ public class Config implements Parcelable {
   };
 
   public Config(boolean isGlobalProxy, boolean isGFWList, boolean isBypassApps,
-      boolean isTrafficStat, boolean isUdpDns, String profileName, String proxy, String sitekey,
+      boolean isTrafficStat, boolean isUdpDns, boolean isAuth, boolean isIpv6, String profileName, String proxy, String sitekey,
       String encMethod, String proxiedAppString, String route, int remotePort, int localPort) {
     this.isGlobalProxy = isGlobalProxy;
     this.isGFWList = isGFWList;
     this.isBypassApps = isBypassApps;
     this.isTrafficStat = isTrafficStat;
     this.isUdpDns = isUdpDns;
+    this.isAuth = isAuth;
+    this.isIpv6 = isIpv6;
     this.profileName = profileName;
     this.proxy = proxy;
     this.sitekey = sitekey;
@@ -60,6 +64,8 @@ public class Config implements Parcelable {
     isBypassApps = in.readInt() == 1;
     isTrafficStat = in.readInt() == 1;
     isUdpDns = in.readInt() == 1;
+    isAuth = in.readInt() == 1;
+    isIpv6 = in.readInt() == 1;
     profileName = in.readString();
     proxy = in.readString();
     sitekey = in.readString();
@@ -80,6 +86,8 @@ public class Config implements Parcelable {
     out.writeInt(isBypassApps ? 1 : 0);
     out.writeInt(isTrafficStat ? 1 : 0);
     out.writeInt(isUdpDns ? 1 : 0);
+    out.writeInt(isAuth ? 1 : 0);
+    out.writeInt(isIpv6 ? 1 : 0);
     out.writeString(profileName);
     out.writeString(proxy);
     out.writeString(sitekey);

src/main/java/com/github/shadowsocks/System.java

@@ -46,4 +46,5 @@ public class System {
   public static native void exec(String cmd);
   public static native String getABI();
   public static native int sendfd(int fd);
+  public static native void jniclose(int fd);
 }

src/main/jni/Android.mk

@@ -249,13 +249,14 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
-SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c acl.c
+SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c acl.c android.c
 
 LOCAL_MODULE    := ss-local
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
 LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \
 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
-					-I$(LOCAL_PATH)/libev/ \
+					-I$(LOCAL_PATH)/libev \
+					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/openssl/include  \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libudns \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
@@ -263,7 +264,7 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libipset/include
 
-LOCAL_STATIC_LIBRARIES := libev libcrypto libipset libcork libudns libsodium
+LOCAL_STATIC_LIBRARIES := libev libcrypto libipset libcork libudns libsodium libancillary
 
 LOCAL_LDLIBS := -llog
 
@@ -275,20 +276,21 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
-SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c
+SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c android.c
 
 LOCAL_MODULE    := ss-tunnel
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
 LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \
 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H -DSSTUNNEL_JNI \
-					-I$(LOCAL_PATH)/libev/ \
+					-I$(LOCAL_PATH)/libev \
+					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libudns \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \
 					-I$(LOCAL_PATH)/openssl/include 
 
-LOCAL_STATIC_LIBRARIES := libev libcrypto libsodium libcork libudns
+LOCAL_STATIC_LIBRARIES := libev libcrypto libsodium libcork libudns libancillary
 
 LOCAL_LDLIBS := -llog
 

src/main/jni/badvpn/tun2socks/tun2socks.c

@@ -1772,6 +1772,9 @@ err_t listener_accept_func (void *arg, struct tcp_pcb *newpcb, err_t err)
     // set client not closed
     client->client_closed = 0;
 
+    // enable TCP_NODELAY
+    tcp_nagle_disable(client->pcb);
+
     // setup handler argument
     tcp_arg(client->pcb, client);
 

src/main/jni/system.cpp

@@ -43,6 +43,10 @@ void Java_com_github_shadowsocks_system_exec(JNIEnv *env, jobject thiz, jstring
     env->ReleaseStringUTFChars(cmd, str);
 }
 
+void Java_com_github_shadowsocks_system_jniclose(JNIEnv *env, jobject thiz, jint fd) {
+    close(fd);
+}
+
 jint Java_com_github_shadowsocks_system_sendfd(JNIEnv *env, jobject thiz, jint tun_fd) {
     int fd;
     struct sockaddr_un addr;
@@ -75,6 +79,8 @@ jint Java_com_github_shadowsocks_system_sendfd(JNIEnv *env, jobject thiz, jint t
 static const char *classPathName = "com/github/shadowsocks/System";
 
 static JNINativeMethod method_table[] = {
+    { "jniclose", "(I)V",
+        (void*) Java_com_github_shadowsocks_system_jniclose },
     { "sendfd", "(I)I",
         (void*) Java_com_github_shadowsocks_system_sendfd },
     { "exec", "(Ljava/lang/String;)V",

src/main/res/values-zh/strings.xml

@@ -77,6 +77,12 @@
   <string name="udp_dns">UDP 转发</string>
   <string name="udp_dns_summary">由远程服务器转发 UDP 协议的数据包</string>
 
+  <string name="onetime_auth">一次性认证</string>
+  <string name="onetime_auth_summary">启用一次性认证(实验性)</string>
+
+  <string name="ipv6">IPv6 路由</string>
+  <string name="ipv6_summary">向远程服务器转发 IPv6 流量</string>
+
   <!-- profile -->
   <string name="add_profile_dialog">为影梭添加此配置文件？</string>
   <string-array name="add_profile_methods">

src/main/res/values/arrays.xml

@@ -85,7 +85,41 @@
         <item>101.0.0.0/8</item>
         <item>102.0.0.0/7</item>
         <item>104.0.0.0/5</item>
-        <item>112.0.0.0/5</item>
+        <item>112.0.0.0/10</item>
+        <item>112.64.0.0/11</item>
+        <item>112.96.0.0/12</item>
+        <item>112.112.0.0/13</item>
+        <item>112.120.0.0/14</item>
+        <item>112.124.0.0/19</item>
+        <item>112.124.32.0/21</item>
+        <item>112.124.40.0/22</item>
+        <item>112.124.44.0/23</item>
+        <item>112.124.46.0/24</item>
+        <item>112.124.48.0/20</item>
+        <item>112.124.64.0/18</item>
+        <item>112.124.128.0/17</item>
+        <item>112.125.0.0/16</item>
+        <item>112.126.0.0/15</item>
+        <item>112.128.0.0/9</item>
+        <item>113.0.0.0/8</item>
+        <item>114.0.0.0/10</item>
+        <item>114.64.0.0/11</item>
+        <item>114.96.0.0/12</item>
+        <item>114.112.0.0/15</item>
+        <item>114.114.0.0/18</item>
+        <item>114.114.64.0/19</item>
+        <item>114.114.96.0/20</item>
+        <item>114.114.112.0/23</item>
+        <item>114.114.115.0/24</item>
+        <item>114.114.116.0/22</item>
+        <item>114.114.120.0/21</item>
+        <item>114.114.128.0/17</item>
+        <item>114.115.0.0/16</item>
+        <item>114.116.0.0/14</item>
+        <item>114.120.0.0/13</item>
+        <item>114.128.0.0/9</item>
+        <item>115.0.0.0/8</item>
+        <item>116.0.0.0/6</item>
         <item>120.0.0.0/6</item>
         <item>124.0.0.0/7</item>
         <item>126.0.0.0/8</item>

src/main/res/values/chnroute.xml

@@ -321,6 +321,10 @@
         <item>43.239.0.0/19</item>
         <item>43.239.32.0/20</item>
         <item>43.239.48.0/22</item>
+        <item>43.239.116.0/22</item>
+        <item>43.239.120.0/22</item>
+        <item>43.239.172.0/22</item>
+        <item>43.239.176.0/22</item>
         <item>43.240.0.0/22</item>
         <item>43.240.48.0/22</item>
         <item>43.240.56.0/21</item>
@@ -505,6 +509,154 @@
         <item>43.255.232.0/22</item>
         <item>43.255.244.0/22</item>
         <item>45.64.112.0/23</item>
+        <item>45.112.132.0/22</item>
+        <item>45.112.188.0/22</item>
+        <item>45.112.208.0/20</item>
+        <item>45.112.228.0/22</item>
+        <item>45.112.232.0/21</item>
+        <item>45.113.12.0/22</item>
+        <item>45.113.16.0/20</item>
+        <item>45.113.40.0/22</item>
+        <item>45.113.52.0/22</item>
+        <item>45.113.56.0/22</item>
+        <item>45.113.72.0/22</item>
+        <item>45.113.108.0/22</item>
+        <item>45.113.144.0/21</item>
+        <item>45.113.168.0/22</item>
+        <item>45.113.176.0/22</item>
+        <item>45.113.184.0/22</item>
+        <item>45.113.200.0/21</item>
+        <item>45.113.208.0/20</item>
+        <item>45.113.228.0/22</item>
+        <item>45.113.240.0/22</item>
+        <item>45.113.252.0/22</item>
+        <item>45.114.0.0/22</item>
+        <item>45.114.12.0/22</item>
+        <item>45.114.32.0/22</item>
+        <item>45.114.40.0/22</item>
+        <item>45.114.52.0/22</item>
+        <item>45.114.96.0/22</item>
+        <item>45.114.104.0/22</item>
+        <item>45.114.136.0/22</item>
+        <item>45.114.196.0/22</item>
+        <item>45.114.200.0/22</item>
+        <item>45.114.228.0/22</item>
+        <item>45.114.236.0/22</item>
+        <item>45.114.252.0/22</item>
+        <item>45.115.44.0/22</item>
+        <item>45.115.100.0/22</item>
+        <item>45.115.120.0/22</item>
+        <item>45.115.132.0/22</item>
+        <item>45.115.144.0/22</item>
+        <item>45.115.156.0/22</item>
+        <item>45.115.164.0/22</item>
+        <item>45.115.200.0/22</item>
+        <item>45.115.212.0/22</item>
+        <item>45.115.216.0/22</item>
+        <item>45.115.228.0/22</item>
+        <item>45.115.236.0/22</item>
+        <item>45.115.244.0/22</item>
+        <item>45.115.248.0/22</item>
+        <item>45.116.12.0/22</item>
+        <item>45.116.16.0/21</item>
+        <item>45.116.24.0/22</item>
+        <item>45.116.32.0/21</item>
+        <item>45.116.52.0/22</item>
+        <item>45.116.60.0/22</item>
+        <item>45.116.64.0/22</item>
+        <item>45.116.96.0/21</item>
+        <item>45.116.140.0/22</item>
+        <item>45.116.152.0/22</item>
+        <item>45.116.208.0/22</item>
+        <item>45.117.8.0/22</item>
+        <item>45.117.20.0/22</item>
+        <item>45.117.40.0/22</item>
+        <item>45.117.68.0/22</item>
+        <item>45.117.124.0/22</item>
+        <item>45.117.252.0/22</item>
+        <item>45.119.52.0/22</item>
+        <item>45.119.60.0/22</item>
+        <item>45.119.64.0/21</item>
+        <item>45.119.72.0/22</item>
+        <item>45.119.104.0/22</item>
+        <item>45.119.116.0/22</item>
+        <item>45.119.160.0/22</item>
+        <item>45.119.232.0/22</item>
+        <item>45.120.100.0/22</item>
+        <item>45.120.140.0/22</item>
+        <item>45.120.156.0/22</item>
+        <item>45.120.164.0/22</item>
+        <item>45.120.220.0/22</item>
+        <item>45.120.240.0/22</item>
+        <item>45.121.20.0/22</item>
+        <item>45.121.52.0/22</item>
+        <item>45.121.64.0/21</item>
+        <item>45.121.72.0/22</item>
+        <item>45.121.92.0/22</item>
+        <item>45.121.96.0/22</item>
+        <item>45.121.104.0/22</item>
+        <item>45.121.172.0/22</item>
+        <item>45.121.176.0/22</item>
+        <item>45.121.212.0/22</item>
+        <item>45.121.240.0/20</item>
+        <item>45.122.0.0/19</item>
+        <item>45.122.32.0/21</item>
+        <item>45.122.40.0/22</item>
+        <item>45.122.60.0/22</item>
+        <item>45.122.64.0/19</item>
+        <item>45.122.96.0/20</item>
+        <item>45.122.112.0/21</item>
+        <item>45.122.160.0/19</item>
+        <item>45.122.192.0/20</item>
+        <item>45.122.208.0/21</item>
+        <item>45.122.216.0/22</item>
+        <item>45.123.28.0/22</item>
+        <item>45.123.32.0/21</item>
+        <item>45.123.44.0/22</item>
+        <item>45.123.48.0/20</item>
+        <item>45.123.64.0/20</item>
+        <item>45.123.80.0/21</item>
+        <item>45.123.88.0/22</item>
+        <item>45.123.120.0/22</item>
+        <item>45.123.128.0/21</item>
+        <item>45.123.136.0/22</item>
+        <item>45.123.148.0/22</item>
+        <item>45.123.152.0/21</item>
+        <item>45.123.164.0/22</item>
+        <item>45.123.168.0/21</item>
+        <item>45.123.176.0/21</item>
+        <item>45.123.184.0/22</item>
+        <item>45.123.204.0/22</item>
+        <item>45.123.212.0/22</item>
+        <item>45.123.224.0/19</item>
+        <item>45.124.0.0/22</item>
+        <item>45.124.20.0/22</item>
+        <item>45.124.28.0/22</item>
+        <item>45.124.32.0/21</item>
+        <item>45.124.44.0/22</item>
+        <item>45.124.68.0/22</item>
+        <item>45.124.76.0/22</item>
+        <item>45.124.80.0/22</item>
+        <item>45.124.100.0/22</item>
+        <item>45.124.124.0/22</item>
+        <item>45.124.172.0/22</item>
+        <item>45.124.176.0/22</item>
+        <item>45.124.208.0/22</item>
+        <item>45.124.248.0/21</item>
+        <item>45.125.12.0/22</item>
+        <item>45.125.16.0/22</item>
+        <item>45.125.24.0/21</item>
+        <item>45.125.32.0/22</item>
+        <item>45.125.44.0/22</item>
+        <item>45.125.52.0/22</item>
+        <item>45.125.56.0/22</item>
+        <item>45.125.76.0/22</item>
+        <item>45.125.80.0/20</item>
+        <item>45.125.96.0/21</item>
+        <item>45.125.104.0/22</item>
+        <item>45.125.136.0/22</item>
+        <item>47.92.0.0/14</item>
+        <item>47.96.0.0/11</item>
         <item>49.4.0.0/14</item>
         <item>49.51.0.0/16</item>
         <item>49.52.0.0/14</item>
@@ -803,7 +955,6 @@
         <item>103.30.96.0/22</item>
         <item>103.30.148.0/22</item>
         <item>103.30.200.0/22</item>
-        <item>103.30.216.0/22</item>
         <item>103.30.228.0/22</item>
         <item>103.30.236.0/22</item>
         <item>103.31.0.0/22</item>
@@ -818,6 +969,8 @@
         <item>103.35.0.0/19</item>
         <item>103.35.32.0/20</item>
         <item>103.35.48.0/22</item>
+        <item>103.35.104.0/22</item>
+        <item>103.35.116.0/22</item>
         <item>103.36.20.0/22</item>
         <item>103.36.28.0/22</item>
         <item>103.36.36.0/22</item>
@@ -1004,6 +1157,142 @@
         <item>103.50.224.0/20</item>
         <item>103.50.240.0/21</item>
         <item>103.50.248.0/22</item>
+        <item>103.52.40.0/22</item>
+        <item>103.52.72.0/21</item>
+        <item>103.52.80.0/21</item>
+        <item>103.52.96.0/21</item>
+        <item>103.52.104.0/22</item>
+        <item>103.52.160.0/21</item>
+        <item>103.52.172.0/22</item>
+        <item>103.52.176.0/22</item>
+        <item>103.52.184.0/22</item>
+        <item>103.52.196.0/22</item>
+        <item>103.53.4.0/22</item>
+        <item>103.53.64.0/21</item>
+        <item>103.53.92.0/22</item>
+        <item>103.53.100.0/22</item>
+        <item>103.53.124.0/22</item>
+        <item>103.53.128.0/20</item>
+        <item>103.53.144.0/22</item>
+        <item>103.53.160.0/22</item>
+        <item>103.53.180.0/22</item>
+        <item>103.53.204.0/22</item>
+        <item>103.53.208.0/22</item>
+        <item>103.53.216.0/22</item>
+        <item>103.53.236.0/22</item>
+        <item>103.53.248.0/22</item>
+        <item>103.54.8.0/22</item>
+        <item>103.54.48.0/22</item>
+        <item>103.54.60.0/22</item>
+        <item>103.54.160.0/21</item>
+        <item>103.54.212.0/22</item>
+        <item>103.54.228.0/22</item>
+        <item>103.54.240.0/22</item>
+        <item>103.55.24.0/22</item>
+        <item>103.55.80.0/22</item>
+        <item>103.55.120.0/22</item>
+        <item>103.55.152.0/22</item>
+        <item>103.55.172.0/22</item>
+        <item>103.55.204.0/22</item>
+        <item>103.55.208.0/22</item>
+        <item>103.55.228.0/22</item>
+        <item>103.55.236.0/22</item>
+        <item>103.55.240.0/22</item>
+        <item>103.56.8.0/22</item>
+        <item>103.56.16.0/21</item>
+        <item>103.56.32.0/22</item>
+        <item>103.56.52.0/22</item>
+        <item>103.56.56.0/21</item>
+        <item>103.56.72.0/21</item>
+        <item>103.56.100.0/22</item>
+        <item>103.56.104.0/22</item>
+        <item>103.56.140.0/22</item>
+        <item>103.56.152.0/22</item>
+        <item>103.56.184.0/22</item>
+        <item>103.56.200.0/22</item>
+        <item>103.56.216.0/22</item>
+        <item>103.57.12.0/22</item>
+        <item>103.57.52.0/22</item>
+        <item>103.57.56.0/22</item>
+        <item>103.57.76.0/22</item>
+        <item>103.57.108.0/22</item>
+        <item>103.57.136.0/22</item>
+        <item>103.57.196.0/22</item>
+        <item>103.58.24.0/22</item>
+        <item>103.58.182.0/23</item>
+        <item>103.59.76.0/22</item>
+        <item>103.59.100.0/22</item>
+        <item>103.59.112.0/20</item>
+        <item>103.59.128.0/22</item>
+        <item>103.59.148.0/22</item>
+        <item>103.59.164.0/22</item>
+        <item>103.59.216.0/22</item>
+        <item>103.60.32.0/22</item>
+        <item>103.60.44.0/22</item>
+        <item>103.60.164.0/22</item>
+        <item>103.60.228.0/22</item>
+        <item>103.60.236.0/22</item>
+        <item>103.61.60.0/22</item>
+        <item>103.61.104.0/22</item>
+        <item>103.61.140.0/22</item>
+        <item>103.61.152.0/21</item>
+        <item>103.61.160.0/22</item>
+        <item>103.61.172.0/22</item>
+        <item>103.61.176.0/22</item>
+        <item>103.61.184.0/21</item>
+        <item>103.62.24.0/22</item>
+        <item>103.62.52.0/22</item>
+        <item>103.62.72.0/21</item>
+        <item>103.62.80.0/21</item>
+        <item>103.62.88.0/22</item>
+        <item>103.62.96.0/19</item>
+        <item>103.62.128.0/21</item>
+        <item>103.62.156.0/22</item>
+        <item>103.62.160.0/19</item>
+        <item>103.62.192.0/22</item>
+        <item>103.62.204.0/22</item>
+        <item>103.62.208.0/20</item>
+        <item>103.62.224.0/22</item>
+        <item>103.63.32.0/19</item>
+        <item>103.63.64.0/20</item>
+        <item>103.63.80.0/21</item>
+        <item>103.63.88.0/22</item>
+        <item>103.63.140.0/22</item>
+        <item>103.63.144.0/22</item>
+        <item>103.63.152.0/22</item>
+        <item>103.63.160.0/20</item>
+        <item>103.63.176.0/21</item>
+        <item>103.63.184.0/22</item>
+        <item>103.63.192.0/20</item>
+        <item>103.63.208.0/22</item>
+        <item>103.63.240.0/20</item>
+        <item>103.192.0.0/19</item>
+        <item>103.192.48.0/21</item>
+        <item>103.192.56.0/22</item>
+        <item>103.192.84.0/22</item>
+        <item>103.192.88.0/21</item>
+        <item>103.192.96.0/20</item>
+        <item>103.192.112.0/22</item>
+        <item>103.192.128.0/20</item>
+        <item>103.192.144.0/22</item>
+        <item>103.192.164.0/22</item>
+        <item>103.192.188.0/22</item>
+        <item>103.192.208.0/21</item>
+        <item>103.192.216.0/22</item>
+        <item>103.192.252.0/22</item>
+        <item>103.193.40.0/21</item>
+        <item>103.193.120.0/21</item>
+        <item>103.193.140.0/22</item>
+        <item>103.193.144.0/21</item>
+        <item>103.193.160.0/22</item>
+        <item>103.193.188.0/22</item>
+        <item>103.193.192.0/22</item>
+        <item>103.193.212.0/22</item>
+        <item>103.193.216.0/21</item>
+        <item>103.193.224.0/20</item>
+        <item>103.193.240.0/22</item>
+        <item>103.194.16.0/22</item>
+        <item>103.194.230.0/23</item>
         <item>103.224.40.0/21</item>
         <item>103.224.60.0/22</item>
         <item>103.224.80.0/22</item>
@@ -1096,6 +1385,7 @@
         <item>103.236.0.0/18</item>
         <item>103.236.64.0/19</item>
         <item>103.236.96.0/22</item>
+        <item>103.236.120.0/22</item>
         <item>103.237.0.0/20</item>
         <item>103.237.24.0/21</item>
         <item>103.237.68.0/22</item>
@@ -1936,6 +2226,7 @@
         <item>166.111.0.0/16</item>
         <item>167.139.0.0/16</item>
         <item>167.189.0.0/16</item>
+        <item>167.220.244.0/22</item>
         <item>168.160.0.0/16</item>
         <item>169.254.0.0/16</item>
         <item>171.8.0.0/13</item>
@@ -3363,7 +3654,6 @@
         <item>210.26.0.0/15</item>
         <item>210.28.0.0/14</item>
         <item>210.32.0.0/12</item>
-        <item>210.48.136.0/21</item>
         <item>210.51.0.0/16</item>
         <item>210.52.0.0/15</item>
         <item>210.56.192.0/19</item>

src/main/res/values/strings.xml

@@ -25,10 +25,14 @@
 
   <!-- feature category -->
   <string name="feature_cat">Feature Settings</string>
+  <string name="ipv6">IPv6 Route</string>
+  <string name="ipv6_summary">Redirect IPv6 traffic to remote</string>
+  <string name="onetime_auth">One-time Authentication</string>
+  <string name="onetime_auth_summary">Enable one-time authentication (Experimental)</string>
   <string name="http_proxy">HTTP Proxy</string>
   <string name="http_proxy_summary">Local HTTP Proxy</string>
   <string name="dns_proxy">DNS Proxy</string>
-  <string name="dns_proxy_summary">Redirect DNS queries to remote server</string>
+  <string name="dns_proxy_summary">Redirect DNS queries to remote</string>
   <string name="auto_set_gfwlist">CHN Route</string>
   <string name="auto_set_gfwlist_summary">Bypass all sites located in China
   </string>
@@ -46,7 +50,7 @@
   <string name="traffic_stat">Traffic Stats</string>
   <string name="traffic_stat_summary">Show traffic stats in notification bar</string>
   <string name="udp_dns">UDP Forwarding</string>
-  <string name="udp_dns_summary">Forward UDP packets to remote server</string>
+  <string name="udp_dns_summary">Forward UDP packets to remote</string>
 
   <!-- notification category -->
   <string name="forward_success">Shadowsocks started.</string>

src/main/res/xml/pref_all.xml

@@ -58,6 +58,12 @@
                 android:summary="@string/route_list_summary"
                 android:title="@string/route_list">
         </com.github.shadowsocks.preferences.SummaryListPreference>
+        <CheckBoxPreference
+                android:key="isIpv6"
+                android:defaultValue="false"
+                android:summary="@string/ipv6_summary"
+                android:title="@string/ipv6">
+        </CheckBoxPreference>
         <CheckBoxPreference
                 android:defaultValue="true"
                 android:key="isGlobalProxy"
@@ -78,6 +84,12 @@
                 android:summary="@string/udp_dns_summary"
                 android:title="@string/udp_dns">
         </CheckBoxPreference>
+        <CheckBoxPreference
+                android:key="isAuth"
+                android:defaultValue="false"
+                android:summary="@string/onetime_auth_summary"
+                android:title="@string/onetime_auth">
+        </CheckBoxPreference>
         <CheckBoxPreference
                 android:key="isAutoConnect"
                 android:summary="@string/auto_connect_summary"

src/main/scala/com/github/shadowsocks/Shadowsocks.scala

@@ -127,7 +127,7 @@ object Shadowsocks {
   val PROXY_PREFS = Array(Key.profileName, Key.proxy, Key.remotePort, Key.localPort, Key.sitekey,
     Key.encMethod)
   val FEATRUE_PREFS = Array(Key.route, Key.isGlobalProxy, Key.proxyedApps,
-    Key.isUdpDns, Key.isAutoConnect)
+    Key.isUdpDns, Key.isAuth, Key.isIpv6, Key.isAutoConnect)
 
   val EXECUTABLES = Array(Executable.PDNSD, Executable.REDSOCKS, Executable.SS_TUNNEL, Executable.SS_LOCAL, Executable.TUN2SOCKS)
 
@@ -166,6 +166,8 @@ object Shadowsocks {
       case Key.route => updateListPreference(pref, profile.route)
       case Key.isGlobalProxy => updateCheckBoxPreference(pref, profile.global)
       case Key.isUdpDns => updateCheckBoxPreference(pref, profile.udpdns)
+      case Key.isAuth => updateCheckBoxPreference(pref, profile.auth)
+      case Key.isIpv6 => updateCheckBoxPreference(pref, profile.ipv6)
       case _ =>
     }
   }
@@ -185,6 +187,7 @@ class Shadowsocks
   // Variables
   var switchButton: Switch = null
   var progressDialog: ProgressDialog = null
+  var progressTag = -1
   var state = State.INIT
   var prepared = false
   var currentProfile = new Profile
@@ -218,6 +221,11 @@ class Shadowsocks
       state = bgService.getState
       // set the listener
       switchButton.setOnCheckedChangeListener(Shadowsocks.this)
+
+      if (!status.getBoolean(getVersionName, false)) {
+        status.edit.putBoolean(getVersionName, true).commit()
+        recovery();
+      }
     }
 
     override def onServiceDisconnected(name: ComponentName) {
@@ -271,9 +279,10 @@ class Shadowsocks
     switchButton.setOnCheckedChangeListener(this)
   }
 
-  private def showProgress(msg: String): Handler = {
+  private def showProgress(msg: Int): Handler = {
     clearDialog()
-    progressDialog = ProgressDialog.show(this, "", msg, true, false)
+    progressDialog = ProgressDialog.show(this, "", getString(msg), true, false)
+    progressTag = msg
     new Handler {
       override def handleMessage(msg: Message) {
         clearDialog()
@@ -397,7 +406,7 @@ class Shadowsocks
   }
 
   def prepareStartService() {
-    showProgress(getString(R.string.connecting))
+    showProgress(R.string.connecting)
     spawn {
       if (isVpnEnabled) {
         val intent = VpnService.prepare(this)
@@ -474,22 +483,16 @@ class Shadowsocks
 
     addPreferencesFromResource(R.xml.pref_all)
 
+    // Update the profile
+    if (!status.getBoolean(getVersionName, false)) {
+      currentProfile = profileManager.create()
+    }
+
     // Initialize the profile
     currentProfile = {
       profileManager.getProfile(settings.getInt(Key.profileId, -1)) getOrElse currentProfile
     }
 
-    // Update the profile
-    if (!status.getBoolean(getVersionName, false)) {
-      val h = showProgress(getString(R.string.initializing))
-      status.edit.putBoolean(getVersionName, true).apply()
-      spawn {
-        reset()
-        currentProfile = profileManager.create()
-        h.sendEmptyMessage(0)
-      }
-    }
-
     // Initialize drawer
     menuAdapter.setActiveId(settings.getInt(Key.profileId, -1))
     menuAdapter.setListener(this)
@@ -617,7 +620,7 @@ class Shadowsocks
         which match {
           case 0 =>
             dialog.dismiss()
-            val h = showProgress(getString(R.string.loading))
+            val h = showProgress(R.string.loading)
             h.postDelayed(new Runnable() {
               def run() {
                 val integrator = new IntentIntegrator(Shadowsocks.this)
@@ -641,7 +644,7 @@ class Shadowsocks
   def reloadProfile() {
     drawer.closeMenu(true)
 
-    val h = showProgress(getString(R.string.loading))
+    val h = showProgress(R.string.loading)
 
     handler.postDelayed(new Runnable {
       def run() {
@@ -660,7 +663,7 @@ class Shadowsocks
   def addProfile(profile: Profile) {
     drawer.closeMenu(true)
 
-    val h = showProgress(getString(R.string.loading))
+    val h = showProgress(R.string.loading)
 
     handler.postDelayed(new Runnable {
       def run() {
@@ -679,7 +682,7 @@ class Shadowsocks
   def addProfile(id: Int) {
     drawer.closeMenu(true)
 
-    val h = showProgress(getString(R.string.loading))
+    val h = showProgress(R.string.loading)
 
     handler.postDelayed(new Runnable {
       def run() {
@@ -697,7 +700,7 @@ class Shadowsocks
   def updateProfile(id: Int) {
     drawer.closeMenu(true)
 
-    val h = showProgress(getString(R.string.loading))
+    val h = showProgress(R.string.loading)
 
     handler.postDelayed(new Runnable {
       def run() {
@@ -916,10 +919,7 @@ class Shadowsocks
     Console.runRootCommand(ab.toArray)
   }
 
-  def reset() {
+  def install() {
-
-    crashRecovery()
-
     copyAssets(System.getABI)
 
     val ab = new ArrayBuffer[String]
@@ -927,12 +927,18 @@ class Shadowsocks
       ab.append("chmod 755 " + Path.BASE + executable)
     }
     Console.runCommand(ab.toArray)
+  }
 
+  def reset() {
+
+    crashRecovery()
+
+    install()
   }
 
   private def recovery() {
-    val h = showProgress(getString(R.string.recovering))
     serviceStop()
+    val h = showProgress(R.string.recovering)
     spawn {
       reset()
       h.sendEmptyMessage(0)
@@ -965,7 +971,7 @@ class Shadowsocks
   }
 
   private def flushDnsCache() {
-    val h = showProgress(getString(R.string.flushing))
+    val h = showProgress(R.string.flushing)
     spawn {
       Utils.toggleAirplaneMode(getBaseContext)
       h.sendEmptyMessage(0)
@@ -1083,6 +1089,7 @@ class Shadowsocks
     if (progressDialog != null) {
       progressDialog.dismiss()
       progressDialog = null
+      progressTag = -1
     }
   }
 
@@ -1096,14 +1103,19 @@ class Shadowsocks
               if (progressDialog == null) {
                 progressDialog = ProgressDialog
                   .show(Shadowsocks.this, "", getString(R.string.connecting), true, true)
+                progressTag = R.string.connecting
               }
               setPreferenceEnabled(enabled = false)
             case State.CONNECTED =>
-              clearDialog()
+              if (progressTag == R.string.connecting) {
+                clearDialog()
+              }
               changeSwitch(checked = true)
               setPreferenceEnabled(enabled = false)
             case State.STOPPED =>
-              clearDialog()
+              if (progressTag == R.string.stopping || progressTag == R.string.connecting) {
+                clearDialog()
+              }
               changeSwitch(checked = false)
               if (m != null) {
                 new SnackBar.Builder(Shadowsocks.this)
@@ -1118,6 +1130,7 @@ class Shadowsocks
               if (progressDialog == null) {
                 progressDialog = ProgressDialog
                   .show(Shadowsocks.this, "", getString(R.string.stopping), true, true)
+                progressTag = R.string.stopping
               }
           }
         }

src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala

@@ -205,6 +205,8 @@ class ShadowsocksNatService extends Service with BaseService {
           , "-c" , Path.BASE + "ss-local-nat.conf"
           , "-f" , Path.BASE + "ss-local-nat.pid")
 
+    if (config.isAuth) cmd += "-A"
+
     if (config.route != Route.ALL) {
       cmd += "--acl"
       cmd += (Path.BASE + "acl.list")
@@ -233,6 +235,8 @@ class ShadowsocksNatService extends Service with BaseService {
 
       cmd += ("-l" , "8153")
 
+      if (config.isAuth) cmd += "-A"
+
       if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
 
       Console.runCommand(cmd.mkString(" "))
@@ -254,6 +258,8 @@ class ShadowsocksNatService extends Service with BaseService {
         , "-c" , Path.BASE + "ss-tunnel-nat.conf"
         , "-f" , Path.BASE + "ss-tunnel-nat.pid")
 
+      if (config.isAuth) cmdBuf += "-A"
+
       if (BuildConfig.DEBUG) Log.d(TAG, cmdBuf.mkString(" "))
       Console.runCommand(cmdBuf.mkString(" "))
     }
@@ -265,10 +271,10 @@ class ShadowsocksNatService extends Service with BaseService {
       val reject = ConfigUtils.getRejectList(getContext, application)
       val blackList = ConfigUtils.getBlackList(getContext, application)
       ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "127.0.0.1", 8153,
-        Path.BASE + "pdnsd-nat.pid", reject, blackList, 8163)
+        Path.BASE + "pdnsd-nat.pid", reject, blackList, 8163, "")
     } else {
       ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, "127.0.0.1", 8153,
-        Path.BASE + "pdnsd-nat.pid", 8163)
+        Path.BASE + "pdnsd-nat.pid", 8163, "")
     }
 
     ConfigUtils.printToFile(new File(Path.BASE + "pdnsd-nat.conf"))(p => {

src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala

@@ -61,18 +61,17 @@ import scala.concurrent.ops._
 
 class ShadowsocksVpnService extends VpnService with BaseService {
 
+  private lazy val application = getApplication.asInstanceOf[ShadowsocksApplication]
   val TAG = "ShadowsocksVpnService"
-
   val VPN_MTU = 1500
   val PRIVATE_VLAN = "26.26.26.%s"
-
+  val PRIVATE_VLAN6 = "fdfe:dcba:9876::%s"
   var conn: ParcelFileDescriptor = null
   var notificationManager: NotificationManager = null
   var receiver: BroadcastReceiver = null
   var apps: Array[ProxiedApp] = null
   var config: Config = null
-
+  var vpnThread: ShadowsocksVpnThread = null
-  private lazy val application = getApplication.asInstanceOf[ShadowsocksApplication]
 
   def isByass(net: SubnetUtils): Boolean = {
     val info = net.getInfo
@@ -95,81 +94,70 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     }
   }
 
-  def startShadowsocksDaemon() {
+  override def onBind(intent: Intent): IBinder = {
-
+    val action = intent.getAction
-    if (Utils.isLollipopOrAbove && config.route != Route.ALL) {
+    if (VpnService.SERVICE_INTERFACE == action) {
-      val acl: Array[String] = config.route match {
+      return super.onBind(intent)
-        case Route.BYPASS_LAN => getResources.getStringArray(R.array.private_route)
+    } else if (Action.SERVICE == action) {
-        case Route.BYPASS_CHN => getResources.getStringArray(R.array.chn_route_full)
+      return binder
-      }
-      ConfigUtils.printToFile(new File(Path.BASE + "acl.list"))(p => {
-        acl.foreach(item => p.println(item))
-      })
     }
-
+    null
-    val conf = ConfigUtils
-      .SHADOWSOCKS.formatLocal(Locale.ENGLISH, config.proxy, config.remotePort, config.localPort,
-        config.sitekey, config.encMethod, 10)
-    ConfigUtils.printToFile(new File(Path.BASE + "ss-local-vpn.conf"))(p => {
-      p.println(conf)
-    })
-
-    val cmd = new ArrayBuffer[String]
-    cmd +=(Path.BASE + "ss-local", "-u"
-      , "-b" , "127.0.0.1"
-      , "-t" , "600"
-      , "-c" , Path.BASE + "ss-local-vpn.conf"
-      , "-f" , Path.BASE + "ss-local-vpn.pid")
-
-    if (Utils.isLollipopOrAbove && config.route != Route.ALL) {
-      cmd += "--acl"
-      cmd += (Path.BASE + "acl.list")
-    }
-
-    if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
-    Console.runCommand(cmd.mkString(" "))
   }
 
-  def startDnsTunnel() = {
+  override def onCreate() {
-    val conf = ConfigUtils
+
-      .SHADOWSOCKS.formatLocal(Locale.ENGLISH, config.proxy, config.remotePort, 8163,
+    super.onCreate()
-        config.sitekey, config.encMethod, 10)
+
-    ConfigUtils.printToFile(new File(Path.BASE + "ss-tunnel-vpn.conf"))(p => {
+    ConfigUtils.refresh(this)
-      p.println(conf)
+
-    })
+    notificationManager = getSystemService(Context.NOTIFICATION_SERVICE)
-    val cmd = new ArrayBuffer[String]
+      .asInstanceOf[NotificationManager]
-    cmd +=(Path.BASE + "ss-tunnel"
-      , "-u"
-      , "-t" , "10"
-      , "-b" , "127.0.0.1"
-      , "-l" , "8163"
-      , "-L" , "8.8.8.8:53"
-      , "-c" , Path.BASE + "ss-tunnel-vpn.conf"
-      , "-f" , Path.BASE + "ss-tunnel-vpn.pid")
 
-    if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
-    Console.runCommand(cmd.mkString(" "))
   }
 
-  def startDnsDaemon() {
+  override def onRevoke() {
-    val conf = {
+    stopRunner()
-      if (config.route == Route.BYPASS_CHN) {
+  }
-        val reject = ConfigUtils.getRejectList(getContext, application)
-        val blackList = ConfigUtils.getBlackList(getContext, application)
-        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "0.0.0.0", 8153,
-          Path.BASE + "pdnsd-vpn.pid", reject, blackList, 8163)
-      } else {
-        ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, "0.0.0.0", 8153,
-          Path.BASE + "pdnsd-vpn.pid", 8163)
-      }
-    }
-    ConfigUtils.printToFile(new File(Path.BASE + "pdnsd-vpn.conf"))(p => {
-      p.println(conf)
-    })
-    val cmd = Path.BASE + "pdnsd -c " + Path.BASE + "pdnsd-vpn.conf"
 
-    if (BuildConfig.DEBUG) Log.d(TAG, cmd)
+  override def stopRunner() {
-    Console.runCommand(cmd)
+
+    if (vpnThread != null) {
+      vpnThread.stopThread()
+      vpnThread = null
+    }
+
+    // channge the state
+    changeState(State.STOPPING)
+
+    // send event
+    application.tracker.send(new HitBuilders.EventBuilder()
+      .setCategory(TAG)
+      .setAction("stop")
+      .setLabel(getVersionName)
+      .build())
+
+    // reset VPN
+    killProcesses()
+
+    // close connections
+    if (conn != null) {
+      conn.close()
+      conn = null
+    }
+
+    // stop the service if no callback registered
+    if (getCallbackCount == 0) {
+      stopSelf()
+    }
+
+    // clean up the context
+    if (receiver != null) {
+      unregisterReceiver(receiver)
+      receiver = null
+    }
+
+    // channge the state
+    changeState(State.STOPPED)
   }
 
   def getVersionName: String = {
@@ -184,208 +172,6 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     version
   }
 
-  def startVpn(): Int = {
-
-    val builder = new Builder()
-    builder
-      .setSession(config.profileName)
-      .setMtu(VPN_MTU)
-      .addAddress(PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "1"), 24)
-      .addDnsServer("8.8.8.8")
-
-    if (Utils.isLollipopOrAbove) {
-
-      builder.allowFamily(android.system.OsConstants.AF_INET6)
-
-      if (!config.isGlobalProxy) {
-        val apps = AppManager.getProxiedApps(this, config.proxiedAppString)
-        val pkgSet: mutable.HashSet[String] = new mutable.HashSet[String]
-        for (app <- apps) {
-          if (app.proxied) {
-            pkgSet.add(app.packageName)
-          }
-        }
-        for (pkg <- pkgSet) {
-          if (!config.isBypassApps) {
-            builder.addAllowedApplication(pkg)
-          } else {
-            builder.addDisallowedApplication(pkg)
-          }
-        }
-
-        if (config.isBypassApps) {
-          builder.addDisallowedApplication(this.getPackageName)
-        }
-      } else {
-        builder.addDisallowedApplication(this.getPackageName)
-      }
-    }
-
-    if (InetAddressUtils.isIPv6Address(config.proxy)) {
-      builder.addRoute("0.0.0.0", 0)
-    } else {
-      if (!Utils.isLollipopOrAbove) {
-        config.route match {
-          case Route.BYPASS_LAN =>
-            for (i <- 1 to 223) {
-              if (i != 26 && i != 127) {
-                val addr = i.toString + ".0.0.0"
-                val cidr = addr + "/8"
-                val net = new SubnetUtils(cidr)
-
-                if (!isByass(net) && !isPrivateA(i)) {
-                  builder.addRoute(addr, 8)
-                } else {
-                  for (j <- 0 to 255) {
-                    val subAddr = i.toString + "." + j.toString + ".0.0"
-                    val subCidr = subAddr + "/16"
-                    val subNet = new SubnetUtils(subCidr)
-                    if (!isByass(subNet) && !isPrivateB(i, j)) {
-                      builder.addRoute(subAddr, 16)
-                    }
-                  }
-                }
-              }
-            }
-          case Route.BYPASS_CHN =>
-            val list = {
-              if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
-                getResources.getStringArray(R.array.simple_route)
-              } else {
-                getResources.getStringArray(R.array.gfw_route)
-              }
-            }
-            list.foreach(cidr => {
-              val net = new SubnetUtils(cidr)
-              if (!isByass(net)) {
-                val addr = cidr.split('/')
-                builder.addRoute(addr(0), addr(1).toInt)
-              }
-            })
-          case Route.ALL =>
-            for (i <- 1 to 223) {
-              if (i != 26 && i != 127) {
-                val addr = i.toString + ".0.0.0"
-                val cidr = addr + "/8"
-                val net = new SubnetUtils(cidr)
-
-                if (!isByass(net)) {
-                  builder.addRoute(addr, 8)
-                } else {
-                  for (j <- 0 to 255) {
-                    val subAddr = i.toString + "." + j.toString + ".0.0"
-                    val subCidr = subAddr + "/16"
-                    val subNet = new SubnetUtils(subCidr)
-                    if (!isByass(subNet)) {
-                      builder.addRoute(subAddr, 16)
-                    }
-                  }
-                }
-              }
-            }
-        }
-      } else {
-        if (config.route == Route.ALL) {
-          builder.addRoute("0.0.0.0", 0)
-        } else {
-          val privateList = getResources.getStringArray(R.array.bypass_private_route)
-          privateList.foreach(cidr => {
-            val addr = cidr.split('/')
-            builder.addRoute(addr(0), addr(1).toInt)
-          })
-        }
-      }
-    }
-
-    builder.addRoute("8.8.0.0", 16)
-
-    try {
-      conn = builder.establish()
-    } catch {
-      case ex: IllegalStateException =>
-        changeState(State.STOPPED, ex.getMessage)
-        conn = null
-      case ex: Exception => conn = null
-    }
-
-    if (conn == null) {
-      stopRunner()
-      return -1
-    }
-
-    val fd = conn.getFd
-
-    var cmd = (Path.BASE +
-      "tun2socks --netif-ipaddr %s "
-      + "--netif-netmask 255.255.255.0 "
-      + "--socks-server-addr 127.0.0.1:%d "
-      + "--tunfd %d "
-      + "--tunmtu %d "
-      + "--loglevel 3 "
-      + "--pid %stun2socks-vpn.pid")
-      .formatLocal(Locale.ENGLISH, PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "2"), config.localPort, fd, VPN_MTU, Path.BASE)
-
-    if (config.isUdpDns)
-      cmd += " --enable-udprelay"
-    else
-      cmd += " --dnsgw %s:8153".formatLocal(Locale.ENGLISH, PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "1"))
-
-    // if (Utils.isLollipopOrAbove) {
-    //   cmd += " --fake-proc"
-    // }
-
-    if (BuildConfig.DEBUG) Log.d(TAG, cmd)
-
-    Console.runCommand(cmd)
-
-    return fd;
-  }
-
-  /** Called when the activity is first created. */
-  def handleConnection: Boolean = {
-    startShadowsocksDaemon()
-    if (!config.isUdpDns) {
-      startDnsDaemon()
-      startDnsTunnel()
-    }
-
-    val fd = startVpn()
-
-    if (fd == -1) {
-      false
-    } else {
-      Thread.sleep(1000)
-      if (System.sendfd(fd) == -1) {
-        false
-      } else {
-        true
-      }
-    }
-  }
-
-  override def onBind(intent: Intent): IBinder = {
-    val action = intent.getAction
-    if (VpnService.SERVICE_INTERFACE == action) {
-      return super.onBind(intent)
-    } else if (Action.SERVICE == action) {
-      return binder
-    }
-    null
-  }
-
-  override def onCreate() {
-    super.onCreate()
-
-    ConfigUtils.refresh(this)
-
-    notificationManager = getSystemService(Context.NOTIFICATION_SERVICE)
-      .asInstanceOf[NotificationManager]
-  }
-
-  override def onRevoke() {
-    stopRunner()
-  }
-
   def killProcesses() {
     for (task <- Array("ss-local", "ss-tunnel", "pdnsd", "tun2socks")) {
       try {
@@ -399,6 +185,9 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
   override def startRunner(c: Config) {
 
+    vpnThread = new ShadowsocksVpnThread(this)
+    vpnThread.start()
+
     config = c
 
     // ensure the VPNService is prepared
@@ -471,40 +260,201 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     }
   }
 
-  override def stopRunner() {
+  /** Called when the activity is first created. */
-
+  def handleConnection: Boolean = {
-    // channge the state
+    startShadowsocksDaemon()
-    changeState(State.STOPPING)
+    if (!config.isUdpDns) {
-
+      startDnsDaemon()
-    // send event
+      startDnsTunnel()
-    application.tracker.send(new HitBuilders.EventBuilder()
-      .setCategory(TAG)
-      .setAction("stop")
-      .setLabel(getVersionName)
-      .build())
-
-    // reset VPN
-    killProcesses()
-
-    // close connections
-    if (conn != null) {
-      conn.close()
-      conn = null
     }
 
-    // stop the service if no callback registered
+    val fd = startVpn()
-    if (getCallbackCount == 0) {
+
-      stopSelf()
+    if (fd != -1) {
+      var tries = 1
+      while (tries < 5) {
+        Thread.sleep(1000 * tries)
+        if (System.sendfd(fd) != -1) {
+          return true
+        }
+        tries += 1
+      }
+    }
+    false
+  }
+
+  def startShadowsocksDaemon() {
+
+    if (config.route != Route.ALL) {
+      val acl: Array[String] = config.route match {
+        case Route.BYPASS_LAN => getResources.getStringArray(R.array.private_route)
+        case Route.BYPASS_CHN => getResources.getStringArray(R.array.chn_route_full)
+      }
+      ConfigUtils.printToFile(new File(Path.BASE + "acl.list"))(p => {
+        acl.foreach(item => p.println(item))
+      })
     }
 
-    // clean up the context
+    val conf = ConfigUtils
-    if (receiver != null) {
+      .SHADOWSOCKS.formatLocal(Locale.ENGLISH, config.proxy, config.remotePort, config.localPort,
-      unregisterReceiver(receiver)
+        config.sitekey, config.encMethod, 10)
-      receiver = null
+    ConfigUtils.printToFile(new File(Path.BASE + "ss-local-vpn.conf"))(p => {
+      p.println(conf)
+    })
+
+    val cmd = new ArrayBuffer[String]
+    cmd += (Path.BASE + "ss-local", "-V", "-u"
+      , "-b", "127.0.0.1"
+      , "-t", "600"
+      , "-c", Path.BASE + "ss-local-vpn.conf"
+      , "-f", Path.BASE + "ss-local-vpn.pid")
+
+    if (config.isAuth) cmd += "-A"
+
+    if (config.route != Route.ALL) {
+      cmd += "--acl"
+      cmd += (Path.BASE + "acl.list")
     }
 
-    // channge the state
+    if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
-    changeState(State.STOPPED)
+    Console.runCommand(cmd.mkString(" "))
+  }
+
+  def startDnsTunnel() = {
+    val conf = ConfigUtils
+      .SHADOWSOCKS.formatLocal(Locale.ENGLISH, config.proxy, config.remotePort, 8163,
+        config.sitekey, config.encMethod, 10)
+    ConfigUtils.printToFile(new File(Path.BASE + "ss-tunnel-vpn.conf"))(p => {
+      p.println(conf)
+    })
+    val cmd = new ArrayBuffer[String]
+    cmd += (Path.BASE + "ss-tunnel"
+      , "-V"
+      , "-u"
+      , "-t", "10"
+      , "-b", "127.0.0.1"
+      , "-l", "8163"
+      , "-L", "8.8.8.8:53"
+      , "-c", Path.BASE + "ss-tunnel-vpn.conf"
+      , "-f", Path.BASE + "ss-tunnel-vpn.pid")
+
+    if (config.isAuth) cmd += "-A"
+
+    if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
+    Console.runCommand(cmd.mkString(" "))
+  }
+
+  def startDnsDaemon() {
+    val ipv6 = if (config.isIpv6) "" else "reject = ::/0;"
+    val conf = {
+      if (config.route == Route.BYPASS_CHN) {
+        val reject = ConfigUtils.getRejectList(getContext, application)
+        val blackList = ConfigUtils.getBlackList(getContext, application)
+        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "0.0.0.0", 8153,
+          Path.BASE + "pdnsd-vpn.pid", reject, blackList, 8163, ipv6)
+      } else {
+        ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, "0.0.0.0", 8153,
+          Path.BASE + "pdnsd-vpn.pid", 8163, ipv6)
+      }
+    }
+    ConfigUtils.printToFile(new File(Path.BASE + "pdnsd-vpn.conf"))(p => {
+      p.println(conf)
+    })
+    val cmd = Path.BASE + "pdnsd -c " + Path.BASE + "pdnsd-vpn.conf"
+
+    if (BuildConfig.DEBUG) Log.d(TAG, cmd)
+    Console.runCommand(cmd)
+  }
+
+  override def getContext = getBaseContext
+
+  def startVpn(): Int = {
+
+    val builder = new Builder()
+    builder
+      .setSession(config.profileName)
+      .setMtu(VPN_MTU)
+      .addAddress(PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "1"), 24)
+      .addDnsServer("8.8.8.8")
+
+    if (config.isIpv6) {
+      builder.addAddress(PRIVATE_VLAN6.formatLocal(Locale.ENGLISH, "1"), 126)
+      builder.addRoute("::", 0)
+    }
+
+    if (Utils.isLollipopOrAbove) {
+
+      if (!config.isGlobalProxy) {
+        val apps = AppManager.getProxiedApps(this, config.proxiedAppString)
+        val pkgSet: mutable.HashSet[String] = new mutable.HashSet[String]
+        for (app <- apps) {
+          if (app.proxied) {
+            pkgSet.add(app.packageName)
+          }
+        }
+        for (pkg <- pkgSet) {
+          if (!config.isBypassApps) {
+            builder.addAllowedApplication(pkg)
+          } else {
+            builder.addDisallowedApplication(pkg)
+          }
+        }
+      }
+    }
+
+    if (config.route == Route.ALL) {
+      builder.addRoute("0.0.0.0", 0)
+    } else {
+      val privateList = getResources.getStringArray(R.array.bypass_private_route)
+      privateList.foreach(cidr => {
+        val addr = cidr.split('/')
+        builder.addRoute(addr(0), addr(1).toInt)
+      })
+    }
+
+    builder.addRoute("8.8.0.0", 16)
+
+    try {
+      conn = builder.establish()
+    } catch {
+      case ex: IllegalStateException =>
+        changeState(State.STOPPED, ex.getMessage)
+        conn = null
+      case ex: Exception => conn = null
+    }
+
+    if (conn == null) {
+      stopRunner()
+      return -1
+    }
+
+    val fd = conn.getFd
+
+    var cmd = (Path.BASE +
+      "tun2socks --netif-ipaddr %s "
+      + "--netif-netmask 255.255.255.0 "
+      + "--socks-server-addr 127.0.0.1:%d "
+      + "--tunfd %d "
+      + "--tunmtu %d "
+      + "--loglevel 3 "
+      + "--pid %stun2socks-vpn.pid")
+      .formatLocal(Locale.ENGLISH,
+        PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "2"),
+        config.localPort, fd, VPN_MTU, Path.BASE)
+
+    if (config.isIpv6)
+      cmd += " --netif-ip6addr " + PRIVATE_VLAN6.formatLocal(Locale.ENGLISH, "2")
+
+    if (config.isUdpDns)
+      cmd += " --enable-udprelay"
+    else
+      cmd += " --dnsgw %s:8153".formatLocal(Locale.ENGLISH, PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "1"))
+
+    if (BuildConfig.DEBUG) Log.d(TAG, cmd)
+
+    Console.runCommand(cmd)
+
+    return fd
   }
 
   override def stopBackgroundService() {
@@ -514,6 +464,4 @@ class ShadowsocksVpnService extends VpnService with BaseService {
   override def getTag = TAG
 
   override def getServiceMode = Mode.VPN
-
-  override def getContext = getBaseContext
 }

src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala

@@ -0,0 +1,146 @@
+/*
+ * Shadowsocks - A shadowsocks client for Android
+ * Copyright (C) 2015 <max.c.lv@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *                            ___====-_  _-====___
+ *                      _--^^^#####//      \\#####^^^--_
+ *                   _-^##########// (    ) \\##########^-_
+ *                  -############//  |\^^/|  \\############-
+ *                _/############//   (@::@)   \\############\_
+ *               /#############((     \\//     ))#############\
+ *              -###############\\    (oo)    //###############-
+ *             -#################\\  / VV \  //#################-
+ *            -###################\\/      \//###################-
+ *           _#/|##########/\######(   /\   )######/\##########|\#_
+ *           |/ |#/\#/\#/\/  \#/\##\  |  |  /##/\#/  \/\#/\#/\#| \|
+ *           `  |/  V  V  `   V  \#\| |  | |/#/  V   '  V  V  \|  '
+ *              `   `  `      `   / | |  | | \   '      '  '   '
+ *                               (  | |  | |  )
+ *                              __\ | |  | | /__
+ *                             (vvv(VVV)(VVV)vvv)
+ *
+ *                              HERE BE DRAGONS
+ *
+ */
+
+package com.github.shadowsocks
+
+import java.io.{File, FileDescriptor, IOException}
+import java.util.concurrent.Executors
+
+import android.net.{LocalServerSocket, LocalSocket, LocalSocketAddress}
+import android.util.Log
+
+class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
+
+  val TAG = "ShadowsocksVpnService"
+  val PATH = "/data/data/com.github.shadowsocks/protect_path"
+
+  @volatile var isRunning: Boolean = true
+  @volatile var serverSocket: LocalServerSocket = null
+
+  def closeServerSocket() {
+    if (serverSocket != null) {
+      try {
+        serverSocket.close()
+      } catch {
+        case _: Exception => // ignore
+      }
+      serverSocket = null
+      }
+  }
+
+  def stopThread() {
+    isRunning = false
+    closeServerSocket()
+  }
+
+  override def run(): Unit = {
+
+    try {
+      new File(PATH).delete()
+    } catch {
+      case _: Exception => // ignore
+    }
+
+    try {
+      val localSocket = new LocalSocket
+      localSocket.bind(new LocalSocketAddress(PATH, LocalSocketAddress.Namespace.FILESYSTEM))
+      serverSocket = new LocalServerSocket(localSocket.getFileDescriptor)
+    } catch {
+      case e: IOException =>
+        Log.e(TAG, "unable to bind", e)
+        return
+    }
+
+    val pool = Executors.newFixedThreadPool(4)
+
+    while (isRunning) {
+      try {
+        val socket = serverSocket.accept()
+
+        pool.execute(new Runnable {
+          override def run() {
+            try {
+              val input = socket.getInputStream
+              val output = socket.getOutputStream
+
+              input.read()
+
+              val fds = socket.getAncillaryFileDescriptors
+
+              if (fds.length > 0) {
+                var ret = false
+
+                val getInt = classOf[FileDescriptor].getDeclaredMethod("getInt$")
+                val fd = getInt.invoke(fds(0)).asInstanceOf[Int]
+                ret = vpnService.protect(fd)
+
+                // Trick to close file decriptor
+                System.jniclose(fd)
+
+                if (ret) {
+                  output.write(0)
+                } else {
+                  output.write(1)
+                }
+
+                input.close()
+                output.close()
+              }
+          } catch {
+            case e: Exception =>
+              Log.e(TAG, "Error when protect socket", e)
+          }
+
+          // close socket
+          try {
+            socket.close()
+          } catch {
+            case _: Exception => // ignore
+          }
+
+        }})
+      } catch {
+        case e: IOException => {
+          Log.e(TAG, "Error when accept socket", e)
+          return
+        }
+      }
+    }
+  }
+}

src/main/scala/com/github/shadowsocks/database/DBHelper.scala

@@ -51,7 +51,7 @@ object DBHelper {
 }
 
 class DBHelper(val context: Context)
-  extends OrmLiteSqliteOpenHelper(context, DBHelper.PROFILE, null, 9) {
+  extends OrmLiteSqliteOpenHelper(context, DBHelper.PROFILE, null, 11) {
 
   lazy val profileDao: Dao[Profile, Int] = getDao(classOf[Profile])
 
@@ -62,14 +62,23 @@ class DBHelper(val context: Context)
   def onUpgrade(database: SQLiteDatabase, connectionSource: ConnectionSource, oldVersion: Int,
     newVersion: Int) {
     if (oldVersion != newVersion) {
-      if (oldVersion < 8) {
+      if (oldVersion < 7) {
-        profileDao.executeRaw("ALTER TABLE `profile` ADD COLUMN udpdns SMALLINT;")
-        profileDao.executeRaw("ALTER TABLE `profile` ADD COLUMN route VARCHAR;")
-      } else if (oldVersion < 9) {
-        profileDao.executeRaw("ALTER TABLE `profile` ADD COLUMN route VARCHAR;")
-      } else {
         profileDao.executeRaw("DROP TABLE IF EXISTS 'profile';")
         onCreate(database, connectionSource)
+      } else {
+        if (oldVersion < 8) {
+          profileDao.executeRaw("ALTER TABLE `profile` ADD COLUMN udpdns SMALLINT;")
+          profileDao.executeRaw("ALTER TABLE `profile` ADD COLUMN route VARCHAR;")
+        }
+        if (oldVersion < 9) {
+          profileDao.executeRaw("ALTER TABLE `profile` ADD COLUMN route VARCHAR;")
+        }
+        if (oldVersion < 10) {
+          profileDao.executeRaw("ALTER TABLE `profile` ADD COLUMN auth SMALLINT;")
+        }
+        if (oldVersion < 11) {
+          profileDao.executeRaw("ALTER TABLE `profile` ADD COLUMN ipv6 SMALLINT;")
+        }
       }
     }
   }

src/main/scala/com/github/shadowsocks/database/Profile.scala

@@ -90,6 +90,12 @@ class Profile {
   @DatabaseField
   var udpdns: Boolean = false
 
+  @DatabaseField
+  var auth: Boolean = false
+
+  @DatabaseField
+  var ipv6: Boolean = false
+
   @DatabaseField(dataType = DataType.LONG_STRING)
   var individual: String = ""
 

src/main/scala/com/github/shadowsocks/database/ProfileManager.scala

@@ -122,6 +122,8 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
     edit.putBoolean(Key.isBypassApps, profile.bypass)
     edit.putBoolean(Key.isTrafficStat, profile.traffic)
     edit.putBoolean(Key.isUdpDns, profile.udpdns)
+    edit.putBoolean(Key.isAuth, profile.auth)
+    edit.putBoolean(Key.isIpv6, profile.ipv6)
     edit.putString(Key.profileName, profile.name)
     edit.putString(Key.proxy, profile.host)
     edit.putString(Key.sitekey, profile.password)
@@ -146,6 +148,8 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
     profile.bypass = settings.getBoolean(Key.isBypassApps, false)
     profile.traffic = settings.getBoolean(Key.isTrafficStat, false)
     profile.udpdns = settings.getBoolean(Key.isUdpDns, false)
+    profile.auth = settings.getBoolean(Key.isAuth, false)
+    profile.ipv6 = settings.getBoolean(Key.isIpv6, false)
     profile.name = settings.getString(Key.profileName, "default")
     profile.host = settings.getString(Key.proxy, "127.0.0.1")
     profile.password = settings.getString(Key.sitekey, "default")

src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala

@@ -82,7 +82,7 @@ object ConfigUtils {
       | label = "local";
       | ip = 127.0.0.1;
       | port = %d;
-      | reject = ::/0;
+      | %s
       | reject_policy = negate;
       | reject_recursively = on;
       | timeout = 5;
@@ -159,8 +159,8 @@ object ConfigUtils {
       |
       |server {
       | label = "china-servers";
-      | ip = 223.5.5.5, 114.114.114.114;
+      | ip = 114.114.114.114, 112.124.47.27;
-      | timeout = 2;
+      | timeout = 4;
       | reject = %s;
       | reject_policy = fail;
       | reject_recursively = on;
@@ -174,7 +174,9 @@ object ConfigUtils {
       | label = "local-server";
       | ip = 127.0.0.1;
       | port = %d;
-      | timeout = 3;
+      | %s
+      | reject_policy = negate;
+      | reject_recursively = on;
       |}
       |
       |rr {
@@ -240,7 +242,7 @@ object ConfigUtils {
     val method = proxy(3).trim
 
     new Config(config.isGlobalProxy, config.isGFWList, config.isBypassApps, config.isTrafficStat,
-      config.isUdpDns, config.profileName, host, password, method, config.proxiedAppString, config.route, port,
+      config.isUdpDns, config.isAuth, config.isIpv6, config.profileName, host, password, method, config.proxiedAppString, config.route, port,
       config.localPort)
   }
 
@@ -250,6 +252,8 @@ object ConfigUtils {
     val isBypassApps = settings.getBoolean(Key.isBypassApps, false)
     val isTrafficStat = settings.getBoolean(Key.isTrafficStat, false)
     val isUdpDns = settings.getBoolean(Key.isUdpDns, false)
+    val isAuth = settings.getBoolean(Key.isAuth, false)
+    val isIpv6 = settings.getBoolean(Key.isIpv6, false)
 
     val profileName = settings.getString(Key.profileName, "default")
     val proxy = settings.getString(Key.proxy, "127.0.0.1")
@@ -271,7 +275,7 @@ object ConfigUtils {
     }
     val proxiedAppString = settings.getString(Key.proxied, "")
 
-    new Config(isGlobalProxy, isGFWList, isBypassApps, isTrafficStat, isUdpDns, profileName, proxy,
+    new Config(isGlobalProxy, isGFWList, isBypassApps, isTrafficStat, isUdpDns, isAuth, isIpv6, profileName, proxy,
       sitekey, encMethod, proxiedAppString, route, remotePort, localPort)
   }
 }

src/main/scala/com/github/shadowsocks/utils/Constants.scala

@@ -79,6 +79,8 @@ object Key {
   val isBypassApps = "isBypassApps"
   val isTrafficStat = "isTrafficStat"
   val isUdpDns = "isUdpDns"
+  val isAuth= "isAuth"
+  val isIpv6= "isIpv6"
 
   val proxy = "proxy"
   val sitekey = "sitekey"