disable NAT mode again

Fix NDK build

.travis.yml

@@ -3,24 +3,21 @@ scala:
 - 2.10.4
 before_install:
 - sudo apt-get update
-- sudo apt-get install libc6-dev-i386
+install:
-- sudo apt-get install lib32ncurses5-dev
+- sudo apt-get install -y libc6-dev-i386 lib32ncurses5-dev libx11-dev g++-multilib lib32z1-dev ccache
-- sudo apt-get install libx11-dev
-- sudo apt-get install g++-multilib
-- sudo apt-get install lib32z1-dev
-- sudo apt-get install ccache
 - export NDK_CCACHE=ccache
 - export ARCH=`uname -m`
-- wget http://dl.google.com/android/android-sdk_r23-linux.tgz
+- wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz
-- tar xf android-sdk_r23-linux.tgz
+- tar xf android-sdk_r23.0.2-linux.tgz
 - wget http://dl.google.com/android/ndk/android-ndk-r9d-linux-${ARCH}.tar.bz2
 - tar xf android-ndk-r9d-linux-${ARCH}.tar.bz2
-- export ANDROID_NDK=`pwd`/android-ndk-r9d
+- export ANDROID_NDK_HOME=`pwd`/android-ndk-r9d
 - export ANDROID_HOME=`pwd`/android-sdk-linux
 - export PATH=${PATH}:${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-- echo "y" | android update sdk --filter tools,platform-tools,build-tools-20.0.0,android-19,extra-google-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
 script:
 - ./build-ndk.sh
 - cp local.properties.travis local.properties
 - sbt android:package-release
+- exit 0

README.md

@@ -39,7 +39,7 @@ Help to translate shadowsocks: http://crowdin.net/project/shadowsocks/invite
 #### 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 loat it.
+* 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`
 * Create your key following the instructions at http://developer.android.com/guide/publishing/app-signing.html#cert
 * Put your key in ~/.keystore

build-ndk.sh

@@ -1,38 +1,28 @@
 #!/bin/bash
 
-# Target 9
+function try () {
-cp jni/Application.mk.9 jni/Application.mk
+    "$@" || exit -1
-ndk-build clean
+}
-ndk-build
+
-rm -rf src/main/assets/armeabi
+# 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
 mkdir -p src/main/assets/armeabi-v7a
 mkdir -p src/main/assets/x86
-for app in pdnsd redsocks
+for app in pdnsd redsocks iptables
 do
-    mv libs/armeabi/$app src/main/assets/armeabi/
+    try mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
-    mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
+    try mv libs/x86/$app src/main/assets/x86/
-    mv libs/x86/$app src/main/assets/x86/
-done
-rm -rf src/main/jni
-mv libs src/main/jni
-
-# Target 16
-cp jni/Application.mk.16 jni/Application.mk
-ndk-build clean
-ndk-build
-rm -rf src/main/assets/api-16/armeabi
-rm -rf src/main/assets/api-16/armeabi-v7a
-rm -rf src/main/assets/api-16/x86
-mkdir -p src/main/assets/api-16/armeabi
-mkdir -p src/main/assets/api-16/armeabi-v7a
-mkdir -p src/main/assets/api-16/x86
-for app in pdnsd redsocks
-do
-    mv libs/armeabi/$app src/main/assets/api-16/armeabi/
-    mv libs/armeabi-v7a/$app src/main/assets/api-16/armeabi-v7a/
-    mv libs/x86/$app src/main/assets/api-16/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

@@ -4,7 +4,7 @@ import android.Dependencies.{apklib,aar}
 
 android.Plugin.androidBuild
 
-platformTarget in Android := "android-19"
+platformTarget in Android := "android-21"
 
 name := "shadowsocks"
 
@@ -15,7 +15,6 @@ resolvers += "JRAF" at "http://JRAF.org/static/maven/2"
 resolvers += "madeye private releases" at "http://madeye-maven-repository.googlecode.com/git/"
 
 libraryDependencies ++= Seq(
-  "com.google.android" % "analytics" % "3.01",
   "dnsjava" % "dnsjava" % "2.1.5",
   "org.scalaj" %% "scalaj-http" % "0.3.10",
   "commons-net" % "commons-net" % "3.3",
@@ -23,15 +22,13 @@ libraryDependencies ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  aar("com.actionbarsherlock" % "actionbarsherlock" % "4.4.0") exclude("com.google.android", "support-v4"),
   "net.simonvt.menudrawer" % "menudrawer" % "3.0.6",
-  "org.jraf" % "android-switch-backport" % "1.3.1",
+  "com.google.android.gms" % "play-services" % "5.0.89",
-  "com.google.android.gms" % "play-services" % "4.4.52",
   "com.android.support" % "support-v4" % "19.1.0"
 )
 
 libraryDependencies ++= Seq(
-  "de.keyboardsurfer.android.widget" % "crouton" % "1.8.1" exclude("com.google.android", "support-v4"),
+  "de.keyboardsurfer.android.widget" % "crouton" % "1.8.4" exclude("com.google.android", "support-v4"),
   "com.nostra13.universalimageloader" % "universal-image-loader" % "1.8.4",
   "com.j256.ormlite" % "ormlite-core" % "4.47",
   "com.j256.ormlite" % "ormlite-android" % "4.47"

jni/Android.mk

@@ -335,13 +335,13 @@ openssl_subdirs := $(addprefix $(LOCAL_PATH)/openssl/,$(addsuffix /Android.mk, \
 include $(openssl_subdirs)
 
 # Iptables
-# LOCAL_PATH := $(ROOT_PATH)
+LOCAL_PATH := $(ROOT_PATH)
-# iptables_subdirs := $(addprefix $(LOCAL_PATH)/iptables/,$(addsuffix /Android.mk, \
+iptables_subdirs := $(addprefix $(LOCAL_PATH)/iptables/,$(addsuffix /Android.mk, \
-# 	iptables \
+	iptables \
-# 	extensions \
+	extensions \
-# 	libiptc \
+	libiptc \
-# 	))
+	))
-# include $(iptables_subdirs)
+include $(iptables_subdirs)
 
 # Import cpufeatures
 $(call import-module,android/cpufeatures)

jni/Application.mk

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

jni/Application.mk.16

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

jni/Application.mk.9

@@ -1,4 +0,0 @@
-APP_ABI      			:= armeabi armeabi-v7a x86
-APP_PLATFORM 			:= android-9
-APP_STL      			:= stlport_static
-NDK_TOOLCHAIN_VERSION 	:= 4.8

jni/redsocks/redsocks.c

@@ -780,7 +780,7 @@ static int redsocks_init_instance(redsocks_instance *instance)
 	int on = 1;
 	int fd = -1;
 
-	fd = socket(AF_INET, SOCK_STREAM, 0);
+	fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (fd == -1) {
 		log_errno(LOG_ERR, "socket");
 		goto fail;

jni/system.cpp

@@ -21,11 +21,11 @@ jstring Java_com_github_shadowsocks_system_getabi(JNIEnv *env, jobject thiz) {
   } else if (family == ANDROID_CPU_FAMILY_MIPS) {
     abi = "mips";
   } else if (family == ANDROID_CPU_FAMILY_ARM) {
-    if (features & ANDROID_CPU_ARM_FEATURE_ARMv7) {
+    // if (features & ANDROID_CPU_ARM_FEATURE_ARMv7) {
-      abi = "armeabi-v7a";
+    abi = "armeabi-v7a";
-    } else {
+    // } else {
-      abi = "armeabi";
+    //   abi = "armeabi";
-    }
+    // }
   }
   return env->NewStringUTF(abi);
 }

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="69"
+    android:versionCode="81"
-    android:versionName="2.2.1">
+    android:versionName="2.4.1">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -15,10 +15,11 @@
       android:required="false"/>
 
   <uses-sdk
-      android:minSdkVersion="9"
+      android:minSdkVersion="16"
-      android:targetSdkVersion="19"/>
+      android:targetSdkVersion="21"/>
 
   <application
+      android:allowBackup="true"
       android:name=".ShadowsocksApplication"
       android:hardwareAccelerated="true"
       android:icon="@drawable/ic_launcher"
@@ -75,14 +76,12 @@
 
     <service
         android:name=".ShadowsocksNatService"
-        android:process=":proxy"
         android:exported="false">
     </service>
 
     <service
         android:name=".ShadowsocksVpnService"
         android:label="@string/app_name"
-        android:process=":vpn"
         android:permission="android.permission.BIND_VPN_SERVICE"
         android:exported="false">
       <intent-filter>

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

@@ -14,6 +14,7 @@ public class Config implements Parcelable {
   public String profileName = "Untitled";
   public String proxy = "127.0.0.1";
   public String sitekey = "null";
+  public String route = "all";
 
   public String encMethod = "rc4";
   public String proxiedAppString = "";
@@ -33,7 +34,7 @@ public class Config implements Parcelable {
 
   public Config(boolean isGlobalProxy, boolean isGFWList, boolean isBypassApps,
       boolean isTrafficStat, boolean isUdpDns, String profileName, String proxy, String sitekey,
-      String encMethod, String proxiedAppString, int remotePort, int localPort) {
+      String encMethod, String proxiedAppString, String route, int remotePort, int localPort) {
     this.isGlobalProxy = isGlobalProxy;
     this.isGFWList = isGFWList;
     this.isBypassApps = isBypassApps;
@@ -44,6 +45,7 @@ public class Config implements Parcelable {
     this.sitekey = sitekey;
     this.encMethod = encMethod;
     this.proxiedAppString = proxiedAppString;
+    this.route = route;
     this.remotePort = remotePort;
     this.localPort = localPort;
   }
@@ -63,6 +65,7 @@ public class Config implements Parcelable {
     sitekey = in.readString();
     encMethod = in.readString();
     proxiedAppString = in.readString();
+    route = in.readString();
     remotePort = in.readInt();
     localPort = in.readInt();
   }
@@ -82,6 +85,7 @@ public class Config implements Parcelable {
     out.writeString(sitekey);
     out.writeString(encMethod);
     out.writeString(proxiedAppString);
+    out.writeString(route);
     out.writeInt(remotePort);
     out.writeInt(localPort);
   }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Jorrit "Chainfire" Jongma
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Jorrit "Chainfire" Jongma
+ * 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.
@@ -18,6 +18,7 @@ package eu.chainfire.libsuperuser;
 
 import android.os.Looper;
 import android.util.Log;
+
 import com.github.shadowsocks.BuildConfig;
 
 /**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Jorrit "Chainfire" Jongma
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Jorrit "Chainfire" Jongma
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Jorrit "Chainfire" Jongma
+ * 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.