refine #171

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

.gitignore

@@ -1,7 +1,6 @@
 classes
 bin
 gen
-obj
 target
 local.properties
 .classpath
@@ -24,12 +23,10 @@ local.sbt
 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/jni
 jni/Application.mk
-obj
-libs

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "jni/shadowsocks"]
-	path = jni/shadowsocks
-	url = https://github.com/madeye/shadowsocks-libev.git
+[submodule "src/main/jni/shadowsocks"]
+	path = src/main/jni/shadowsocks
+	url = https://github.com/madeye/shadowsocks-libev

.travis.yml

@@ -17,7 +17,7 @@ install:
 - echo "y" | android update sdk --filter tools,platform-tools,build-tools-21.0.1,android-21,extra-google-m2repository --no-ui --no-https -a
 - echo "y" | android update sdk --filter extra-android-m2repository --no-ui --no-https -a
 script:
-- ./build-ndk.sh
 - cp local.properties.travis local.properties
+- ./build.sh
 - sbt android:package-release
 - exit 0

README.md

@@ -28,10 +28,10 @@ Help to translate shadowsocks: http://crowdin.net/project/shadowsocks/invite
 
 ```bash
     git submodule update --init
-    
-    # Build native binaries
-    ./build-ndk.sh
 
+    # Build native binaries
+    ./build.sh
+    
     # Build the App
     sbt clean android:package-release
 ```
@@ -40,7 +40,8 @@ Help to translate shadowsocks: http://crowdin.net/project/shadowsocks/invite
 
 * 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.
-* Run `echo "y" | android update sdk --filter tools,platform-tools,build-tools-19.0.3,android-19,extra-google-m2repository,extra-android-m2repository --no-ui --no-https -a`
+* echo "y" | android update sdk --filter tools,platform-tools,build-tools-21.0.1,android-21,extra-google-m2repository --no-ui --no-https -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 .
@@ -50,8 +51,8 @@ Help to translate shadowsocks: http://crowdin.net/project/shadowsocks/invite
     git submodule update --init
 
     # Build native binaries
-    ./build-ndk.sh
-    
+    ./build.sh
+
     # Build the apk
     sbt clean android:package-release
 ```

build-ndk.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-function try () {
-    "$@" || exit -1
-}
-
-# Build
-try $ANDROID_NDK_HOME/ndk-build clean
-try $ANDROID_NDK_HOME/ndk-build
-
-# copy executables
-rm -rf src/main/assets/armeabi-v7a
-rm -rf src/main/assets/x86
-mkdir -p src/main/assets/armeabi-v7a
-mkdir -p src/main/assets/x86
-for app in pdnsd redsocks iptables
-do
-    try mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
-    try mv libs/x86/$app src/main/assets/x86/
-done
-
-# copy libraries
-rm -rf src/main/jni/armeabi-v7a
-rm -rf src/main/jni/x86
-mkdir -p src/main/jni/armeabi-v7a
-mkdir -p src/main/jni/x86
-try mv libs/armeabi-v7a/*.so src/main/jni/armeabi-v7a/
-try mv libs/x86/*.so src/main/jni/x86/

build.sbt

@@ -10,15 +10,19 @@ name := "shadowsocks"
 
 compileOrder in Compile := CompileOrder.JavaThenScala
 
+ndkJavah in Android := List()
+
+ndkBuild in Android := List()
+
 resolvers += "JRAF" at "http://JRAF.org/static/maven/2"
 
 resolvers += "madeye private releases" at "http://madeye-maven-repository.googlecode.com/git/"
 
 libraryDependencies ++= Seq(
   "dnsjava" % "dnsjava" % "2.1.5",
-  "org.scalaj" %% "scalaj-http" % "0.3.10",
+  "com.github.kevinsawicki" % "http-request" % "5.6",
   "commons-net" % "commons-net" % "3.3",
-  "com.google.zxing" % "android-integration" % "2.2"
+  "com.google.zxing" % "android-integration" % "3.1.0"
 )
 
 libraryDependencies ++= Seq(

build.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+function try () {
+"$@" || exit -1
+}
+
+try pushd src/main
+
+# Build
+try $ANDROID_NDK_HOME/ndk-build clean
+try $ANDROID_NDK_HOME/ndk-build
+
+# copy executables
+rm -rf assets/armeabi-v7a
+rm -rf assets/x86
+mkdir -p assets/armeabi-v7a
+mkdir -p assets/x86
+for app in pdnsd redsocks ss-local ss-tunnel tun2socks
+do
+    try mv libs/armeabi-v7a/$app assets/armeabi-v7a/
+    try mv libs/x86/$app assets/x86/
+done
+
+try popd

jni/main-jni.cpp

@@ -1,84 +0,0 @@
-#include <jni.h>
-#include <string.h>
-#include <unistd.h>
-
-typedef unsigned short char16_t;
-
-class String8 {
-public:
-    String8() {
-        mString = 0;
-    }
-
-    ~String8() {
-        if (mString) {
-            free(mString);
-        }
-    }
-
-    void set(const char16_t* o, size_t numChars) {
-        if (mString) {
-            free(mString);
-        }
-        mString = (char*) malloc(numChars + 1);
-        if (!mString) {
-            return;
-        }
-        for (size_t i = 0; i < numChars; i++) {
-            mString[i] = (char) o[i];
-        }
-        mString[numChars] = '\0';
-    }
-
-    const char* string() {
-        return mString;
-    }
-private:
-    char* mString;
-};
-
-extern "C" {
-
-int main(int argc, char* args[]);
-
-#if defined(PDNSD_JNI)
-jint Java_com_github_shadowsocks_Core_pdnsd(JNIEnv *env, jobject thiz, jobjectArray argv) {
-#elif defined(SSLOCAL_JNI)
-jint Java_com_github_shadowsocks_Core_sslocal(JNIEnv *env, jobject thiz, jobjectArray argv) {
-#elif defined(SSTUNNEL_JNI)
-jint Java_com_github_shadowsocks_Core_sstunnel(JNIEnv *env, jobject thiz, jobjectArray argv) {
-#elif defined(TUN2SOCKS_JNI)
-jint Java_com_github_shadowsocks_Core_tun2socks(JNIEnv *env, jobject thiz, jobjectArray argv) {
-#else
-#error "invalid header"
-#endif
-
-    int argc = argv ? env->GetArrayLength(argv) : 0;
-    char **args = NULL;
-    String8 tmp_8;
-
-    if (argc > 0) {
-        args = (char **)malloc((argc+1)*sizeof(char *));
-        for (int i = 0; i < argc; ++i) {
-            jstring arg = reinterpret_cast<jstring>(env->GetObjectArrayElement(argv, i));
-            const jchar *str = env->GetStringCritical(arg, 0);
-            tmp_8.set(str, env->GetStringLength(arg));
-            env->ReleaseStringCritical(arg, str);
-            args[i] = strdup(tmp_8.string());
-        }
-        args[argc] = NULL;
-
-        pid_t pid;
-        pid = fork();
-        if (pid == 0) {
-            int ret = main(argc, args);
-            return ret;
-        }
-
-        if (args != NULL) free(args);
-    }
-
-    return 0;
-}
-
-}

project/plugins.sbt

@@ -1,5 +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.2.20")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.3.10")
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
+resolvers += Resolver.sbtPluginRepo("snapshots")
+
+addSbtPlugin("com.hanhuy.sbt" % "sbt-idea" % "1.7.0-SNAPSHOT")

src/main/AndroidManifest.xml

@@ -1,14 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="81"
-    android:versionName="2.4.1">
+    android:versionCode="91"
+    android:versionName="2.5.3">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
   <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
-  <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
 
   <uses-feature
       android:name="android.hardware.touchscreen"
@@ -76,11 +74,13 @@
 
     <service
         android:name=".ShadowsocksNatService"
+        android:process=":nat"
         android:exported="false">
     </service>
 
     <service
         android:name=".ShadowsocksVpnService"
+        android:process=":vpn"
         android:label="@string/app_name"
         android:permission="android.permission.BIND_VPN_SERVICE"
         android:exported="false">

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

@@ -1,53 +0,0 @@
-/* Shadowsocks - A shadowsocks client for Android
- * Copyright (C) 2012 <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;
-
-public class Core {
-  static {
-    java.lang.System.loadLibrary("ss-local-jni");
-    java.lang.System.loadLibrary("ss-tunnel-jni");
-    java.lang.System.loadLibrary("tun2socks-jni");
-    java.lang.System.loadLibrary("pdnsd-jni");
-  }
-
-  public static native void sslocal(String[] cmd);
-  public static native void sstunnel(String[] cmd);
-  public static native void tun2socks(String[] cmd);
-  public static native void pdnsd(String[] cmd);
-}

src/main/java/eu/chainfire/libsuperuser/HideOverlaysReceiver.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012-2014 Jorrit "Chainfire" Jongma
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package eu.chainfire.libsuperuser;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * <p>
+ * Base receiver to extend to catch notifications when overlays should be
+ * hidden.
+ * </p>
+ * <p>
+ * Tapjacking protection in SuperSU prevents some dialogs from receiving user
+ * input when overlays are present. For security reasons this notification is
+ * only sent to apps that have previously been granted root access, so even if
+ * your app does not <em>require</em> root, you still need to <em>request</em>
+ * it, and the user must grant it.
+ * </p>
+ * <p>
+ * Note that the word overlay as used here should be interpreted as "any view or
+ * window possibly obscuring SuperSU dialogs".
+ * </p>
+ */
+public abstract class HideOverlaysReceiver extends BroadcastReceiver {
+    public static final String ACTION_HIDE_OVERLAYS = "eu.chainfire.supersu.action.HIDE_OVERLAYS";
+    public static final String CATEGORY_HIDE_OVERLAYS = Intent.CATEGORY_INFO;
+    public static final String EXTRA_HIDE_OVERLAYS = "eu.chainfire.supersu.extra.HIDE";
+
+    @Override
+    public final void onReceive(Context context, Intent intent) {
+        if (intent.hasExtra(EXTRA_HIDE_OVERLAYS)) {
+            onHideOverlays(intent.getBooleanExtra(EXTRA_HIDE_OVERLAYS, false));
+        }
+    }
+
+    /**
+     * Called when overlays <em>should</em> be hidden or <em>may</em> be shown
+     * again.
+     * 
+     * @param hide Should overlays be hidden?
+     */
+    public abstract void onHideOverlays(boolean hide);
+}

src/main/jni/Android.mk

@@ -37,7 +37,7 @@ LIBEVENT_SOURCES := \
 
 LOCAL_MODULE := event
 LOCAL_SRC_FILES := $(addprefix libevent/, $(LIBEVENT_SOURCES))
-LOCAL_CFLAGS := -O2 -g -I$(LOCAL_PATH)/libevent \
+LOCAL_CFLAGS := -O2 -I$(LOCAL_PATH)/libevent \
 	-I$(LOCAL_PATH)/libevent/include \
 	-I$(LOCAL_PATH)/openssl/include
 
@@ -121,15 +121,15 @@ REDSOCKS_SOURCES := base.c dnstc.c http-connect.c \
 LOCAL_STATIC_LIBRARIES := libevent
 
 LOCAL_MODULE := redsocks
-LOCAL_SRC_FILES := $(addprefix redsocks/, $(REDSOCKS_SOURCES))
-LOCAL_CFLAGS := -O2 -std=gnu99 -g -I$(LOCAL_PATH)/redsocks \
+LOCAL_SRC_FILES := $(addprefix redsocks/, $(REDSOCKS_SOURCES)) 
+LOCAL_CFLAGS := -O2 -std=gnu99 -I$(LOCAL_PATH)/redsocks \
 	-I$(LOCAL_PATH)/libevent/include \
 	-I$(LOCAL_PATH)/libevent
 
 include $(BUILD_EXECUTABLE)
 
 ########################################################
-## pdnsd
+## pdnsd library
 ########################################################
 
 include $(CLEAR_VARS)
@@ -142,20 +142,6 @@ LOCAL_CFLAGS    := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
 
 include $(BUILD_EXECUTABLE)
 
-########################################################
-## pdnsd library
-########################################################
-
-include $(CLEAR_VARS)
-
-PDNSD_SOURCES  := $(wildcard $(LOCAL_PATH)/pdnsd/src/*.c) main-jni.cpp
-
-LOCAL_MODULE    := pdnsd-jni
-LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%)
-LOCAL_CFLAGS    := -Wall -O2 -DPDNSD_JNI -I$(LOCAL_PATH)/pdnsd
-
-include $(BUILD_SHARED_LIBRARY)
-
 ########################################################
 ## shadowsocks local library
 ########################################################
@@ -164,9 +150,9 @@ include $(CLEAR_VARS)
 
 SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c acl.c 
 
-LOCAL_MODULE    := ss-local-jni
-LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES)) main-jni.cpp
-LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DSSLOCAL_JNI \
+LOCAL_MODULE    := ss-local
+LOCAL_SRC_FILES := $(addprefix shadowsocks/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)/openssl/include  \
@@ -177,39 +163,18 @@ LOCAL_STATIC_LIBRARIES := libev libcrypto libipset libcork
 
 LOCAL_LDLIBS := -llog
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_EXECUTABLE)
 
 ########################################################
 ## shadowsocks tunnel
 ########################################################
 
-# include $(CLEAR_VARS)
-#
-# SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
-#
-# LOCAL_MODULE    := ss-tunnel
-# LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
-# LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \
-# 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
-# 					-I$(LOCAL_PATH)/libev/ \
-# 					-I$(LOCAL_PATH)/openssl/include 
-#
-# LOCAL_STATIC_LIBRARIES := libev libcrypto
-#
-# LOCAL_LDLIBS := -llog
-#
-# include $(BUILD_EXECUTABLE)
-
-########################################################
-## shadowsocks tunnel library
-########################################################
-
 include $(CLEAR_VARS)
 
 SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
 
-LOCAL_MODULE    := ss-tunnel-jni
-LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES)) main-jni.cpp
+LOCAL_MODULE    := ss-tunnel
+LOCAL_SRC_FILES := $(addprefix shadowsocks/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/ \
@@ -219,7 +184,7 @@ LOCAL_STATIC_LIBRARIES := libev libcrypto
 
 LOCAL_LDLIBS := -llog
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_EXECUTABLE)
 
 ########################################################
 ## system
@@ -239,7 +204,7 @@ LOCAL_STATIC_LIBRARIES := cpufeatures
 include $(BUILD_SHARED_LIBRARY)
 
 ########################################################
-## tun2socks-library
+## tun2socks
 ########################################################
 
 include $(CLEAR_VARS)
@@ -249,7 +214,7 @@ LOCAL_CFLAGS += -DBADVPN_THREADWORK_USE_PTHREAD -DBADVPN_LINUX -DBADVPN_BREACTOR
 LOCAL_CFLAGS += -DBADVPN_USE_SELFPIPE -DBADVPN_USE_EPOLL
 LOCAL_CFLAGS += -DBADVPN_LITTLE_ENDIAN -DBADVPN_THREAD_SAFE
 LOCAL_CFLAGS += -DNDEBUG -DANDROID
-LOCAL_CFLAGS += -DTUN2SOCKS_JNI
+# LOCAL_CFLAGS += -DTUN2SOCKS_JNI
 
 LOCAL_C_INCLUDES:= \
         $(LOCAL_PATH)/badvpn/lwip/src/include/ipv4 \
@@ -319,13 +284,13 @@ TUN2SOCKS_SOURCES := \
         tun2socks/SocksUdpGwClient.c \
         udpgw_client/UdpGwClient.c
 
-LOCAL_MODULE := tun2socks-jni
+LOCAL_MODULE := tun2socks
 
 LOCAL_LDLIBS := -ldl -llog
 
-LOCAL_SRC_FILES := $(addprefix badvpn/, $(TUN2SOCKS_SOURCES)) main-jni.cpp
+LOCAL_SRC_FILES := $(addprefix badvpn/, $(TUN2SOCKS_SOURCES))
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_EXECUTABLE)
 
 # OpenSSL
 openssl_subdirs := $(addprefix $(LOCAL_PATH)/openssl/,$(addsuffix /Android.mk, \
@@ -335,13 +300,13 @@ openssl_subdirs := $(addprefix $(LOCAL_PATH)/openssl/,$(addsuffix /Android.mk, \
 include $(openssl_subdirs)
 
 # Iptables
-LOCAL_PATH := $(ROOT_PATH)
-iptables_subdirs := $(addprefix $(LOCAL_PATH)/iptables/,$(addsuffix /Android.mk, \
-	iptables \
-	extensions \
-	libiptc \
-	))
-include $(iptables_subdirs)
+# LOCAL_PATH := $(ROOT_PATH)
+# iptables_subdirs := $(addprefix $(LOCAL_PATH)/iptables/,$(addsuffix /Android.mk, \
+# 	iptables \
+# 	extensions \
+# 	libiptc \
+# 	))
+# include $(iptables_subdirs)
 
 # Import cpufeatures
 $(call import-module,android/cpufeatures)