Revert "fake proc name failed on LRX21R"

This reverts commit 185e760.

Author: madeye

build.sh

@@ -15,7 +15,7 @@ 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
+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/

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

@@ -214,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 \
@@ -288,9 +288,9 @@ LOCAL_MODULE := tun2socks
 
 LOCAL_LDLIBS := -ldl -llog
 
-LOCAL_SRC_FILES := $(addprefix badvpn/, $(TUN2SOCKS_SOURCES)) tun2socks-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, \

src/main/jni/Android.mk

@@ -402,6 +402,13 @@ int main (int argc, char **argv)
         goto fail0;
     }
 
+    if (options.fake_proc) {
+        // Fake process name to cheat on Lollipop
+        strcpy(argv[0], "com.github.shadowsocks");
+        prctl(PR_SET_NAME, "com.github.shadowsocks");
+    }
+
+
     // handle --help and --version
     if (options.help) {
         print_version();
@@ -661,6 +668,7 @@ void print_help (const char *name)
         "        [--loglevel <0-5/none/error/warning/notice/info/debug>]\n"
         "        [--channel-loglevel <channel-name> <0-5/none/error/warning/notice/info/debug>] ...\n"
 #ifdef ANDROID
+        "        [--fake-proc]\n"
         "        [--tunfd <fd>]\n"
         "        [--tunmtu <mtu>]\n"
         "        [--dnsgw <dns_gateway_address>]\n"
@@ -810,6 +818,9 @@ int parse_arguments (int argc, char *argv[])
             i += 2;
         }
 #ifdef ANDROID
+        else if (!strcmp(arg, "--fake-proc")) {
+            options.fake_proc = 1;
+        }
         else if (!strcmp(arg, "--tunfd")) {
             if (1 >= argc - i) {
                 fprintf(stderr, "%s: requires an argument\n", arg);

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

@@ -320,9 +320,13 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     else
       cmd += " --dnsgw %s:8153".format(PRIVATE_VLAN.format("1"))
 
+    if (Utils.isLollipopOrAbove) {
+      cmd += " --fake-proc";
+    }
+
     if (BuildConfig.DEBUG) Log.d(TAG, cmd)
 
-    Tun2Socks.start(cmd.split(" "))
+    System.exec(cmd);
   }
 
   /** Called when the activity is first created. */