CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-07-03 21:21:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix su invocation in some devices

Browse Source 
Not all the "su" implementations support the -c option
This commit is contained in:
emanuele-f 2021-06-21 21:08:13 +02:00
parent 4986614eb1
commit 3130cabcae
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/jni/vpnproxy-jni/capture_root.c
View File

@ -40,21 +40,20 @@ typedef struct {
/* ******************************************************* */
static int su_cmd(vpnproxy_data_t *proxy, const char *prog, const char *args) {
char cmd[1024];
int rv;
JNIEnv *env = proxy->env;
static int su_cmd(const char *prog, const char *args) {
FILE *fp;
if(snprintf(cmd, sizeof(cmd), "su -c '%s %s'", prog, args) >= sizeof(cmd)) {
log_e("su cmd buffer too small");
return -1;
if((fp = popen("su", "w")) == NULL) {
log_e("popen(\"su\") failed[%d]: %s", errno, strerror(errno));
pclose(fp);
return -1;
}
log_d("su_cmd: %s", cmd);
log_d("su_cmd: %s %s", prog, args);
fprintf(fp, "%s", prog);
fprintf(fp, " %s\n", args);
rv = system(cmd);
return rv;
return pclose(fp);
}
/* ******************************************************* */
@ -99,7 +98,7 @@ static void kill_pcapd(vpnproxy_data_t *proxy) {
if(pid != 0) {
log_d("Killing old pcapd with pid %d", pid);
su_cmd(proxy, "kill", pid_s);
su_cmd("kill", pid_s);
}
fclose(f);
@ -154,7 +153,7 @@ static int connectPcapd(vpnproxy_data_t *proxy) {
// Start the daemon
char args[32];
snprintf(args, sizeof(args), "-d %d", proxy->app_filter);
su_cmd(proxy, pcapd, args);
su_cmd(pcapd, args);
// Wait for pcapd to start
struct timeval timeout = {.tv_sec = 1, .tv_usec = 0};
@ -377,4 +376,4 @@ cleanup:
close(sock);
return rv;
}
}