Update mac os build.

proxychains.conf: mention `raw` type

.gitignore

@@ -5,7 +5,7 @@
 .deps/
 .libs/
 .*
-
+src/*.d
 # Autoconf stuff 
 libtool
 config.*

.travis.yml

@@ -0,0 +1,16 @@
+# Enable C support
+language: c
+
+# OS selection
+os:
+  - linux
+  - osx
+
+# Compiler selection
+compiler:
+  - clang
+  - gcc
+# Build steps
+script:
+  - ./configure
+  - make

AUTHORS

@@ -7,7 +7,7 @@ main.c, remote-dns, thread safety, bugfixes, build system, cleanups
 rofl0r.
 https://github.com/rofl0r/proxychains
 
-localnet, bugfixes, macos x support
+localnet, bugfixes, macos x support, bsd support, packaging
 adam hamsik.
 https://github.com/haad/proxychains
 

ChangeLog

@@ -1,6 +1,12 @@
 ProxyChains version history (public releases)
 ====================
 
+ver 4.2
+	* Introduce BSD support make proxychains available on (NetBSD, FreeBSD ,OpenBSD and DragonFlyBSD)
+	* Update pkgsrc-wip proxychains package to 4.2.0 release and make easy to install and use
+	  proxychains
+-------------------------------------------------------------------------
+
 ver 4.1
        * Mac OS X support, create install script.
        * thread-safe fixes by @rofl0r

Makefile

@@ -16,16 +16,17 @@ bindir = $(exec_prefix)/bin
 SRCS = $(sort $(wildcard src/*.c))
 OBJS = $(SRCS:.c=.o)
 LOBJS = src/core.o src/common.o src/libproxychains.o
+DEPS = $(OBJS:.o=.d)
 
-CCFLAGS  = -Wall -O2 -g -std=c99 -D_GNU_SOURCE -pipe -DTHREAD_SAFE -Werror 
-LDFLAGS = -shared -fPIC -lpthread
-INC     = 
+CCFLAGS  = -MD -Wall -O2 -g -std=c99 -D_GNU_SOURCE -pipe -DTHREAD_SAFE -Werror
+LDFLAGS = -shared -fPIC
+INC     =
 PIC     = -fPIC
 AR      = $(CROSS_COMPILE)ar
 RANLIB  = $(CROSS_COMPILE)ranlib
 
 LDSO_SUFFIX = so
-LD_SET_SONAME = -Wl,-soname=
+LD_SET_SONAME = -Wl
 INSTALL_FLAGS = -D -m
 
 -include config.mak
@@ -37,9 +38,9 @@ ALL_LIBS = $(SHARED_LIBS)
 PXCHAINS = proxychains4
 ALL_TOOLS = $(PXCHAINS)
 
-CCFLAGS+=$(USER_CFLAGS) $(MAC_CFLAGS)
-LDFLAGS+=$(USER_LDFLAGS) $(MAC_LDFLAGS)
-CXXFLAGS+=$(CCFLAGS) $(USER_CFLAGS) $(MAC_CFLAGS)
+CCFLAGS+=$(USER_CFLAGS) $(OS_CFLAGS)
+LDFLAGS+=$(USER_LDFLAGS) $(OS_LDFLAGS)
+CXXFLAGS+=$(CCFLAGS) $(USER_CFLAGS) $(OS_CFLAGS)
 CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DINSTALL_PREFIX=\"$(prefix)\" -DDLL_NAME=\"$(LDSO_PATHNAME)\" -DSYSCONFDIR=\"$(confdir)\"
 
 all: $(ALL_LIBS) $(ALL_TOOLS)
@@ -58,6 +59,7 @@ clean:
 	rm -f $(ALL_LIBS)
 	rm -f $(ALL_TOOLS)
 	rm -f $(OBJS)
+	rm -f $(DEPS)
 
 %.o: %.c
 	$(CC) $(CCFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
@@ -69,3 +71,5 @@ $(ALL_TOOLS): $(OBJS)
 	$(CC) src/main.o src/common.o -o $(PXCHAINS)
 
 .PHONY: all clean install install-config
+
+-include $(DEPS)

README

@@ -1,115 +0,0 @@
-ProxyChains ver 4.0 README
-==========================
-
-  ProxyChains is a UNIX program, that hooks network-related libc functions
-  in dynamically linked programs via a preloaded DLL and redirects the
-  connections through SOCKS4a/5 or HTTP proxies.
-
-*********** ATTENTION ***********
-
-  this program works only on dynamically linked programs.
-  also both proxychains and the program to call must use
-  the same dynamic linker (i.e. same libc)
-
-*********************************
-
-*** Known limitations of the current version: ***
-
-  when a process forks, does a DNS lookup in the child, and then uses
-  the ip in the parent, the corresponding ip mapping will not be found.
-  this is because the fork can't write back into the parents mapping table.
-  IRSSI shows this behaviour, so you have to pass the resolved ip address
-  to it. (you can use the proxyresolv script (requires "dig") to do so)
-
-  this means that you can't currently use tor onion urls for irssi.
-  to solve this issue, an external data store (file, pipe, ...) has to
-  manage the dns <-> ip mapping. of course there has to be proper locking.
-  shm_open, mkstemp, are possible candidates for a file based approach,
-  the other option is to spawn some kind of server process that manages the
-  map lookups. since connect() etc are hooked, this must not be a TCP server.
-
-  I am reluctant on doing this change, because the described behaviour
-  seems pretty idiotic (doing a fork only for a DNS lookup), and irssi
-  is currently the only known affected program.
-
-*** Installation ***
-
-  # needs a working C compiler, preferably gcc
-  ./configure
-  make
-  sudo make install
-
-Changelog:
-----------
-
-Version (4.x) removes the dnsresolver script which required a dynamically
-linked "dig" binary to be present with remote DNS lookup.
-this speeds up any operation involving DNS, as the old script had to use TCP.
-additionally it allows to use .onion urls when used with TOR.
-also it removed the broken autoconf build system with a simple Makefile.
-there's a ./configure script though for convenience.
-it also adds support for a config file passed via command line switches/
-environment variables.
-
-Version (3.x) introduces support for DNS resolving through proxy 
-it supports SOCKS4, SOCKS5 and HTTP CONNECT proxy servers.
-Auth-types: socks - "user/pass" , http - "basic".
-
-When to use it ?
-1) When the only way to get "outside" from your LAN is through proxy server.
-2) To get out from behind restrictive firewall which filters outgoing ports.
-3) To use two (or more) proxies in chain:
-	like: your_host <--> proxy1 <--> proxy2 <--> target_host
-4) To "proxify" some program with no proxy support built-in (like telnet)
-5) Access intranet from outside via proxy.
-5) To use DNS behind proxy.
-
-Some cool features:
-
-* This program can mix different proxy types in the same chain
-	like: your_host <-->socks5 <--> http <--> socks4 <--> target_host
-* Different chaining options supported
-	random order from the list ( user defined length of chain ).
-	exact order  (as they appear in the list )
-	dynamic order (smart exclude dead proxies from chain)
-* You can use it with any TCP client application, even network scanners
-	yes, yes - you can make portscan via proxy (or chained proxies)
-	for example with Nmap scanner by fyodor (www.insecire.org/nmap).
-	proxychains nmap -sT -PO -p 80 -iR  (find some webservers through proxy)
-* You can use it with servers, like squid, sendmail, or whatever.
-* DNS resolving through proxy.
-
-
-Configuration:
---------------
-
-proxychains looks for config file in following order:
-1)	file listed in environment variable ${PROXYCHAINS_CONF_FILE} or
-	provided as a -f argument to proxychains script or binary.
-2)	./proxychains.conf
-3)	$(HOME)/.proxychains/proxychains.conf
-4)	/etc/proxychains.conf  **
-
-**see more in /etc/proxychains.conf
-
-Usage Example:
-
-	$ proxychains telnet targethost.com
-
-in this example it will run telnet through proxy(or chained proxies)
-specified by proxychains.conf
-
-Usage Example:
-
-      	$ proxychains -f /etc/proxychains-other.conf targethost2.com
-
-in this example it will use different configuration file then proxychains.conf 
-to connect to targethost2.com host.
-
-Usage Example:
-
-	$ proxyresolv targethost.com
-
-in this example it will resolve targethost.com through proxy(or chained proxies)
-specified by proxychains.conf
-

README.adoc

@@ -0,0 +1,172 @@
+= ProxyChains ver. 4.3.0 README
+
+image:https://travis-ci.org/haad/proxychains.svg?branch=master["Build Status", link="https://travis-ci.org/haad/proxychains"]
+
+ProxyChains is a UNIX program, that hooks network-related libc functions
+in dynamically linked programs via a preloaded DLL and redirects the
+connections through SOCKS4a/5 or HTTP proxies.
+
+WARNING: this program works only on dynamically linked programs.
+also both proxychains and the program to call must use
+the same dynamic linker (i.e. same libc)
+
+== Known limitations of the current version
+
+when a process forks, does a DNS lookup in the child, and then uses
+the ip in the parent, the corresponding ip mapping will not be found,
+this is because the fork can't write back into the parents mapping table.
+IRSSI shows this behaviour, so you have to pass the resolved ip address
+to it. (you can use the proxyresolv script (requires "dig") to do so)
+
+this means that you can't currently use tor onion urls for irssi.
+to solve this issue, an external data store (file, pipe, ...) has to
+manage the dns <-> ip mapping. of course there has to be proper locking.
+shm_open, mkstemp, are possible candidates for a file based approach,
+the other option is to spawn some kind of server process that manages the
+map lookups. since connect() etc are hooked, this must not be a TCP server.
+
+I am reluctant on doing this change, because the described behaviour
+seems pretty idiotic (doing a fork only for a DNS lookup), and irssi
+is currently the only known affected program.
+
+== Installation
+
+=== Using release version
+
+*Proxychains-4.3.0* are available with pkgsrc to everyone using it on _Linux_,
+_NetBSD_, _FreeBSD_, _OpenBSD_, _DragonFlyBSD_ or _Mac OS X_. You just need to install
+pkgsrc-wip repository and run
+  make install
+in a wip/proxychains directory.
+
+You can find out more about pkgsrc on link:http://www.pkgsrc.org[pkgsrc] and about pkgsrc-wip on
+link:http://pkgsrc-wip.sourceforge.net[Pkgsrc-wip homepage]
+
+=== Installing on Mac OS X with homebrew
+
+You can install current proxychains on Mac OS X with an homebrew. You have to
+download unofficial link:https://gist.github.com/3792521[homebrew formula] from
+to your BREW_HOME by default /usr/local/Library/Formula/ and run
+
+----
+$ brew install proxychains
+----
+
+=== Running Current Source code version
+
+----
+# needs a working C compiler, preferably gcc
+./configure
+make
+sudo make install
+----
+
+== Changelog
+
+*Version (4.x)* removes the dnsresolver script which required a dynamically
+linked "dig" binary to be present with remote DNS lookup.
+this speeds up any operation involving DNS, as the old script had to use TCP.
+additionally it allows to use .onion urls when used with TOR.
+also it removed the broken autoconf build system with a simple Makefile.
+there's a ./configure script though for convenience.
+it also adds support for a config file passed via command line switches/
+environment variables.
+
+*Version (3.x)* introduces support for DNS resolving through proxy
+it supports SOCKS4, SOCKS5 and HTTP CONNECT proxy servers.
+
+* Auth-types
+ ** socks - "user/pass",
+ ** http - "basic"
+
+== When to use it
+
+* When the only way to get "outside" from your LAN is through proxy server.
+* To get out from behind restrictive firewall which filters outgoing ports.
+* To use two (or more) proxies in chain:
+----
+   like: your_host <--> proxy1 <--> proxy2 <--> target_host
+----
+* To "proxify" some program with no proxy support built-in (like telnet)
+* Access intranet from outside via proxy.
+* To use DNS behind proxy.
+
+=== Some cool features
+
+* This program can mix different proxy types in the same chain
+----
+  like: your_host <-->socks5 <--> http <--> socks4 <--> target_host
+----
+* Different chaining options supported
+  random order from the list ( user defined length of chain ).
+  exact order  (as they appear in the list )
+  dynamic order (smart exclude dead proxies from chain)
+* You can use it with any TCP client application, even network scanners
+  yes, yes - you can make portscan via proxy (or chained proxies)
+  for example with Nmap scanner by fyodor (www.insecure.org/nmap).
+----
+  proxychains nmap -sT -PO -p 80 -iR  (find some webservers through proxy)
+----
+* You can use it with servers, like squid, sendmail, or whatever.
+* DNS resolving through proxy.
+
+== Configuration
+
+proxychains looks for configuration in the following order:
+
+* SOCKS5 proxy port in environment variable ${PROXYCHAINS_SOCKS5}
+  (if set, no further configuration will be searched)
+* file listed in environment variable ${PROXYCHAINS_CONF_FILE} or
+  provided as a -f argument to proxychains script or binary.
+* ./proxychains.conf
+* $(HOME)/.proxychains/proxychains.conf
+* /etc/proxychains.conf
+
+see more in */etc/proxychains.conf*
+
+=== Usage Example
+
+----
+$ proxychains telnet targethost.com
+----
+
+in this example it will run telnet through proxy(or chained proxies)
+specified by *proxychains.conf*
+
+=== Usage Example
+
+----
+$ proxychains -f /etc/proxychains-other.conf targethost2.com
+----
+
+in this example it will use different configuration file then *proxychains.conf*
+to connect to targethost2.com host.
+
+=== Usage Example
+
+----
+$ proxyresolv targethost.com
+----
+
+in this example it will resolve targethost.com through proxy(or chained proxies)
+specified by *proxychains.conf*
+
+=== Usage Example:
+
+----
+$ ssh -fN -D 4321 some.example.com
+$ PROXYCHAINS_SOCKS5=4321 proxychains zsh
+----
+
+in this example, it will run a shell with all traffic proxied through
+OpenSSH's "dynamic proxy" (SOCKS5 proxy) on localhost port 4321.
+
+=== Usage Example:
+
+----
+$ export PROXY_DNS_SERVER=8.8.8.8
+$ proxychains telnet targethost.com
+----
+
+in this example, it will telnet to targethost.com using the 8.8.8.8
+nameserver supplied by the user through the PROXY_DNS_SERVER

configure

@@ -86,28 +86,36 @@ fi
 echo CC?=$CC>config.mak
 [ -z "$CPPFLAGS" ] || echo CPPFLAGS?=$CPPFLAGS>>config.mak
 [ -z "$CFLAGS" ] || echo USER_CFLAGS?=$CFLAGS>>config.mak
+[ -z "$LDFLAGS" ] || echo USER_LDFLAGS?=$LDFLAGS>>config.mak
+
 echo prefix=$prefix>>config.mak
 echo exec_prefix=$exec_prefix>>config.mak
 echo bindir=$bindir>>config.mak
 echo libdir=$libdir>>config.mak
 echo includedir=$includedir>>config.mak
 echo sysconfdir=$sysconfdir>>config.mak
+
 if ismac ; then
 	echo LDSO_SUFFIX=dylib>>config.mak
-	echo MAC_CFLAGS+=-DIS_MAC=1 -arch x86_64 -arch i386 >>config.mak
-	echo MAC_LDFLAGS+=-arch x86_64 -arch i386 >>config.mak
-	echo LD_SET_SONAME=-ldl -Wl,-install_name,>>config.mak
+	echo OS_CFLAGS+=-DIS_MAC=1 -arch x86_64 >>config.mak
+	echo OS_LDFLAGS+=-arch x86_64 -lpthread -ldl -Wl,>>config.mak
+	echo LD_SET_SONAME=-Wl,-install_name,>>config.mak
+	echo LDSO_SUFFIX=dylib>>config.mak
 	echo INSTALL_FLAGS=-m>>config.mak
 fi
 
-if islinux ; then 
-    echo LD_SET_SONAME=-ldl
+if islinux ; then
+    echo OS_LDFLAGS=-pthread -ldl -Wl,--no-as-needed>>config.mak
+    echo LD_SET_SONAME=-Wl,-soname= >>config.mak
 fi
 
-if isbsd ; then 
+if isbsd ; then
+    #echo OS_LDFLAGS=
+    #echo OS_CFLAGS
     echo INSTALL_FLAGS=-m>>config.mak
     echo LD_SET_SONAME=-Wl,-rpath,$libdir -install_name,>>config.mak
 fi
 
 echo done, now run make \&\& make install
 
+

src/common.c

@@ -15,6 +15,8 @@ char *get_config_path(char* default_path, char* pbuf, size_t bufsize) {
 	char *path = default_path;
 	if(check_path(path))
 		return path;
+	if (!pbuf)
+		goto err;
 
 	// priority 1: env var PROXYCHAINS_CONF_FILE
 	path = getenv(PROXYCHAINS_CONF_FILE_ENV_VAR);
@@ -45,6 +47,7 @@ char *get_config_path(char* default_path, char* pbuf, size_t bufsize) {
 	if(check_path(path))
 		return path;
 
+err:
 	perror("couldnt find configuration file");
 	exit(1);
 }

src/common.h

@@ -1,10 +1,13 @@
 #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_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] "
 
 #define PROXYCHAINS_VERSION_MAJOR 4
-#define PROXYCHAINS_VERSION_MINOR 1
+#define PROXYCHAINS_VERSION_MINOR 3
 #define PROXYCHAINS_VERSION_BUGFIX 0
 
 #include <stddef.h>

src/core.c

@@ -278,6 +278,10 @@ static int tunnel_to(int sock, ip_type ip, unsigned short port, proxy_type pt, c
 	//memset (buff, 0, sizeof(buff));
 
 	switch (pt) {
+		case RAW_TYPE: {
+			return SUCCESS;
+		}
+		break;
 		case HTTP_TYPE:{
 				if(!dns_len) {
 					inet_ntop(AF_INET, &ip.octet[0], ip_buf, sizeof(ip_buf));
@@ -514,6 +518,19 @@ static int start_chain(int *fd, proxy_data * pd, char *begin_mark) {
 	return SOCKET_ERROR;
 }
 
+unsigned int get_rand_int(unsigned int range){
+    static FILE *fp;
+    unsigned int randval;
+    if (!fp) {
+        fp = fopen("/dev/urandom", "r");
+    }
+    if(fread(&randval, sizeof(randval), 1, fp)) {
+	return (randval % range);
+    } else {
+	srand((unsigned int)time(NULL));
+	return (rand() % range);
+    }
+}
 
 static proxy_data *select_proxy(select_type how, proxy_data * pd, unsigned int proxy_count, unsigned int *offset) {
 	unsigned int i = 0, k = 0;
@@ -522,10 +539,10 @@ static proxy_data *select_proxy(select_type how, proxy_data * pd, unsigned int p
 		return NULL;
 	switch (how) {
 		case RANDOMLY:
-			srand((unsigned int)time(NULL));
+
 			do {
 				k++;
-				i = 0 + (unsigned int) (proxy_count * 1.0 * rand() / (RAND_MAX + 1.0));
+				i = 0 + get_rand_int(proxy_count);
 			} while(pd[i].ps != PLAY_STATE && k < proxy_count * 100);
 			break;
 		case FIFOLY:
@@ -722,6 +739,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 
 static const ip_type local_host = { {127, 0, 0, 1} };
 
+char hostname[256]; // default maximum length of hostname in linux
 struct hostent *proxy_gethostbyname(const char *name, struct gethostbyname_data* data) {
 	char buff[256];
 	uint32_t i, hash;
@@ -743,6 +761,12 @@ struct hostent *proxy_gethostbyname(const char *name, struct gethostbyname_data*
 		data->resolved_addr = inet_addr(buff);
 		if(data->resolved_addr == (in_addr_t) (-1))
 			data->resolved_addr = (in_addr_t) (local_host.as_int);
+
+		snprintf(hostname,sizeof hostname, "%s", name);
+	    data->hostent_space.h_name = hostname;
+	    data->hostent_space.h_length = sizeof (in_addr_t);
+	    data->hostent_space.h_addrtype = AF_INET;
+
 		return &data->hostent_space;
 	}
 
@@ -809,6 +833,8 @@ struct hostent *proxy_gethostbyname(const char *name, struct gethostbyname_data*
 
 	data->hostent_space.h_name = data->addr_name;
 	data->hostent_space.h_length = sizeof(in_addr_t);
+	data->hostent_space.h_addrtype = AF_INET;
+
 	return &data->hostent_space;
 
 	err_plus_unlock:

src/core.h

@@ -20,6 +20,7 @@
 #define __CORE_HEADER
 #define BUFF_SIZE 8*1024  // used to read responses from proxies.
 #define     MAX_LOCALNET 64
+#define     MAX_DNAT 64
 
 typedef union {
 	unsigned char octet[4];
@@ -66,6 +67,7 @@ typedef enum {
 
 typedef enum {
 	HTTP_TYPE,
+	RAW_TYPE,
 	SOCKS4_TYPE,
 	SOCKS5_TYPE
 } proxy_type;
@@ -93,6 +95,11 @@ typedef struct {
 	unsigned short port;
 } localaddr_arg;
 
+typedef struct {
+	struct in_addr orig_dst, new_dst;
+	unsigned short orig_port, new_port;
+} dnat_arg;
+
 typedef struct {
 	ip_type ip;
 	unsigned short port;

src/libproxychains.c

@@ -66,13 +66,17 @@ chain_type proxychains_ct;
 proxy_data proxychains_pd[MAX_CHAIN];
 
 size_t num_localnet_addr = 0;
+dnat_arg dnats[MAX_DNAT];
+size_t num_dnats = 0;
 
 #ifdef THREAD_SAFE
 pthread_once_t init_once = PTHREAD_ONCE_INIT;
 #endif
 static int init_l = 0;
 
+static void load_default_settings(chain_type *ct);
 static inline void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_type * ct);
+static void simple_socks5_env(proxy_data * pd, unsigned int *proxy_count, chain_type * ct);
 
 static void* load_sym(char* symname, void* proxyfunc) {
 
@@ -101,6 +105,9 @@ static void do_init(void) {
 	MUTEX_INIT(&internal_getsrvbyname_lock, NULL);
 #endif
 
+	/* check for simple SOCKS5 proxy setup */
+	simple_socks5_env(proxychains_pd, &proxychains_proxy_count, &proxychains_ct);
+
 	/* read the config file */
 	get_chain_data(proxychains_pd, &proxychains_proxy_count, &proxychains_ct);
 
@@ -162,6 +169,19 @@ open_config_file() {
 	return file;
 }
 
+/* default settings common to get_chain_data and simple_socks5_env */
+static void load_default_settings(chain_type *ct) {
+	char *env;
+
+	tcp_read_time_out = 4 * 1000;
+	tcp_connect_time_out = 10 * 1000;
+	*ct = DYNAMIC_TYPE;
+
+	env = getenv(PROXYCHAINS_QUIET_MODE_ENV_VAR);
+	if(env && *env == '1')
+		proxychains_quiet_mode = 1;
+}
+
 /* get configuration from config file */
 static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_type * ct) {
 	unsigned int count = 0;
@@ -170,22 +190,18 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 	char *env;
 	char local_in_addr_port[32];
 	char local_in_addr[32], local_in_port[32], local_netmask[32];
+	char dnat_orig_addr_port[32], dnat_new_addr_port[32];
+	char dnat_orig_addr[32], dnat_orig_port[32], dnat_new_addr[32], dnat_new_port[32];
 	FILE *file = NULL;
 
 	if(proxychains_got_chain_data)
 		return;
 
-	//Some defaults
-	tcp_read_time_out = 4 * 1000;
-	tcp_connect_time_out = 10 * 1000;
-	*ct = DYNAMIC_TYPE;
+	load_default_settings(ct);
+
 	env = get_config_path(getenv(PROXYCHAINS_CONF_FILE_ENV_VAR), buff, sizeof(buff));
 	file = fopen(env, "r");
 
-	env = getenv(PROXYCHAINS_QUIET_MODE_ENV_VAR);
-	if(env && *env == '1')
-		proxychains_quiet_mode = 1;
-
 	while(fgets(buff, sizeof(buff), file)) {
 		if(buff[0] != '\n' && buff[strspn(buff, " ")] != '#') {
 			/* proxylist has to come last */
@@ -205,6 +221,8 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 
 				if(!strcmp(type, "http")) {
 					pd[count].pt = HTTP_TYPE;
+				} else if(!strcmp(type, "raw")) {
+					pd[count].pt = RAW_TYPE;
 				} else if(!strcmp(type, "socks4")) {
 					pd[count].pt = SOCKS4_TYPE;
 				} else if(!strcmp(type, "socks5")) {
@@ -285,6 +303,55 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 					proxychains_quiet_mode = 1;
 				} else if(strstr(buff, "proxy_dns")) {
 					proxychains_resolver = 1;
+				} else if(strstr(buff, "dnat")) {
+					if(sscanf(buff, "%s %21[^ ] %21s\n", user, dnat_orig_addr_port, dnat_new_addr_port) < 3) {
+						fprintf(stderr, "dnat format error");
+						exit(1);
+					}
+					/* clean previously used buffer */
+					memset(dnat_orig_port, 0, sizeof(dnat_orig_port) / sizeof(dnat_orig_port[0]));
+					memset(dnat_new_port, 0, sizeof(dnat_new_port) / sizeof(dnat_new_port[0]));
+
+					(void)sscanf(dnat_orig_addr_port, "%15[^:]:%5s", dnat_orig_addr, dnat_orig_port);
+					(void)sscanf(dnat_new_addr_port, "%15[^:]:%5s", dnat_new_addr, dnat_new_port);
+
+					if(num_dnats < MAX_DNAT) {
+						int error;
+						error =
+						    inet_pton(AF_INET, dnat_orig_addr,
+							      &dnats[num_dnats].orig_dst);
+						if(error <= 0) {
+							fprintf(stderr, "dnat original destination address error\n");
+							exit(1);
+						}
+
+						error =
+						    inet_pton(AF_INET, dnat_new_addr,
+							      &dnats[num_dnats].new_dst);
+						if(error <= 0) {
+							fprintf(stderr, "dnat effective destination address error\n");
+							exit(1);
+						}
+
+						if(dnat_orig_port[0]) {
+							dnats[num_dnats].orig_port =
+							    (short) atoi(dnat_orig_port);
+						} else {
+							dnats[num_dnats].orig_port = 0;
+						}
+
+						if(dnat_new_port[0]) {
+							dnats[num_dnats].new_port =
+							    (short) atoi(dnat_new_port);
+						} else {
+							dnats[num_dnats].new_port = 0;
+						}
+
+						PDEBUG("added dnat: orig-dst=%s orig-port=%d new-dst=%s new-port=%d\n", dnat_orig_addr, dnats[num_dnats].orig_port, dnat_new_addr, dnats[num_dnats].new_port);
+						++num_dnats;
+					} else {
+						fprintf(stderr, "# of dnat exceed %d.\n", MAX_DNAT);
+					}
 				}
 			}
 		}
@@ -294,9 +361,43 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 	proxychains_got_chain_data = 1;
 }
 
+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_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));
+
+	pd[0].ps = PLAY_STATE;
+	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;
+
+	if(getenv(PROXYCHAINS_DNS_ENV_VAR))
+		proxychains_resolver = 1;
+
+	*proxy_count = 1;
+	proxychains_got_chain_data = 1;
+}
+
 /*******  HOOK FUNCTIONS  *******/
 
-int connect(int sock, const struct sockaddr *addr, unsigned int len) {
+int connect(int sock, const struct sockaddr *addr, socklen_t len) {
 	int socktype = 0, flags = 0, ret = 0;
 	socklen_t optlen = 0;
 	ip_type dest_ip;
@@ -304,6 +405,8 @@ int connect(int sock, const struct sockaddr *addr, unsigned int len) {
 	char str[256];
 #endif
 	struct in_addr *p_addr_in;
+	struct sockaddr_in new_addr;
+	dnat_arg *dnat = NULL;
 	unsigned short port;
 	size_t i;
 	int remote_dns_connect = 0;
@@ -327,6 +430,29 @@ int connect(int sock, const struct sockaddr *addr, unsigned int len) {
 	// check if connect called from proxydns
         remote_dns_connect = (ntohl(p_addr_in->s_addr) >> 24 == remote_dns_subnet);
 
+	// more specific first
+	for(i = 0; i < num_dnats && !remote_dns_connect && !dnat; i++)
+		if(dnats[i].orig_dst.s_addr == p_addr_in->s_addr)
+			if(dnats[i].orig_port && (dnats[i].orig_port == port))
+				dnat = &dnats[i];
+
+	for(i = 0; i < num_dnats && !remote_dns_connect && !dnat; i++)
+		if(dnats[i].orig_dst.s_addr == p_addr_in->s_addr)
+			if(!dnats[i].orig_port)
+				dnat = &dnats[i];
+
+	if (dnat) {
+		if (dnat->new_port)
+			new_addr.sin_port = htons(dnat->new_port);
+		else
+			new_addr.sin_port = htons(port);
+		new_addr.sin_addr = dnat->new_dst;
+
+		addr = (struct sockaddr *)&new_addr;
+		p_addr_in = &((struct sockaddr_in *) addr)->sin_addr;
+		port = ntohs(((struct sockaddr_in *) addr)->sin_port);
+	}
+
 	for(i = 0; i < num_localnet_addr && !remote_dns_connect; i++) {
 		if((localnet_addr[i].in_addr.s_addr & localnet_addr[i].netmask.s_addr)
 		   == (p_addr_in->s_addr & localnet_addr[i].netmask.s_addr)) {

src/main.c

@@ -28,7 +28,7 @@
 static int usage(char **argv) {
 	printf("\nUsage:\t%s -q -f config_file program_name [arguments]\n"
 	       "\t-q makes proxychains quiet - this overrides the config setting\n"
-	       "\t-t allows to manually specify a configfile to use\n"
+	       "\t-f allows to manually specify a configfile to use\n"
 	       "\tfor example : proxychains telnet somehost.com\n" "More help in README file\n\n", argv[0]);
 	return EXIT_FAILURE;
 }
@@ -37,7 +37,7 @@ static const char *dll_name = DLL_NAME;
 
 static char own_dir[256];
 static const char *dll_dirs[] = {
-	".",
+	//".",
 	own_dir,
 	LIB_DIR,
 	"/lib",
@@ -52,7 +52,8 @@ static void set_own_dir(const char *argv0) {
 	while(l && argv0[l - 1] != '/')
 		l--;
 	if(l == 0)
-		memcpy(own_dir, ".", 2);
+		//memcpy(own_dir, ".", 2);
+		memcpy(own_dir, "/dev/null/", 2);
 	else {
 		memcpy(own_dir, argv0, l - 1);
 		own_dir[l] = 0;

src/proxychains.conf

@@ -73,6 +73,24 @@ localnet 127.0.0.0/255.0.0.0
 ## Exclude connections to ANYwhere with port 80
 # localnet 0.0.0.0:80/0.0.0.0
 
+
+### Examples for dnat
+## Trying to proxy connections to destinations which are dnatted,
+## will result in proxying connections to the new given destinations.
+## Whenever I connect to 1.1.1.1 on port 1234 actually connect to 1.1.1.2 on port 443
+# dnat 1.1.1.1:1234  1.1.1.2:443
+
+## Whenever I connect to 1.1.1.1 on port 443 actually connect to 1.1.1.2 on port 443
+## (no need to write :443 again)
+# dnat 1.1.1.2:443  1.1.1.2
+
+## No matter what port I connect to on 1.1.1.1 port actually connect to 1.1.1.2 on port 443
+# dnat 1.1.1.1  1.1.1.2:443
+
+## Always, instead of connecting to 1.1.1.1, connect to 1.1.1.2
+# dnat 1.1.1.1  1.1.1.2
+
+
 # ProxyList format
 #       type  host  port [user pass]
 #       (values separated by 'tab' or 'blank')
@@ -86,12 +104,13 @@ localnet 127.0.0.0/255.0.0.0
 #	        http	192.168.39.93	8080	
 #		
 #
-#       proxy types: http, socks4, socks5
+#       proxy types: http, socks4, socks5, raw
+#        * raw: The traffic is simply forwarded to the proxy without modification.
 #        ( auth types supported: "basic"-http  "user/pass"-socks )
 #
 [ProxyList]
 # add proxy here ...
-# meanwile
+# meanwhile
 # defaults set to "tor"
 socks4 	127.0.0.1 9050
 

src/proxyresolv

@@ -2,8 +2,12 @@
 # This script is called by proxychains to resolve DNS names
 
 # DNS server used to resolve names
-DNS_SERVER=4.2.2.2
 
+if [ -z "$PROXY_DNS_SERVER" ] ; then
+    DNS_SERVER=208.67.222.222   # OpenDNS
+else
+    DNS_SERVER=$PROXY_DNS_SERVER
+fi
 
 if [ $# = 0 ] ; then
 	echo "	usage:"
@@ -11,6 +15,10 @@ if [ $# = 0 ] ; then
 	exit
 fi
 
+awk 'BEGIN{ARGC=0} {for(i=2;i<=NF;i++){if($i==ARGV[1] && $1!~":"){print $1;found=1}} } END{exit found?0:1}' "$1" </etc/hosts
+if [ "$?" -eq "0" ]; then
+        exit
+fi
 
 export LD_PRELOAD=libproxychains.so
-dig $1 @$DNS_SERVER +tcp | awk '/A.+[0-9]+\.[0-9]+\.[0-9]/{print $5;}'
+drill $1 @$DNS_SERVER -t | awk '/A.+[0-9]+\.[0-9]+\.[0-9]/{print $5;}'