disable NAT mode again

Fix NDK build

.travis.yml

@@ -3,22 +3,18 @@ scala:
 - 2.10.4
 before_install:
 - sudo apt-get update
-- sudo apt-get install libc6-dev-i386
-- sudo apt-get install lib32ncurses5-dev
-- sudo apt-get install libx11-dev
-- sudo apt-get install g++-multilib
-- sudo apt-get install lib32z1-dev
-- sudo apt-get install ccache
+install:
+- sudo apt-get install -y libc6-dev-i386 lib32ncurses5-dev libx11-dev g++-multilib lib32z1-dev ccache
 - export NDK_CCACHE=ccache
 - export ARCH=`uname -m`
-- wget http://dl.google.com/android/android-sdk_r23-linux.tgz
-- tar xf android-sdk_r23-linux.tgz
+- wget http://dl.google.com/android/android-sdk_r23.0.2-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

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

@@ -5,15 +5,15 @@ function try () {
 }
 
 # Build
-try ndk-build clean
-try ndk-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
+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/

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"
 

jni/Android.mk

@@ -335,13 +335,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)

jni/Application.mk

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

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;

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="73"
-    android:versionName="2.2.5">
+    android:versionCode="81"
+    android:versionName="2.4.1">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -16,7 +16,7 @@
 
   <uses-sdk
       android:minSdkVersion="16"
-      android:targetSdkVersion="19"/>
+      android:targetSdkVersion="21"/>
 
   <application
       android:allowBackup="true"

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.