From f88610077cd2ce64bfbce64eb3bb1c55b6afd375 Mon Sep 17 00:00:00 2001 From: tinyzimmer <38474291+tinyzimmer@users.noreply.github.com> Date: Sun, 22 Apr 2018 20:40:26 -0700 Subject: [PATCH 1/3] allow dynamic host for simple socks env var --- src/common.h | 3 ++- src/libproxychains.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/common.h b/src/common.h index 4db13ff..a97b602 100644 --- a/src/common.h +++ b/src/common.h @@ -1,7 +1,8 @@ #define PROXYCHAINS_CONF_FILE_ENV_VAR "PROXYCHAINS_CONF_FILE" #define PROXYCHAINS_QUIET_MODE_ENV_VAR "PROXYCHAINS_QUIET_MODE" #define PROXYCHAINS_CONF_FILE "proxychains.conf" -#define PROXYCHAINS_SOCKS5_ENV_VAR "PROXYCHAINS_SOCKS5" +#define PROXYCHAINS_SOCKS5_PORT_ENV_VAR "PROXYCHAINS_SOCKS5_PORT" +#define PROXYCHAINS_SOCKS5_HOST_ENV_VAR "PROXYCHAINS_SOCKS5_HOST" #define PROXYCHAINS_DNS_ENV_VAR "PROXYCHAINS_DNS" #define LOG_PREFIX "[proxychains] " diff --git a/src/libproxychains.c b/src/libproxychains.c index 05d992e..46d11c7 100644 --- a/src/libproxychains.c +++ b/src/libproxychains.c @@ -308,21 +308,27 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ static void simple_socks5_env(proxy_data *pd, unsigned int *proxy_count, chain_type *ct) { char *port_string; + char *host_string; if(proxychains_got_chain_data) return; load_default_settings(ct); - port_string = getenv(PROXYCHAINS_SOCKS5_ENV_VAR); + port_string = getenv(PROXYCHAINS_SOCKS5_PORT_ENV_VAR); if(!port_string) return; + + host_string = getenv(PROXYCHAINS_SOCKS5_HOST_ENV_VAR); + + if(!host_string) + host_string = "127.0.0.1"; - memset(pd, 0, sizeof(proxy_data)); + memset(pd, 0, sizeof(proxy_data)); pd[0].ps = PLAY_STATE; - pd[0].ip.as_int = (uint32_t) inet_addr("127.0.0.1"); + pd[0].ip.as_int = (uint32_t) inet_addr(host_string); pd[0].port = htons((unsigned short) strtol(port_string, NULL, 0)); pd[0].pt = SOCKS5_TYPE; proxychains_max_chain = 1; From dbe328efdd4f4d97f97d2ce00d12b167fa1bf9bb Mon Sep 17 00:00:00 2001 From: tinyzimmer <38474291+tinyzimmer@users.noreply.github.com> Date: Sun, 22 Apr 2018 21:36:52 -0700 Subject: [PATCH 2/3] dont require cdefs --- src/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core.c b/src/core.c index b0e3f21..97b01a9 100644 --- a/src/core.c +++ b/src/core.c @@ -15,7 +15,7 @@ * * ***************************************************************************/ #include -#include +//#include #include #include From f3b07370fb06cd8fc1ec4fdfa45f03ccf53f4667 Mon Sep 17 00:00:00 2001 From: tinyzimmer <38474291+tinyzimmer@users.noreply.github.com> Date: Sun, 22 Apr 2018 21:42:33 -0700 Subject: [PATCH 3/3] require cdefs --- src/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core.c b/src/core.c index 97b01a9..b0e3f21 100644 --- a/src/core.c +++ b/src/core.c @@ -15,7 +15,7 @@ * * ***************************************************************************/ #include -//#include +#include #include #include