refine libexec

Author: madeye

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.github.shadowsocks"
           android:installLocation="auto"
-          android:versionCode="4"
-          android:versionName="1.1">
+          android:versionCode="5"
+          android:versionName="1.1.1">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

jni/Application.mk

@@ -1 +1 @@
-APP_PLATFORM = anrdoid-8
+APP_PLATFORM = android-9

jni/termExec.cpp

@@ -49,6 +49,7 @@
 #include <unistd.h>
 #include <termios.h>
 #include <signal.h>
+#include <stdio.h>
 
 static jclass class_fileDescriptor;
 static jfieldID field_fileDescriptor_descriptor;
@@ -98,24 +99,15 @@ static int throwOutOfMemoryError(JNIEnv *env, const char *message)
     return env->ThrowNew(exClass, message);
 }
 
-static int create_subprocess(const char *cmd,
-    char *const argv[], char *const envp[], int* pProcessId)
+static int create_subprocess(const char *cmd, char *const argv[], 
+    char *const envp[], const char* scripts, int* pProcessId)
 {
-    char filename[] = "/data/data/com.github.shadowsocks/defout";
-    char script[] = "/data/data/com.github.shadowsocks/script";
     pid_t pid;
+    int pfds[2];
+    int pfds2[2];
 
-    if (chmod(script, 0755) < 0) {
-        LOGE("error to chmod\n");
-        exit(-1);
-    }
-
-    int defout = open(filename, O_RDWR | O_CREAT | O_TRUNC, 0600);
-
-    if(defout < 0) { 
-        LOGE("open file error\n");
-        exit(-1);
-    }
+    pipe(pfds);
+    pipe(pfds2);
 
     pid = fork();
 
@@ -126,28 +118,41 @@ static int create_subprocess(const char *cmd,
 
     if(pid == 0){
 
-        //setsid();
-
-        dup2(defout, 1);
-        dup2(defout, 2);
-
         if (envp) {
             for (; *envp; ++envp) {
                 putenv(*envp);
             }
         }
 
+        dup2(pfds[0], 0);
+        close(pfds[1]);
+
+        dup2(pfds2[1], 1);
+        dup2(pfds2[1], 2);
+        close(pfds2[0]);
+
         execv(cmd, argv);
-        exit(-1);
+
+        fflush(NULL);
+
+        exit(0);
+
     } else {
         *pProcessId = (int) pid;
-        return defout;
+
+        dup2(pfds[1], 1);
+        close(pfds[0]);
+
+        write(pfds[1], scripts, strlen(scripts)+1);
+
+        close(pfds2[1]);
+        return pfds2[0]; 
     }
 }
 
 
 static jobject android_os_Exec_createSubProcess(JNIEnv *env, jobject clazz,
-    jstring cmd, jobjectArray args, jobjectArray envVars,
+    jstring cmd, jobjectArray args, jobjectArray envVars, jstring scripts,
     jintArray processIdArray)
 {
     const jchar* str = cmd ? env->GetStringCritical(cmd, 0) : 0;
@@ -157,6 +162,13 @@ static jobject android_os_Exec_createSubProcess(JNIEnv *env, jobject clazz,
         env->ReleaseStringCritical(cmd, str);
     }
 
+    const jchar* str_scripts = scripts ? env->GetStringCritical(scripts, 0) : 0;
+    String8 scripts_8;
+    if (str_scripts) {
+        scripts_8.set(str_scripts, env->GetStringLength(scripts));
+        env->ReleaseStringCritical(scripts, str_scripts);
+    }
+
     jsize size = args ? env->GetArrayLength(args) : 0;
     char **argv = NULL;
     String8 tmp_8;
@@ -203,7 +215,8 @@ static jobject android_os_Exec_createSubProcess(JNIEnv *env, jobject clazz,
     }
 
     int procId;
-    int ptm = create_subprocess(cmd_8.string(), argv, envp, &procId);
+    int ptm = create_subprocess(cmd_8.string(), argv, envp, scripts_8.string(), 
+        &procId);
 
     if (argv) {
         for (char **tmp = argv; *tmp; ++tmp) {
@@ -311,7 +324,7 @@ static int register_FileDescriptor(JNIEnv *env)
 static const char *classPathName = "com/github/shadowsocks/Exec";
 
 static JNINativeMethod method_table[] = {
-    { "createSubprocess", "(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;[I)Ljava/io/FileDescriptor;",
+    { "createSubprocess", "(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[I)Ljava/io/FileDescriptor;",
         (void*) android_os_Exec_createSubProcess },
     { "waitFor", "(I)I",
         (void*) android_os_Exec_waitFor},

libs/armeabi/libexec.so

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.shadowsocks</groupId>
     <artifactId>shadowsocks</artifactId>
-    <version>1.1</version>
+    <version>1.1.1</version>
     <packaging>apk</packaging>
     <name>Shadowsocks</name>
 

pom.xml

@@ -43,16 +43,18 @@ public class Exec {
      * Callers are responsible for calling Exec.close() on the returned file
      * descriptor.
      *
-     * @param cmd       The command to execute
-     * @param args      An array of arguments to the command
+     * @param cmd       The command to execute.
+     * @param args      An array of arguments to the command.
      * @param envVars   An array of strings of the form "VAR=value" to be added to the
-     *                  environment of the process
+     *                  environment of the process.
+     * @param scripts   The scripts to execute.
      * @param processId A one-element array to which the process ID of the started
      *                  process will be written.
-     * @return the file descriptor of the started process.
+     * @return          File descriptor
      */
     public static native FileDescriptor createSubprocess(String cmd,
-                                                         String[] args, String[] envVars, int[] processId);
+                                                         String[] args, String[] envVars,
+                                                         String scripts, int[] processId);
 
     /**
      * Send SIGHUP to a process group.

src/com/github/shadowsocks/Exec.java

@@ -1,13 +1,21 @@
 package com.github.shadowsocks;
 
 import android.app.Application;
+import android.content.Context;
 import com.google.analytics.tracking.android.EasyTracker;
 
 public class ShadowsocksApplication extends Application {
 
+    private static String sTmpDir;
+
+    public static String getTmpDir() {
+        return sTmpDir;
+    }
+
     @Override
     public void onCreate() {
         EasyTracker.getInstance().setContext(this);
+        sTmpDir = getCacheDir().getAbsolutePath();
     }
 
 }