From 3ad1bc55837fa992c92ee00fe6f7471141459111 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sat, 7 Nov 2015 10:22:49 +0800 Subject: [PATCH 1/8] disable redudp for shadowsocks-android --- main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/main.c b/main.c index e6f6ec0d..6129774f 100644 --- a/main.c +++ b/main.c @@ -29,13 +29,17 @@ extern app_subsys redsocks_subsys; extern app_subsys base_subsys; +#ifndef ANDROID extern app_subsys redudp_subsys; +#endif extern app_subsys dnstc_subsys; app_subsys *subsystems[] = { &redsocks_subsys, &base_subsys, +#ifndef ANDROID &redudp_subsys, +#endif &dnstc_subsys, }; From 88cda9a8c459863ef152b62ec98e6db3a29bf9b2 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sat, 7 Nov 2015 10:34:39 +0800 Subject: [PATCH 2/8] add version --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 3158c3c4..e2bbe334 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #ifndef VERSION_H_SUN_NOV_27_03_22_30_2011 #define VERSION_H_SUN_NOV_27_03_22_30_2011 -extern const char* redsocks_version; +const char* redsocks_version = "SUN_NOV_27_03_22_30_2011"; #endif // VERSION_H_SUN_NOV_27_03_22_30_2011 From 65d039c7b302510188dc7b3d765a206c3980db51 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Wed, 11 Nov 2015 13:38:57 +0800 Subject: [PATCH 3/8] refine redsocks --- redsocks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redsocks.c b/redsocks.c index 878576ff..d5512497 100644 --- a/redsocks.c +++ b/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; From 32d5df091f8bfdc9cd3ddc517fc8b6001be162c2 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 15 Nov 2015 10:18:08 +0800 Subject: [PATCH 4/8] WAR for some AOSP --- base.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base.c b/base.c index b04959f3..ae90d387 100644 --- a/base.c +++ b/base.c @@ -413,10 +413,12 @@ static int base_init() log_open(); // child has nothing to do with TTY if (instance.daemon) { +#if 0 if (setsid() < 0) { log_errno(LOG_ERR, "setsid()"); goto fail; } +#endif int fds[] = { STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO }; int *pfd; From 930896dcb6ed5d964b3e72bd69ab4fad87a247bd Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 15 Nov 2015 10:36:21 +0800 Subject: [PATCH 5/8] Revert "WAR for some AOSP" This reverts commit 32d5df091f8bfdc9cd3ddc517fc8b6001be162c2. --- base.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/base.c b/base.c index ae90d387..b04959f3 100644 --- a/base.c +++ b/base.c @@ -413,12 +413,10 @@ static int base_init() log_open(); // child has nothing to do with TTY if (instance.daemon) { -#if 0 if (setsid() < 0) { log_errno(LOG_ERR, "setsid()"); goto fail; } -#endif int fds[] = { STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO }; int *pfd; From 76348e933a3a15176fdb54616d04bc6fdd3c8e0b Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 15 Nov 2015 18:47:35 +0800 Subject: [PATCH 6/8] disable dnstc module of redsocks --- main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index 6129774f..7ef4ac78 100644 --- a/main.c +++ b/main.c @@ -31,16 +31,16 @@ extern app_subsys redsocks_subsys; extern app_subsys base_subsys; #ifndef ANDROID extern app_subsys redudp_subsys; -#endif extern app_subsys dnstc_subsys; +#endif app_subsys *subsystems[] = { &redsocks_subsys, &base_subsys, #ifndef ANDROID &redudp_subsys, -#endif &dnstc_subsys, +#endif }; static const char *confname = "redsocks.conf"; From 3bc3f03c182b4c4ea5138eb7bebcaafe7cc0f53b Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sat, 21 Nov 2015 09:17:46 +0800 Subject: [PATCH 7/8] disable log for Android --- log.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/log.c b/log.c index e25073be..bd5cdf60 100644 --- a/log.c +++ b/log.c @@ -44,7 +44,9 @@ static void fprint_timestamp( static void stderr_msg(const char *file, int line, const char *func, int priority, const char *message, const char *appendix) { +#ifndef ANDROID fprint_timestamp(stderr, file, line, func, priority, message, appendix); +#endif } static FILE *logfile = NULL; From 274334f14839431ae003774d99c3d1de337afff4 Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 17 May 2017 00:11:30 -0500 Subject: [PATCH 8/8] Use standard __ANDROID__ preprocessor macro (#1) --- log.c | 2 +- main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/log.c b/log.c index bd5cdf60..b818ed6b 100644 --- a/log.c +++ b/log.c @@ -44,7 +44,7 @@ static void fprint_timestamp( static void stderr_msg(const char *file, int line, const char *func, int priority, const char *message, const char *appendix) { -#ifndef ANDROID +#ifndef __ANDROID__ fprint_timestamp(stderr, file, line, func, priority, message, appendix); #endif } diff --git a/main.c b/main.c index 7ef4ac78..3d8a9008 100644 --- a/main.c +++ b/main.c @@ -29,7 +29,7 @@ extern app_subsys redsocks_subsys; extern app_subsys base_subsys; -#ifndef ANDROID +#ifndef __ANDROID__ extern app_subsys redudp_subsys; extern app_subsys dnstc_subsys; #endif @@ -37,7 +37,7 @@ extern app_subsys dnstc_subsys; app_subsys *subsystems[] = { &redsocks_subsys, &base_subsys, -#ifndef ANDROID +#ifndef __ANDROID__ &redudp_subsys, &dnstc_subsys, #endif