diff --git a/nfq/dvtws b/nfq/dvtws new file mode 100644 index 0000000..2d9d47e Binary files /dev/null and b/nfq/dvtws differ diff --git a/nfq/nfqws.c b/nfq/nfqws.c index da81369..5da3750 100644 --- a/nfq/nfqws.c +++ b/nfq/nfqws.c @@ -552,7 +552,7 @@ static bool parse_ws_scale_factor(char *s, uint16_t *wsize, uint8_t *wscale) -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) static void cleanup_args() { wordfree(¶ms.wexp); @@ -561,7 +561,7 @@ static void cleanup_args() static void cleanup_params(void) { -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) cleanup_args(); #endif @@ -985,7 +985,7 @@ static unsigned int hash_jen(const void *data,unsigned int len) static void exithelp(void) { printf( -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) " @|$\t\t\t; read file for options. must be the only argument. other options are ignored.\n\n" #endif " --debug=0|1|syslog|@\n" @@ -1099,7 +1099,7 @@ static void exithelp_clean(void) exithelp(); } -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) // no static to not allow optimizer to inline this func (save stack) void config_from_file(const char *filename) { @@ -1192,7 +1192,7 @@ int main(int argc, char **argv) } #endif -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) if (argc>=2 && (argv[1][0]=='@' || argv[1][0]=='$')) { config_from_file(argv[1]+1); @@ -1963,7 +1963,7 @@ int main(int argc, char **argv) } // do not need args from file anymore -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) cleanup_args(); #endif argv=NULL; argc=0; diff --git a/nfq/params.h b/nfq/params.h index 630d20d..3b59f36 100644 --- a/nfq/params.h +++ b/nfq/params.h @@ -14,7 +14,7 @@ #include #include #include -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) #include #endif @@ -104,7 +104,7 @@ bool dp_list_have_autohostlist(struct desync_profile_list_head *head); struct params_s { -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) wordexp_t wexp; // for file based config #endif diff --git a/tpws/params.h b/tpws/params.h index 3afa694..acf9f4a 100644 --- a/tpws/params.h +++ b/tpws/params.h @@ -6,7 +6,7 @@ #include #include #include -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) #include #endif @@ -85,7 +85,7 @@ void dp_list_destroy(struct desync_profile_list_head *head); struct params_s { -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) wordexp_t wexp; // for file based config #endif diff --git a/tpws/tpws.c b/tpws/tpws.c index 8136da3..b154be7 100644 --- a/tpws/tpws.c +++ b/tpws/tpws.c @@ -122,7 +122,7 @@ static int get_default_ttl(void) static void exithelp(void) { printf( -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) " @|$\t\t; read file for options. must be the only argument. other options are ignored.\n\n" #endif " --bind-addr=|\t; for v6 link locals append %%interface_name\n" @@ -215,7 +215,7 @@ static void exithelp(void) ); exit(1); } -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) static void cleanup_args() { wordfree(¶ms.wexp); @@ -223,7 +223,7 @@ static void cleanup_args() #endif static void cleanup_params(void) { -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) cleanup_args(); #endif @@ -472,7 +472,7 @@ static bool parse_pf_list(char *opt, struct port_filters_head *pfl) return true; } -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) // no static to not allow optimizer to inline this func (save stack) void config_from_file(const char *filename) { @@ -547,7 +547,7 @@ void parse_params(int argc, char *argv[]) dp = &dpl->dp; dp->n = ++desync_profile_count; -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) if (argc>=2 && (argv[1][0]=='@' || argv[1][0]=='$')) { config_from_file(argv[1]+1); @@ -1288,7 +1288,7 @@ void parse_params(int argc, char *argv[]) SplitDebug(); VPRINT("\n"); -#ifndef __OpenBSD__ +#if !defined( __OpenBSD__) && !defined(__ANDROID__) // do not need args from file anymore cleanup_args(); #endif