Revert toolchain to GCC 4.9

Addresses: https://github.com/shadowsocks/shadowsocks-org/issues/21

.gitignore

@@ -14,6 +14,7 @@ gen_*
 *.class
 *.o
 local.sbt
+.deps
 
 #Intellij IDEA
 *.iml
@@ -26,8 +27,6 @@ out/
 #NDK
 src/main/obj
 src/main/libs
-src/main/assets/armeabi
-src/main/assets/armeabi-v7a
-src/main/assets/x86
-src/main/assets/api-16/
+src/main/assets/armeabi-v7a/*
+src/main/assets/x86/*
 jni/Application.mk

.gitmodules

@@ -9,9 +9,6 @@
 	path = src/main/jni/libancillary
 	url = https://github.com/shadowsocks/libancillary.git
 	branch = shadowsocks-android
-[submodule "src/main/jni/openssl"]
-	path = src/main/jni/openssl
-	url = https://github.com/shadowsocks/openssl-android.git
 [submodule "src/main/jni/libevent"]
 	path = src/main/jni/libevent
 	url = https://github.com/shadowsocks/libevent.git
@@ -24,3 +21,12 @@
 	path = src/main/jni/pdnsd
 	url = https://github.com/shadowsocks/pdnsd.git
 	branch = shadowsocks-android
+[submodule "kcptun/kcptun"]
+	path = kcptun/kcptun
+	url = https://github.com/shadowsocks/kcptun
+[submodule "kcptun/go"]
+	path = kcptun/go
+	url = https://github.com/shadowsocks/go
+[submodule "src/main/jni/mbedtls"]
+	path = src/main/jni/mbedtls
+	url = https://github.com/ARMmbed/mbedtls

.travis.yml

@@ -1,19 +1,16 @@
-language: scala
+language: android
 
 jdk:
   - oraclejdk8
 
-sudo: false
-
-addons:
-    apt:
-        packages:
-            - gcc-multilib
-            - g++-multilib
-            - libstdc++6:i386
-            - libgcc1:i386
-            - zlib1g:i386
-            - libncurses5:i386
+env:
+    global:
+        - NDK_VERSION=r12b
+        - NDK_CCACHE=ccache
+        - GOROOT_BOOTSTRAP=$GOROOT
+        - ANDROID_NDK_HOME=$HOME/.android/android-ndk-${NDK_VERSION}
+        - SBTPATH=$HOME/.sbt
+        - PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
 
 scala:
     - 2.11.8
@@ -24,17 +21,32 @@ before_cache:
 
 cache:
     directories:
-        - $HOME/.ivy2/cache
-        - $HOME/.sbt/boot
+        - $HOME/.ivy2
+        - $HOME/.sbt
+
+android:
+    components:
+        - tools
+        - build-tools-24.0.1
+        - extra-google-m2repository
 
 install:
-    - ./travis-ci/setup.sh
-    - export NDK_CCACHE=ccache
-    - export ARCH=`uname -m`
-    - export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r12b
-    - export ANDROID_HOME=$HOME/.android/android-sdk-linux
-    - export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
-    - cp local.properties.travis local.properties
+    - >
+      if [ ! -d "$ANDROID_NDK_HOME" ]; then
+          mkdir -p $ANDROID_NDK_HOME;
+          pushd $HOME/.android;
+          export ARCH=`uname -m`;
+          wget -q http://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux-${ARCH}.zip;
+          unzip -q android-ndk-${NDK_VERSION}-linux-${ARCH}.zip;
+          popd;
+      fi
+    - >
+      if [ ! -f "$SBTPATH/sbt" ]; then
+          pushd $SBTPATH;
+          wget -q https://raw.githubusercontent.com/paulp/sbt-extras/master/sbt;
+          chmod a+x sbt;
+          popd;
+      fi
 
 script:
-    - sbt native-build android:package-release
+    - $SBTPATH/sbt native-build android:package-debug

README.md

@@ -12,13 +12,17 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
 
 * JDK 1.8
 * SBT 0.13.0+
-* Android SDK r25+
+* Go 1.4+
+* Android SDK
+  - Build Tools 24+ (as required by [`sbt-android`](https://github.com/scala-android/sbt-android))
+  - Google Repository (see `build.sbt` for version)
 * Android NDK r12b+
 
 ### BUILD
 
 * Set environment variable `ANDROID_HOME` to `/path/to/android-sdk`
 * Set environment variable `ANDROID_NDK_HOME` to `/path/to/android-ndk`
+* Set environment variable `GOROOT_BOOTSTRAP` to `/path/to/go`
 * Create your key following the instructions at https://developer.android.com/studio/publish/app-signing.html
 * Put your key in ~/.keystore
 * Create `local.properties` from `local.properties.example` with your own key information
@@ -26,33 +30,11 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
 
 ```bash
     git submodule update --init
-    
+
     # Build the App
     sbt native-build clean android:package-release
 ```
 
-#### BUILD on Mac OS X (with HomeBrew)
-
-* Install Android SDK and NDK by run `brew install android-ndk android-sdk`
-* Add `export ANDROID_HOME=/usr/local/Cellar/android-sdk/$version` to your .bashrc , then reopen the shell to load it.
-* Add `export ANDROID_NDK_HOME=/usr/local/Cellar/android-ndk/$version` to your .bashrc , then reopen the shell to load it.
-* echo "y" | android update sdk --filter tools,platform-tools,build-tools-23.0.2,android-23,extra-google-m2repository --no-ui -a
-* echo "y" | android update sdk --filter extra-android-m2repository --no-ui --no-https -a
-* Create your key following the instructions at http://developer.android.com/guide/publishing/app-signing.html#cert
-* Put your key in ~/.keystore
-* Create `local.properties` from `local.properties.example` with your own key information .
-* Invoke the building like this
-
-```bash
-    git submodule update --init
-
-    # Build native binaries
-    ./build.sh
-
-    # Build the apk
-    sbt clean android:package-release
-```
-
 ## OPEN SOURCE LICENSES
 
 * shadowsocks-libev: [GPLv3](https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE)
@@ -62,10 +44,11 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
 * pdnsd: [GPLv3](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING)
 * libev: [GPLv2](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/libev/LICENSE)
 * libevent: [BSD](https://github.com/shadowsocks/libevent/blob/master/LICENSE)
+* kcptun: [MIT](https://github.com/xtaci/kcptun)
 
 ### LICENSE
 
-Copyright (C) 2016 by Max Lv <<max.c.lv@gmail.com>> <br/>
+Copyright (C) 2016 by Max Lv <<max.c.lv@gmail.com>>  
 Copyright (C) 2016 by Mygod Studio <<mygodstudio@gmail.com>>
 
 This program is free software: you can redistribute it and/or modify

build.sbt

@@ -28,8 +28,6 @@ dexMaxHeap in Android := "4g"
 
 resolvers += Resolver.jcenterRepo
 
-resolvers += "JRAF" at "http://JRAF.org/static/maven/2"
-
 useSupportVectors
 
 libraryDependencies ++= Seq(
@@ -37,16 +35,16 @@ libraryDependencies ++= Seq(
   "com.github.kevinsawicki" % "http-request" % "6.0",
   "eu.chainfire" % "libsuperuser" % "1.0.0.201607041850",
   "net.glxn.qrgen" % "android" % "2.0",
-  "com.google.android.gms" % "play-services-ads" % "9.2.1",
-  "com.google.android.gms" % "play-services-analytics" % "9.2.1",
-  "com.android.support" % "design" % "24.0.0",
-  "com.android.support" % "gridlayout-v7" % "24.0.0",
-  "com.android.support" % "cardview-v7" % "24.0.0",
+  "com.google.android.gms" % "play-services-ads" % "9.4.0",
+  "com.google.android.gms" % "play-services-analytics" % "9.4.0",
+  "com.android.support" % "design" % "24.1.1",
+  "com.android.support" % "gridlayout-v7" % "24.1.1",
+  "com.android.support" % "cardview-v7" % "24.1.1",
   "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01",
-  "com.j256.ormlite" % "ormlite-android" % "4.48",
+  "com.j256.ormlite" % "ormlite-android" % "5.0",
   "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2",
   "com.github.clans" % "fab" % "1.6.4",
-  "me.dm7.barcodescanner" % "zxing" % "1.8.4"
+  "me.dm7.barcodescanner" % "zxing" % "1.9"
 )
 
 proguardVersion in Android := "5.2.1"
@@ -55,10 +53,8 @@ proguardCache in Android := Seq()
 
 proguardOptions in Android ++= Seq(
   "-keep class com.github.shadowsocks.System { *; }",
-  "-dontnote com.google.android.gms.internal.**",
-  "-dontnote com.j256.ormlite.**",
-  "-dontnote me.dm7.barcodescannerview.**",
-  "-dontnote org.xbill.**",
+  "-dontwarn com.google.android.gms.internal.**",
+  "-dontwarn com.j256.ormlite.**",
   "-dontwarn org.xbill.**")
 
 lazy val nativeBuild = TaskKey[Unit]("native-build", "Build native executables")

build.sh

@@ -4,21 +4,25 @@ function try () {
 "$@" || exit -1
 }
 
-try pushd src/main
-
-# Build
-#try $ANDROID_NDK_HOME/ndk-build clean
+# Build native binaries
+pushd src/main
 try $ANDROID_NDK_HOME/ndk-build -j8
 
-# copy executables
 rm -rf assets/armeabi-v7a
 rm -rf assets/x86
 mkdir -p assets/armeabi-v7a
 mkdir -p assets/x86
+
+#copy executables
 for app in pdnsd redsocks ss-local ss-tunnel tun2socks
 do
+    echo $app
     try mv libs/armeabi-v7a/$app assets/armeabi-v7a/
     try mv libs/x86/$app assets/x86/
 done
+popd
 
-try popd
+# Build kcptun
+pushd kcptun
+try ./make.bash
+popd

deploy

@@ -1,3 +0,0 @@
-#!/bin/bash
-cd ${1}
-travis-artifacts upload --path ${2} --target-path nightly

kcptun/make.bash

@@ -0,0 +1,68 @@
+#!/bin/bash
+
+function try () {
+"$@" || exit -1
+}
+
+[ -z "$ANDROID_NDK_HOME" ] && ANDROID_NDK_HOME=~/android-ndk-r12b
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DEPS=$DIR/.deps
+ANDROID_ARM_TOOLCHAIN=$DEPS/android-toolchain-16-arm
+ANDROID_X86_TOOLCHAIN=$DEPS/android-toolchain-16-x86
+
+ANDROID_ARM_CC=$ANDROID_ARM_TOOLCHAIN/bin/arm-linux-androideabi-gcc
+ANDROID_ARM_STRIP=$ANDROID_ARM_TOOLCHAIN/bin/arm-linux-androideabi-strip
+
+ANDROID_X86_CC=$ANDROID_X86_TOOLCHAIN/bin/i686-linux-android-gcc
+ANDROID_X86_STRIP=$ANDROID_X86_TOOLCHAIN/bin/i686-linux-android-strip
+
+
+if [ ! -d "$DEPS" ]; then
+    mkdir -p $DEPS 
+fi
+
+if [ ! -d "$ANDROID_ARM_TOOLCHAIN" ]; then
+    echo "Make standalone toolchain for ARM arch"
+    $ANDROID_NDK_HOME/build/tools/make_standalone_toolchain.py --arch arm \
+        --api 16 --install-dir $ANDROID_ARM_TOOLCHAIN
+fi
+
+if [ ! -d "$ANDROID_X86_TOOLCHAIN" ]; then
+    echo "Make standalone toolchain for X86 arch"
+    $ANDROID_NDK_HOME/build/tools/make_standalone_toolchain.py --arch x86 \
+        --api 16 --install-dir $ANDROID_X86_TOOLCHAIN
+fi
+
+if [ ! -d "$DIR/go/bin" ]; then
+    echo "Build the custom go"
+
+    pushd $DIR/go/src
+    try ./make.bash
+    popd
+fi
+
+export GOROOT=$DIR/go
+export GOPATH=$DEPS/gopath
+export GOBIN=$GOPATH/bin
+mkdir -p $GOBIN
+export PATH=$GOROOT/bin:$PATH
+
+pushd kcptun/client
+
+echo "Get dependences for kcptun"
+go get -u github.com/xtaci/kcp-go
+go get
+
+echo "Cross compile kcptun for arm"
+try env CGO_ENABLED=1 CC=$ANDROID_ARM_CC GOOS=android GOARCH=arm GOARM=7 go build -ldflags="-s -w"
+try $ANDROID_ARM_STRIP client
+try mv client $DIR/../src/main/assets/armeabi-v7a/kcptun
+
+echo "Cross compile kcptun for x86"
+try env CGO_ENABLED=1 CC=$ANDROID_X86_CC GOOS=android GOARCH=386 go build -ldflags="-s -w"
+try $ANDROID_X86_STRIP client
+try mv client $DIR/../src/main/assets/x86/kcptun
+popd
+
+echo "Successfully build kcptun"

local.properties.travis

@@ -1,3 +0,0 @@
-key.alias: travis
-key.store: travis.keystore
-key.store.password: travis

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.8")
+addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.12")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
 

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="141"
-          android:versionName="2.10.8">
+          android:versionCode="146"
+          android:versionName="3.0.4">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/assets/pages/about.html

@@ -296,6 +296,7 @@ along with this program. If not, see <a href="http://www.gnu.org/licenses/">http
     <li>pdnsd: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING">GPLv3</a></li>
     <li>libev: <a href="https://github.com/shadowsocks/libevent/blob/shadowsocks-android/LICENSE">GPLv2</a></li>
     <li>libevent: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/libevent/LICENSE">BSD</a></li>
+    <li>kcptun: <a href="https://github.com/xtaci/kcptun/commits/master/LICENSE.md">MIT</a></li>
 </ul>
 
 </body>

src/main/jni/Android.mk

@@ -222,7 +222,7 @@ include $(CLEAR_VARS)
 LIBEVENT_SOURCES := \
 	buffer.c \
 	bufferevent.c bufferevent_filter.c \
-	bufferevent_openssl.c bufferevent_pair.c bufferevent_ratelim.c \
+	bufferevent_pair.c bufferevent_ratelim.c \
 	bufferevent_sock.c epoll.c \
 	epoll_sub.c evdns.c event.c \
     event_tagging.c evmap.c \
@@ -236,7 +236,6 @@ LOCAL_MODULE := event
 LOCAL_SRC_FILES := $(addprefix libevent/, $(LIBEVENT_SOURCES))
 LOCAL_CFLAGS := -O2 -I$(LOCAL_PATH)/libevent \
 	-I$(LOCAL_PATH)/libevent/include \
-	-I$(LOCAL_PATH)/openssl/include
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -387,11 +386,11 @@ SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c netutils.c j
 LOCAL_MODULE    := ss-local
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
 LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
-					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
+					-DUSE_CRYPTO_MBEDTLS -DANDROID -DHAVE_CONFIG_H \
 					-DCONNECT_IN_PROGRESS=EINPROGRESS \
 					-I$(LOCAL_PATH)/include \
 					-I$(LOCAL_PATH)/libancillary \
-					-I$(LOCAL_PATH)/openssl/include  \
+					-I$(LOCAL_PATH)/mbedtls/include  \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libudns \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \
@@ -400,7 +399,7 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libev \
 					-I$(LOCAL_PATH)/include/shadowsocks-libev
 
-LOCAL_STATIC_LIBRARIES := libev libcrypto libipset libcork libudns libsodium libancillary
+LOCAL_STATIC_LIBRARIES := libev libmbedtls libipset libcork libudns libsodium libancillary
 
 LOCAL_LDLIBS := -llog
 
@@ -417,7 +416,7 @@ SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c
 LOCAL_MODULE    := ss-tunnel
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
 LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
-					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H -DSSTUNNEL_JNI \
+					-DUSE_CRYPTO_MBEDTLS -DANDROID -DHAVE_CONFIG_H -DSSTUNNEL_JNI \
 					-DCONNECT_IN_PROGRESS=EINPROGRESS \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/include \
@@ -425,11 +424,11 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
 					-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 \
+					-I$(LOCAL_PATH)/mbedtls/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libev \
 					-I$(LOCAL_PATH)/include/shadowsocks-libev
 
-LOCAL_STATIC_LIBRARIES := libev libcrypto libsodium libcork libudns libancillary
+LOCAL_STATIC_LIBRARIES := libev libmbedtls libsodium libcork libudns libancillary
 
 LOCAL_LDLIBS := -llog
 
@@ -546,12 +545,23 @@ LOCAL_SRC_FILES := $(addprefix badvpn/, $(TUN2SOCKS_SOURCES))
 
 include $(BUILD_EXECUTABLE)
 
-# OpenSSL
-openssl_subdirs := $(addprefix $(LOCAL_PATH)/openssl/,$(addsuffix /Android.mk, \
-	crypto \
-	ssl \
-	))
-include $(openssl_subdirs)
+########################################################
+## mbed TLS 
+########################################################
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= mbedtls
+
+LOCAL_C_INCLUDES:= $(LOCAL_PATH)/mbedtls/include
+
+MBEDTLS_SOURCES  := $(wildcard $(LOCAL_PATH)/mbedtls/library/*.c)
+
+LOCAL_SRC_FILES := $(MBEDTLS_SOURCES:$(LOCAL_PATH)/%=%)
+
+LOCAL_LDLIBS := -ldl -llog
+
+include $(BUILD_STATIC_LIBRARY)
 
 # Import cpufeatures
 $(call import-module,android/cpufeatures)

src/main/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_ABI      			:= armeabi-v7a x86
 APP_PLATFORM 			:= android-16
 APP_STL      			:= stlport_static
-NDK_TOOLCHAIN_VERSION 	:= clang
+NDK_TOOLCHAIN_VERSION 	:= 4.9

src/main/jni/include/shadowsocks-libev/config.h

@@ -26,7 +26,7 @@
 /* #undef HAVE_CCCRYPTORCREATEWITHMODE */
 
 /* Define to 1 if you have the `clock_gettime' function. */
-#define HAVE_CLOCK_GETTIME 1
+/* #undef HAVE_CLOCK_GETTIME */
 
 /* Define to 1 to use the syscall interface for clock_gettime */
 /* #undef HAVE_CLOCK_SYSCALL */
@@ -42,13 +42,13 @@
 #define HAVE_DLFCN_H 1
 
 /* Define to 1 if you have the `epoll_ctl' function. */
-#define HAVE_EPOLL_CTL 1
+/* #undef HAVE_EPOLL_CTL */
 
 /* Define to 1 if you have the `eventfd' function. */
-#define HAVE_EVENTFD 1
+/* #undef HAVE_EVENTFD */
 
 /* Define to 1 if you have the `EVP_EncryptInit_ex' function. */
-#define HAVE_EVP_ENCRYPTINIT_EX 1
+/* #undef HAVE_EVP_ENCRYPTINIT_EX */
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
@@ -66,7 +66,7 @@
 /* #undef HAVE_INET_NTOP */
 
 /* Define to 1 if you have the `inotify_init' function. */
-#define HAVE_INOTIFY_INIT 1
+/* #undef HAVE_INOTIFY_INIT */
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
@@ -75,7 +75,7 @@
 #define HAVE_IPv6 1
 
 /* Define to 1 if you have the `kqueue' function. */
-/* #undef HAVE_KQUEUE */
+#define HAVE_KQUEUE 1
 
 /* Define to 1 if you have the <langinfo.h> header file. */
 #define HAVE_LANGINFO_H 1
@@ -90,14 +90,14 @@
 #define HAVE_LIMITS_H 1
 
 /* Define to 1 if you have the <linux/if.h> header file. */
-#define HAVE_LINUX_IF_H 1
+/* #undef HAVE_LINUX_IF_H */
 
 /* Define to 1 if you have the <linux/netfilter_ipv4.h> header file. */
-#define HAVE_LINUX_NETFILTER_IPV4_H 1
+/* #undef HAVE_LINUX_NETFILTER_IPV4_H */
 
 /* Define to 1 if you have the <linux/netfilter_ipv6/ip6_tables.h> header
    file. */
-#define HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H 1
+/* #undef HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H */
 
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
@@ -124,25 +124,25 @@
 #define HAVE_NET_IF_H 1
 
 /* Define to 1 if you have the <openssl/engine.h> header file. */
-#define HAVE_OPENSSL_ENGINE_H 1
+/* #undef HAVE_OPENSSL_ENGINE_H */
 
 /* Define to 1 if you have the <openssl/err.h> header file. */
-#define HAVE_OPENSSL_ERR_H 1
+/* #undef HAVE_OPENSSL_ERR_H */
 
 /* Define to 1 if you have the <openssl/evp.h> header file. */
-#define HAVE_OPENSSL_EVP_H 1
+/* #undef HAVE_OPENSSL_EVP_H */
 
 /* Define to 1 if you have the <openssl/pem.h> header file. */
-#define HAVE_OPENSSL_PEM_H 1
+/* #undef HAVE_OPENSSL_PEM_H */
 
 /* Define to 1 if you have the <openssl/rand.h> header file. */
-#define HAVE_OPENSSL_RAND_H 1
+/* #undef HAVE_OPENSSL_RAND_H */
 
 /* Define to 1 if you have the <openssl/rsa.h> header file. */
-#define HAVE_OPENSSL_RSA_H 1
+/* #undef HAVE_OPENSSL_RSA_H */
 
 /* Define to 1 if you have the <openssl/sha.h> header file. */
-#define HAVE_OPENSSL_SHA_H 1
+/* #undef HAVE_OPENSSL_SHA_H */
 
 /* Define to 1 if you have the `poll' function. */
 #define HAVE_POLL 1
@@ -160,13 +160,13 @@
 #define HAVE_PTHREAD_PRIO_INHERIT 1
 
 /* Define to 1 if you have the `RAND_pseudo_bytes' function. */
-#define HAVE_RAND_PSEUDO_BYTES 1
+/* #undef HAVE_RAND_PSEUDO_BYTES */
 
 /* Define to 1 if you have the 'select' function. */
 #define HAVE_SELECT 1
 
 /* Define to 1 if you have the `setresuid' function. */
-#define HAVE_SETRESUID 1
+/* #undef HAVE_SETRESUID */
 
 /* Define to 1 if you have the `setreuid' function. */
 #define HAVE_SETREUID 1
@@ -175,7 +175,7 @@
 #define HAVE_SETRLIMIT 1
 
 /* Define to 1 if you have the `signalfd' function. */
-#define HAVE_SIGNALFD 1
+/* #undef HAVE_SIGNALFD */
 
 /* Define to 1 if you have the `socket' function. */
 #define HAVE_SOCKET 1
@@ -196,16 +196,16 @@
 #define HAVE_STRING_H 1
 
 /* Define to 1 if you have the <sys/epoll.h> header file. */
-#define HAVE_SYS_EPOLL_H 1
+/* #undef HAVE_SYS_EPOLL_H */
 
 /* Define to 1 if you have the <sys/eventfd.h> header file. */
-#define HAVE_SYS_EVENTFD_H 1
+/* #undef HAVE_SYS_EVENTFD_H */
 
 /* Define to 1 if you have the <sys/event.h> header file. */
-/* #undef HAVE_SYS_EVENT_H */
+#define HAVE_SYS_EVENT_H 1
 
 /* Define to 1 if you have the <sys/inotify.h> header file. */
-#define HAVE_SYS_INOTIFY_H 1
+/* #undef HAVE_SYS_INOTIFY_H */
 
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #define HAVE_SYS_IOCTL_H 1
@@ -214,7 +214,7 @@
 #define HAVE_SYS_SELECT_H 1
 
 /* Define to 1 if you have the <sys/signalfd.h> header file. */
-#define HAVE_SYS_SIGNALFD_H 1
+/* #undef HAVE_SYS_SIGNALFD_H */
 
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #define HAVE_SYS_SOCKET_H 1
@@ -253,10 +253,10 @@
 /* #undef HAVE_WS2TCPIP_H */
 
 /* have zlib compression support */
-#define HAVE_ZLIB 1
+/* #undef HAVE_ZLIB */
 
 /* Define to 1 if you have the <zlib.h> header file. */
-#define HAVE_ZLIB_H 1
+/* #undef HAVE_ZLIB_H */
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
@@ -275,7 +275,7 @@
 #define PACKAGE_NAME "shadowsocks-libev"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shadowsocks-libev 2.4.7"
+#define PACKAGE_STRING "shadowsocks-libev 2.4.8"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "shadowsocks-libev"
@@ -284,7 +284,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.4.7"
+#define PACKAGE_VERSION "2.4.8"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -315,10 +315,10 @@
 /* #undef USE_CRYPTO_APPLECC */
 
 /* Use mbed TLS library */
-/* #undef USE_CRYPTO_MBEDTLS */
+#define USE_CRYPTO_MBEDTLS 1
 
 /* Use OpenSSL library */
-#define USE_CRYPTO_OPENSSL 1
+/* #undef USE_CRYPTO_OPENSSL */
 
 /* Use PolarSSL library */
 /* #undef USE_CRYPTO_POLARSSL */
@@ -346,7 +346,7 @@
 
 
 /* Version number of package */
-#define VERSION "2.4.7"
+#define VERSION "2.4.8"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

src/main/res/layout-w400dp/layout_main_stat_title.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:text="@string/stat" android:textSize="16sp"
-              android:textColor="?android:attr/textColorPrimary" android:ellipsize="marquee"
-              android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <TextView android:id="@+id/connection_test" android:gravity="end"
-              android:textSize="14sp" android:textColor="?android:attr/textColorSecondary"
-              android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"/>
-</LinearLayout>

src/main/res/layout/layout_main.xml

@@ -10,13 +10,31 @@
         <LinearLayout android:id="@+id/stat" android:elevation="4dp" android:visibility="gone"
                       android:layout_width="match_parent" android:layout_height="wrap_content"
                       android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical"
-                      android:paddingStart="16dip" android:paddingEnd="88dip" android:focusable="true"
-                      android:paddingLeft="16dip" android:paddingRight="88dip"
+                      android:paddingStart="16dip" android:paddingEnd="16dip" android:focusable="true"
+                      android:paddingLeft="16dip" android:paddingRight="16dip"
                       android:paddingTop="16dip" android:paddingBottom="16dip"
                       android:background="@drawable/background_stat" android:orientation="vertical">
-            <include layout="@layout/layout_main_stat_title"/>
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content">
+                <TextView android:text="@string/stat"
+                          android:textSize="16sp"
+                          android:textColor="?android:attr/textColorPrimary"
+                          android:ellipsize="marquee"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"/>
+                <TextView android:id="@+id/connection_test"
+                          android:gravity="end"
+                          android:textSize="14sp"
+                          android:textColor="?android:attr/textColorSecondary"
+                          android:layout_width="0dp"
+                          android:layout_height="wrap_content"
+                          android:layout_weight="1"/>
+            </LinearLayout>
             <android.support.v7.widget.GridLayout android:layout_width="match_parent"
-                                                  android:layout_height="wrap_content" app:columnCount="4">
+                                                  android:layout_height="wrap_content"
+                                                  android:paddingEnd="72dip"
+                                                  android:paddingRight="72dip"
+                                                  app:columnCount="4">
                 <TextView app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
                           android:ellipsize="marquee" android:text="@string/sent"
                           android:layout_width="wrap_content" android:layout_height="wrap_content"

src/main/res/layout/layout_main_stat_title.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"
-              android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:text="@string/stat" android:textSize="16sp"
-              android:textColor="?android:attr/textColorPrimary" android:ellipsize="marquee"
-              android:layout_width="match_parent" android:layout_height="wrap_content"/>
-    <TextView android:id="@+id/connection_test"
-              android:textSize="14sp" android:textColor="?android:attr/textColorSecondary"
-              android:layout_width="match_parent" android:layout_height="wrap_content"/>
-</LinearLayout>

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

@@ -134,4 +134,11 @@
   <!-- status -->
   <string name="sent">Отправлено:</string>
   <string name="received">Получено:</string>
+
+  <!-- kcp -->
+  <string name="kcp_summary">Включить Shadowsocks над KCPTUN</string>
+  <string name="kcp_port">KCP порт</string>
+  <string name="kcp_port_summary">%d (KCPTUN омер порта удалённого сервера)</string>
+  <string name="kcpcli">KCP параметры</string>
+  <string name="kcpcli_summary">Командная строка KCPTUN</string>
 </resources>

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

@@ -134,4 +134,11 @@
   <string name="sent">发送:</string>
   <string name="received">接收:</string>
 
+  <!-- kcp -->
+  <string name="kcp_summary">启用 KCP 协议</string>
+  <string name="kcp_port">KCP 端口</string>
+  <string name="kcp_port_summary">%d（远端 KCPTUN 服务器的端口号）</string>
+  <string name="kcpcli">KCP 参数</string>
+  <string name="kcpcli_summary">KCPTUN 的命令行参数</string>
+
 </resources>

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

@@ -136,4 +136,11 @@
   <string name="sent">傳送:</string>
   <string name="received">接收:</string>
 
+  <!-- kcp -->
+  <string name="kcp_summary">啟用 KCP 協定</string>
+  <string name="kcp_port">KCP 連接埠</string>
+  <string name="kcp_port_summary">%d（遠端 KCPTUN 伺服器的連接埠號碼）</string>
+  <string name="kcpcli">KCP 參數</string>
+  <string name="kcpcli_summary">KCPTUN 的命令行參數</string>
+
 </resources>

src/main/res/values/arrays.xml

@@ -7,15 +7,13 @@
         <item>AES-128-CFB</item>
         <item>AES-192-CFB</item>
         <item>AES-256-CFB</item>
+        <item>AES-128-CTR</item>
+        <item>AES-192-CTR</item>
+        <item>AES-256-CTR</item>
         <item>BF-CFB</item>
         <item>CAMELLIA-128-CFB</item>
         <item>CAMELLIA-192-CFB</item>
         <item>CAMELLIA-256-CFB</item>
-        <item>CAST5-CFB</item>
-        <item>DES-CFB</item>
-        <item>IDEA-CFB</item>
-        <item>RC2-CFB</item>
-        <item>SEED-CFB</item>
         <item>SALSA20</item>
         <item>CHACHA20</item>
         <item>CHACHA20-IETF</item>
@@ -28,15 +26,13 @@
         <item>aes-128-cfb</item>
         <item>aes-192-cfb</item>
         <item>aes-256-cfb</item>
+        <item>aes-128-ctr</item>
+        <item>aes-192-ctr</item>
+        <item>aes-256-ctr</item>
         <item>bf-cfb</item>
         <item>camellia-128-cfb</item>
         <item>camellia-192-cfb</item>
         <item>camellia-256-cfb</item>
-        <item>cast5-cfb</item>
-        <item>des-cfb</item>
-        <item>idea-cfb</item>
-        <item>rc2-cfb</item>
-        <item>seed-cfb</item>
         <item>salsa20</item>
         <item>chacha20</item>
         <item>chacha20-ietf</item>

src/main/res/values/strings.xml

@@ -139,4 +139,12 @@
   <!-- status -->
   <string name="sent">Sent:</string>
   <string name="received">Received:</string>
+
+  <!-- kcp -->
+  <string name="kcp" translatable="false">KCP</string>
+  <string name="kcp_summary">Enable Shadowsocks over KCP</string>
+  <string name="kcp_port">KCP Port</string>
+  <string name="kcp_port_summary">%d (port number of the remote KCPTUN server)</string>
+  <string name="kcpcli">KCP Parameters (CLI)</string>
+  <string name="kcpcli_summary">The command line of KCPTUN</string>
 </resources>

src/main/res/xml/pref_all.xml

@@ -77,6 +77,31 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory
+            android:title="@string/kcp">
+
+        <SwitchPreference
+                android:key="kcp"
+                android:persistent="false"
+                android:summary="@string/kcp_summary"
+                android:title="@string/kcp"/>
+
+        <com.github.shadowsocks.preferences.NumberPickerPreference
+                app:min="1"
+                app:max="65535"
+                android:key="kcpPort"
+                android:persistent="false"
+                android:summary="@string/kcp_port_summary"
+                android:title="@string/kcp_port"/>
+
+        <com.github.shadowsocks.preferences.SummaryEditTextPreference
+                android:key="kcpcli"
+                android:persistent="false"
+                android:summary="@string/kcpcli_summary"
+                android:title="@string/kcpcli"/>
+
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/misc_cat">
 
         <SwitchPreference

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

@@ -43,10 +43,12 @@ import java.util.{Timer, TimerTask}
 
 import android.app.Service
 import android.content.{BroadcastReceiver, Context, Intent, IntentFilter}
+import android.net.ConnectivityManager
 import android.os.{Handler, RemoteCallbackList}
 import android.text.TextUtils
 import android.util.Log
 import android.widget.Toast
+
 import com.github.kevinsawicki.http.HttpRequest
 import com.github.shadowsocks.aidl.{IShadowsocksService, IShadowsocksServiceCallback}
 import com.github.shadowsocks.utils._
@@ -71,6 +73,16 @@ trait BaseService extends Service {
   }
   var closeReceiverRegistered: Boolean = _
 
+  var kcptunProcess: GuardedProcess = _
+  private val networkReceiver: BroadcastReceiver = (context: Context, intent: Intent) => {
+   val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE).asInstanceOf[ConnectivityManager]
+   val activeNetwork = cm.getActiveNetworkInfo()
+   val isConnected = activeNetwork != null && activeNetwork.isConnected()
+
+   if (isConnected && profile.kcp && kcptunProcess != null) kcptunProcess.restart()
+  }
+  var networkReceiverRegistered: Boolean = _
+
   val binder = new IShadowsocksService.Stub {
     override def getState: Int = {
       state
@@ -162,6 +174,14 @@ trait BaseService extends Service {
       closeReceiverRegistered = true
     }
 
+    if (profile.kcp && !networkReceiverRegistered) {
+      // register network change receiver
+      val filter = new IntentFilter()
+      filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION)
+      registerReceiver(networkReceiver, filter)
+      networkReceiverRegistered = true
+    }
+
     app.track(getClass.getSimpleName, "start")
 
     changeState(State.CONNECTING)
@@ -177,6 +197,10 @@ trait BaseService extends Service {
       unregisterReceiver(closeReceiver)
       closeReceiverRegistered = false
     }
+    if (networkReceiverRegistered) {
+      unregisterReceiver(networkReceiver)
+      networkReceiverRegistered = false
+    }
 
     // Make sure update total traffic when stopping the runner
     updateTrafficTotal(TrafficMonitor.txTotal, TrafficMonitor.rxTotal)

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

@@ -56,6 +56,7 @@ class GuardedProcess(cmd: Seq[String]) extends Process {
   @volatile private var guardThread: Thread = _
   @volatile private var isDestroyed: Boolean = _
   @volatile private var process: Process = _
+  @volatile private var isRestart = false
 
   def start(onRestartCallback: () => Unit = null): GuardedProcess = {
     val semaphore = new Semaphore(1)
@@ -76,9 +77,13 @@ class GuardedProcess(cmd: Seq[String]) extends Process {
           semaphore.release
           process.waitFor
 
-          if (currentTimeMillis - startTime < 1000) {
-            Log.w(TAG, "process exit too fast, stop guard: " + cmd)
-            isDestroyed = true
+          if (isRestart) {
+            isRestart = false
+          } else {
+            if (currentTimeMillis - startTime < 1000) {
+              Log.w(TAG, "process exit too fast, stop guard: " + cmd)
+              isDestroyed = true
+            }
           }
         }
       } catch {
@@ -108,6 +113,11 @@ class GuardedProcess(cmd: Seq[String]) extends Process {
     }
   }
 
+  def restart() {
+    isRestart = true
+    process.destroy()
+  }
+
   def exitValue: Int = throw new UnsupportedOperationException
   def getErrorStream: InputStream = throw new UnsupportedOperationException
   def getInputStream: InputStream = throw new UnsupportedOperationException

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

@@ -94,7 +94,7 @@ object Shadowsocks {
   private final val TAG = "Shadowsocks"
   private final val REQUEST_CONNECT = 1
   private val EXECUTABLES = Array(Executable.PDNSD, Executable.REDSOCKS, Executable.SS_TUNNEL, Executable.SS_LOCAL,
-    Executable.TUN2SOCKS)
+    Executable.TUN2SOCKS, Executable.KCPTUN)
 }
 
 class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
@@ -286,7 +286,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
   def crashRecovery() {
     val cmd = new ArrayBuffer[String]()
 
-    for (task <- Array("ss-local", "ss-tunnel", "pdnsd", "redsocks", "tun2socks")) {
+    for (task <- Array("ss-local", "ss-tunnel", "pdnsd", "redsocks", "tun2socks", "kcptun")) {
       cmd.append("killall %s".formatLocal(Locale.ENGLISH, task))
       cmd.append("rm -f %1$s/%2$s-nat.conf %1$s/%2$s-vpn.conf"
         .formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, task))

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

@@ -84,9 +84,15 @@ class ShadowsocksNatService extends BaseService {
       })
     }
 
-    val conf = ConfigUtils
+    val conf = if (profile.kcp) {
+      ConfigUtils
+      .SHADOWSOCKS.formatLocal(Locale.ENGLISH, "127.0.0.1", profile.localPort + 90, profile.localPort,
+        profile.password, profile.method, 600)
+    } else {
+      ConfigUtils
       .SHADOWSOCKS.formatLocal(Locale.ENGLISH, profile.host, profile.remotePort, profile.localPort,
         profile.password, profile.method, 600)
+    }
     Utils.printToFile(new File(getApplicationInfo.dataDir + "/ss-local-nat.conf"))(p => {
       p.println(conf)
     })
@@ -109,10 +115,24 @@ class ShadowsocksNatService extends BaseService {
     sslocalProcess = new GuardedProcess(cmd).start()
   }
 
-  def startTunnel() {
+  def startKcptunDaemon() {
+    if (profile.kcpcli == null) profile.kcpcli = ""
+
+    val cmd = new ArrayBuffer[String]
+    cmd += (getApplicationInfo.dataDir + "/kcptun"
+      , "-r", profile.host + ":" + profile.kcpPort
+      , "-l", "127.0.0.1:" + (profile.localPort + 90)
+      , profile.kcpcli.trim.replaceAll("[\"']", ""))
+
+    if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
+
+    kcptunProcess = new GuardedProcess(cmd.mkString(" ").split(" ").toSeq).start()
+  }
+
+  def startDNSTunnel() {
     if (profile.udpdns) {
       val conf = ConfigUtils
-        .SHADOWSOCKS.formatLocal(Locale.ENGLISH, profile.host, profile.remotePort, 8153,
+        .SHADOWSOCKS.formatLocal(Locale.ENGLISH, profile.host, profile.remotePort, profile.localPort + 53,
           profile.password, profile.method, 10)
       Utils.printToFile(new File(getApplicationInfo.dataDir + "/ss-tunnel-nat.conf"))(p => {
         p.println(conf)
@@ -123,11 +143,10 @@ class ShadowsocksNatService extends BaseService {
         , "-t" , "10"
         , "-b" , "127.0.0.1"
         , "-L" , "8.8.8.8:53"
+        , "-l" , (profile.localPort + 53).toString
         , "-P" , getApplicationInfo.dataDir
         , "-c" , getApplicationInfo.dataDir + "/ss-tunnel-nat.conf")
 
-      cmd += ("-l" , "8153")
-
       if (profile.auth) cmd += "-A"
 
       if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
@@ -135,18 +154,23 @@ class ShadowsocksNatService extends BaseService {
       sstunnelProcess = new GuardedProcess(cmd).start()
 
     } else {
-      val conf = ConfigUtils
-        .SHADOWSOCKS.formatLocal(Locale.ENGLISH, profile.host, profile.remotePort, 8163,
+      val conf = if (profile.kcp) {
+        ConfigUtils
+        .SHADOWSOCKS.formatLocal(Locale.ENGLISH, "127.0.0.1", profile.localPort + 90,
+          profile.localPort + 63, profile.password, profile.method, 10)
+      } else {
+        ConfigUtils
+        .SHADOWSOCKS.formatLocal(Locale.ENGLISH, profile.host, profile.remotePort, profile.localPort + 63,
           profile.password, profile.method, 10)
+      }
       Utils.printToFile(new File(getApplicationInfo.dataDir + "/ss-tunnel-nat.conf"))(p => {
         p.println(conf)
       })
       val cmdBuf = new ArrayBuffer[String]
       cmdBuf += (getApplicationInfo.dataDir + "/ss-tunnel"
-        , "-u"
         , "-t" , "10"
         , "-b" , "127.0.0.1"
-        , "-l" , "8163"
+        , "-l" , (profile.localPort + 63).toString
         , "-L" , "8.8.8.8:53"
         , "-P", getApplicationInfo.dataDir
         , "-c" , getApplicationInfo.dataDir + "/ss-tunnel-nat.conf")
@@ -163,10 +187,10 @@ class ShadowsocksNatService extends BaseService {
 
     val conf = if (profile.route == Route.BYPASS_CHN || profile.route == Route.BYPASS_LAN_CHN) {
       ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
-        "127.0.0.1", 8153, getBlackList, 8163, "")
+        "127.0.0.1", profile.localPort + 53, getBlackList, profile.localPort + 63, "")
     } else {
       ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
-        "127.0.0.1", 8153, 8163, "")
+        "127.0.0.1", profile.localPort + 53, profile.localPort + 63, "")
     }
 
     Utils.printToFile(new File(getApplicationInfo.dataDir + "/pdnsd-nat.conf"))(p => {
@@ -194,10 +218,13 @@ class ShadowsocksNatService extends BaseService {
   /** Called when the activity is first created. */
   def handleConnection {
 
-    startTunnel()
-    if (!profile.udpdns) startDnsDaemon()
+    startDNSTunnel()
     startRedsocksDaemon()
     startShadowsocksDaemon()
+
+    if (!profile.udpdns) startDnsDaemon()
+    if (profile.kcp) startKcptunDaemon()
+
     setupIptables()
 
   }
@@ -212,6 +239,10 @@ class ShadowsocksNatService extends BaseService {
   }
 
   def killProcesses() {
+    if (kcptunProcess != null) {
+      kcptunProcess.destroy()
+      kcptunProcess = null
+    }
     if (sslocalProcess != null) {
       sslocalProcess.destroy()
       sslocalProcess = null
@@ -247,7 +278,8 @@ class ShadowsocksNatService extends BaseService {
     init_sb.append(cmd_bypass.replace("-p tcp -d 0.0.0.0", "-m owner --uid-owner " + myUid))
     init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "--dport 53"))
 
-    init_sb.append("iptables -t nat -A OUTPUT -p udp --dport 53 -j DNAT --to-destination 127.0.0.1:8153")
+    init_sb.append("iptables -t nat -A OUTPUT -p udp --dport 53 -j DNAT --to-destination 127.0.0.1:"
+      + (profile.localPort + 53))
 
     if (!profile.proxyApps || profile.bypass) {
       http_sb.append(CMD_IPTABLES_DNAT_ADD_SOCKS)

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

@@ -18,7 +18,7 @@ object ShadowsocksSettings {
   // Constants
   private final val TAG = "ShadowsocksSettings"
   private val PROXY_PREFS = Array(Key.name, Key.host, Key.remotePort, Key.localPort, Key.password, Key.method,
-    Key.auth)
+    Key.auth, Key.kcp, Key.kcpPort, Key.kcpcli)
   private val FEATURE_PREFS = Array(Key.route, Key.proxyApps, Key.udpdns, Key.ipv6)
 
   // Helper functions
@@ -57,6 +57,9 @@ object ShadowsocksSettings {
       case Key.udpdns => updateSwitchPreference(pref, profile.udpdns)
       case Key.auth => updateSwitchPreference(pref, profile.auth)
       case Key.ipv6 => updateSwitchPreference(pref, profile.ipv6)
+      case Key.kcp => updateSwitchPreference(pref, profile.kcp)
+      case Key.kcpPort => updateNumberPickerPreference(pref, profile.kcpPort)
+      case Key.kcpcli => updateSummaryEditTextPreference(pref, profile.kcpcli)
     }
   }
 }
@@ -103,6 +106,19 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
       app.profileManager.updateProfile(profile)
     })
 
+    findPreference(Key.kcp).setOnPreferenceChangeListener((_, value) => {
+      profile.kcp = value.asInstanceOf[Boolean]
+      app.profileManager.updateProfile(profile)
+    })
+    findPreference(Key.kcpPort).setOnPreferenceChangeListener((_, value) => {
+      profile.kcpPort = value.asInstanceOf[Int]
+      app.profileManager.updateProfile(profile)
+    })
+    findPreference(Key.kcpcli).setOnPreferenceChangeListener((_, value) => {
+      profile.kcpcli = value.asInstanceOf[String]
+      app.profileManager.updateProfile(profile)
+    })
+
     isProxyApps = findPreference(Key.proxyApps).asInstanceOf[SwitchPreference]
     isProxyApps.setOnPreferenceClickListener(_ => {
       startActivity(new Intent(activity, classOf[AppManager]))

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

@@ -25,28 +25,30 @@ final class ShadowsocksTileService extends TileService with ServiceBoundContext
     def trafficUpdated(txRate: Long, rxRate: Long, txTotal: Long, rxTotal: Long) = ()
     def stateChanged(state: Int, msg: String) {
       val tile = getQsTile
-      state match {
-        case State.STOPPED =>
-          tile.setIcon(iconIdle)
-          tile.setLabel(getString(R.string.app_name))
-          tile.setState(Tile.STATE_INACTIVE)
-        case State.CONNECTED =>
-          tile.setIcon(iconConnected)
-          tile.setLabel(app.currentProfile match {
-            case Some(profile) => profile.name
-            case None => getString(R.string.app_name)
-          })
-          tile.setState(Tile.STATE_ACTIVE)
-        case _ =>
-          tile.setIcon(iconBusy)
-          tile.setLabel(getString(R.string.app_name))
-          tile.setState(Tile.STATE_UNAVAILABLE)
+      if (tile != null) {
+        state match {
+          case State.STOPPED =>
+            tile.setIcon(iconIdle)
+            tile.setLabel(getString(R.string.app_name))
+            tile.setState(Tile.STATE_INACTIVE)
+          case State.CONNECTED =>
+            tile.setIcon(iconConnected)
+            tile.setLabel(app.currentProfile match {
+              case Some(profile) => profile.name
+              case None => getString(R.string.app_name)
+            })
+            tile.setState(Tile.STATE_ACTIVE)
+          case _ =>
+            tile.setIcon(iconBusy)
+            tile.setLabel(getString(R.string.app_name))
+            tile.setState(Tile.STATE_UNAVAILABLE)
+        }
+        tile.updateTile
       }
-      tile.updateTile
     }
   }
 
-  override def onServiceConnected = callback.stateChanged(bgService.getState, null)
+  override def onServiceConnected() = callback.stateChanged(bgService.getState, null)
 
   override def onCreate {
     super.onCreate
@@ -66,9 +68,9 @@ final class ShadowsocksTileService extends TileService with ServiceBoundContext
     detachService // just in case the user switches to NAT mode, also saves battery
   }
 
-  override def onClick = if (isLocked) unlockAndRun(toggle) else toggle()
+  override def onClick() = if (isLocked) unlockAndRun(toggle) else toggle()
 
-  private def toggle() = bgService.getState match {
+  private def toggle() = if (bgService != null) bgService.getState match {
     case State.STOPPED => Utils.startSsService(this)
     case State.CONNECTED => Utils.stopSsService(this)
     case _ => // ignore

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

@@ -109,6 +109,10 @@ class ShadowsocksVpnService extends VpnService with BaseService {
   }
 
   def killProcesses() {
+    if (kcptunProcess != null) {
+      kcptunProcess.destroy()
+      kcptunProcess = null
+    }
     if (sslocalProcess != null) {
       sslocalProcess.destroy()
       sslocalProcess = null
@@ -177,18 +181,67 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
   /** Called when the activity is first created. */
   def handleConnection: Boolean = {
+    
+    val fd = startVpn()
+    if (!sendFd(fd)) return false
+
+    if (profile.kcp) {
+      startKcptunDaemon()
+    }
+
     startShadowsocksDaemon()
+
+    if (profile.udpdns && profile.kcp) {
+      startShadowsocksUDPDaemon()
+    }
+
     if (!profile.udpdns) {
       startDnsDaemon()
       startDnsTunnel()
     }
 
-    val fd = startVpn()
-    sendFd(fd)
+    true
+  }
+
+  def startKcptunDaemon() {
+    if (profile.kcpcli == null) profile.kcpcli = ""
+
+    val cmd = new ArrayBuffer[String]
+    cmd += (getApplicationInfo.dataDir + "/kcptun"
+      , "-r", profile.host + ":" + profile.kcpPort
+      , "-l", "127.0.0.1:" + (profile.localPort + 90)
+      , "--path", getApplicationInfo.dataDir + "/protect_path"
+      , profile.kcpcli.trim.replaceAll("[\"']", ""))
+
+    if (BuildConfig.DEBUG)
+      Log.d(TAG, cmd.mkString(" "))
+
+    kcptunProcess = new GuardedProcess(cmd.mkString(" ").split(" ").toSeq).start()
+  }
+
+  def startShadowsocksUDPDaemon() {
+    val conf = ConfigUtils
+      .SHADOWSOCKS.formatLocal(Locale.ENGLISH, profile.host, profile.remotePort, profile.localPort,
+        profile.password, profile.method, 600)
+    Utils.printToFile(new File(getApplicationInfo.dataDir + "/ss-local-udp-vpn.conf"))(p => {
+      p.println(conf)
+    })
+
+    val cmd = new ArrayBuffer[String]
+    cmd += (getApplicationInfo.dataDir + "/ss-local", "-V", "-U"
+      , "-b", "127.0.0.1"
+      , "-t", "600"
+      , "-P", getApplicationInfo.dataDir
+      , "-c", getApplicationInfo.dataDir + "/ss-local-udp-vpn.conf")
+
+    if (profile.auth) cmd += "-A"
+
+    if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
+
+    sstunnelProcess = new GuardedProcess(cmd).start()
   }
 
   def startShadowsocksDaemon() {
-
     if (profile.route != Route.ALL) {
       val acl: Array[Array[String]] = profile.route match {
         case Route.BYPASS_LAN => Array(getResources.getStringArray(R.array.private_route))
@@ -201,15 +254,21 @@ class ShadowsocksVpnService extends VpnService with BaseService {
       })
     }
 
-    val conf = ConfigUtils
+    val conf = if (profile.kcp) {
+      ConfigUtils
+      .SHADOWSOCKS.formatLocal(Locale.ENGLISH, "127.0.0.1", profile.localPort + 90, profile.localPort,
+        profile.password, profile.method, 600)
+    } else {
+      ConfigUtils
       .SHADOWSOCKS.formatLocal(Locale.ENGLISH, profile.host, profile.remotePort, profile.localPort,
         profile.password, profile.method, 600)
+    }
     Utils.printToFile(new File(getApplicationInfo.dataDir + "/ss-local-vpn.conf"))(p => {
       p.println(conf)
     })
 
     val cmd = new ArrayBuffer[String]
-    cmd += (getApplicationInfo.dataDir + "/ss-local", "-V", "-u"
+    cmd += (getApplicationInfo.dataDir + "/ss-local", "-V"
       , "-b", "127.0.0.1"
       , "-t", "600"
       , "-P", getApplicationInfo.dataDir
@@ -217,6 +276,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
     if (profile.auth) cmd += "-A"
 
+    if (profile.udpdns && !profile.kcp) cmd += "-u"
+
     if (profile.route != Route.ALL) {
       cmd += "--acl"
       cmd += (getApplicationInfo.dataDir + "/acl.list")
@@ -228,19 +289,23 @@ class ShadowsocksVpnService extends VpnService with BaseService {
   }
 
   def startDnsTunnel() = {
-    val conf = ConfigUtils
-      .SHADOWSOCKS.formatLocal(Locale.ENGLISH, profile.host, profile.remotePort, 8163,
+    val conf = if (profile.kcp) {
+      ConfigUtils
+      .SHADOWSOCKS.formatLocal(Locale.ENGLISH, "127.0.0.1", profile.localPort + 90, profile.localPort + 63,
         profile.password, profile.method, 10)
+    } else {
+      ConfigUtils
+      .SHADOWSOCKS.formatLocal(Locale.ENGLISH, profile.host, profile.remotePort, profile.localPort + 63,
+        profile.password, profile.method, 10)
+    }
     Utils.printToFile(new File(getApplicationInfo.dataDir + "/ss-tunnel-vpn.conf"))(p => {
       p.println(conf)
     })
     val cmd = new ArrayBuffer[String]
     cmd += (getApplicationInfo.dataDir + "/ss-tunnel"
       , "-V"
-      , "-u"
       , "-t", "10"
       , "-b", "127.0.0.1"
-      , "-l", "8163"
       , "-L", "8.8.8.8:53"
       , "-P", getApplicationInfo.dataDir
       , "-c", getApplicationInfo.dataDir + "/ss-tunnel-vpn.conf")
@@ -257,10 +322,10 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     val conf = {
       if (profile.route == Route.BYPASS_CHN || profile.route == Route.BYPASS_LAN_CHN) {
         ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
-          "0.0.0.0", 8153, getBlackList, 8163, ipv6)
+          "0.0.0.0", profile.localPort + 53, getBlackList, profile.localPort + 63, ipv6)
       } else {
         ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
-          "0.0.0.0", 8153, 8163, ipv6)
+          "0.0.0.0", profile.localPort + 53, profile.localPort + 63, ipv6)
       }
     }
     Utils.printToFile(new File(getApplicationInfo.dataDir + "/pdnsd-vpn.conf"))(p => {
@@ -354,7 +419,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     if (profile.udpdns)
       cmd += " --enable-udprelay"
     else
-      cmd += " --dnsgw %s:8153".formatLocal(Locale.ENGLISH, PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "1"))
+      cmd += " --dnsgw %s:%d".formatLocal(Locale.ENGLISH, PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "1"), 
+        profile.localPort + 53)
 
     if (BuildConfig.DEBUG) Log.d(TAG, cmd)
 

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

@@ -64,7 +64,7 @@ object DBHelper {
 }
 
 class DBHelper(val context: Context)
-  extends OrmLiteSqliteOpenHelper(context, DBHelper.PROFILE, null, 16) {
+  extends OrmLiteSqliteOpenHelper(context, DBHelper.PROFILE, null, 19) {
   import DBHelper._
 
   lazy val profileDao: Dao[Profile, Int] = getDao(classOf[Profile])
@@ -83,10 +83,11 @@ class DBHelper(val context: Context)
       }
       if (oldVersion < 8) {
         profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN udpdns SMALLINT;")
-        profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN route VARCHAR;")
       }
       if (oldVersion < 9) {
-        profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN route VARCHAR;")
+        profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN route VARCHAR DEFAULT 'all';")
+      } else if (oldVersion < 19) {
+        profileDao.executeRawNoArgs("UPDATE `profile` SET route = 'all' WHERE route IS NULL;")
       }
       if (oldVersion < 10) {
         profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN auth SMALLINT;")
@@ -125,6 +126,17 @@ class DBHelper(val context: Context)
       if (oldVersion < 16) {
         profileDao.executeRawNoArgs("UPDATE `profile` SET route = 'bypass-lan-china' WHERE route = 'bypass-china'")
       }
+
+      if (oldVersion < 17) {
+        profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN kcp SMALLINT;")
+        profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN kcpcli VARCHAR DEFAULT '';")
+      }
+
+      if (oldVersion < 18) {
+        profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN kcpPort INTEGER DEFAULT 8399;")
+      } else if (oldVersion < 19) {
+        profileDao.executeRawNoArgs("UPDATE `profile` SET kcpPort = 8399 WHERE kcpPort = 0;")
+      }
     }
   }
 }

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

@@ -99,6 +99,15 @@ class Profile {
   @DatabaseField
   var userOrder: Long = _
 
+  @DatabaseField
+  var kcp: Boolean = false
+
+  @DatabaseField
+  var kcpPort: Int = 8399
+
+  @DatabaseField
+  var kcpcli: String = ""
+
   override def toString = "ss://" + Base64.encodeToString("%s%s:%s@%s:%d".formatLocal(Locale.ENGLISH,
     method, if (auth) "-auth" else "", password, host, remotePort).getBytes, Base64.NO_PADDING | Base64.NO_WRAP)
 

src/main/scala/com/github/shadowsocks/preferences/SummaryEditTextPreference.scala

@@ -41,6 +41,7 @@ package com.github.shadowsocks.preferences
 
 import android.content.Context
 import android.preference.EditTextPreference
+import android.text.TextUtils
 import android.util.AttributeSet
 
 class SummaryEditTextPreference(context: Context, attrs: AttributeSet, defStyle: Int)
@@ -57,7 +58,7 @@ class SummaryEditTextPreference(context: Context, attrs: AttributeSet, defStyle:
   }
 
   override def setSummary(summary: CharSequence) {
-    if (summary.toString.isEmpty) {
+    if (TextUtils.isEmpty(summary)) {
       super.setSummary(mDefaultSummary)
     } else {
       super.setSummary(summary)

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

@@ -45,6 +45,7 @@ object Executable {
   val SS_LOCAL = "ss-local"
   val SS_TUNNEL = "ss-tunnel"
   val TUN2SOCKS = "tun2socks"
+  val KCPTUN = "kcptun"
 }
 
 object ConfigUtils {
@@ -166,6 +167,10 @@ object Key {
   val localPort = "localPortNum"
 
   val profileTip = "profileTip"
+
+  val kcp = "kcp"
+  val kcpPort = "kcpPort"
+  val kcpcli = "kcpcli"
 }
 
 object State {

travis-ci/setup.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-export ARCH=`uname -m`
-export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r12b
-export ANDROID_HOME=$HOME/.android/android-sdk-linux
-export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
-
-if [ ! -d "$ANDROID_HOME" ]; then
-    mkdir -p $ANDROID_HOME
-    pushd $HOME/.android
-    wget -q http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
-    tar xf android-sdk_r24.4.1-linux.tgz
-    popd
-fi
-
-if [ ! -d "$ANDROID_NDK_HOME" ]; then
-    mkdir -p $ANDROID_NDK_HOME
-    pushd $HOME/.android
-    wget -q http://dl.google.com/android/repository/android-ndk-r12b-linux-${ARCH}.zip
-    unzip -q android-ndk-r12b-linux-${ARCH}.zip
-    popd
-fi
-
-( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter tools,platform-tools,build-tools-24.0.0,android-23,android-24,extra-google-m2repository --no-ui -a
-( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter extra-android-m2repository --no-ui -a