Fix merge error.

Hi ! Nice job with localnet, just what I was needing, here is just a small fix. Hope this helps.

AUTHORS

@@ -1,16 +1,5 @@
-original code
 N3E7CR34TUR3.
-http://proxychains.sourceforge.net
-netcreature@users.sourceforge.net
 
-main.c, remote-dns, thread safety, bugfixes, build system, cleanups
-rofl0r.
-https://github.com/rofl0r/proxychains
+web site:	proxychains.sourceforge.net
+email:		netcreature@users.sourceforge.net
 
-localnet, bugfixes
-adam hamsik.
-https://github.com/haad/proxychains
-
-localnet-port, bugfixes
-jianing yang.
-https://github.com/jianingy/proxychains

INSTALL

@@ -0,0 +1,13 @@
+ProxyChains ver 3.1 Installation
+=======================
+
+If you have installed other ver of proxychains  "make uninstall" before installing this distribution
+
+unpack the .tar.gz , 'cd' to distribution directory and
+run following commands (as root)
+-------------------------------------
+./configure
+make
+make install
+-------------------------------------
+that's all

Makefile

@@ -15,9 +15,9 @@ bindir = $(exec_prefix)/bin
 
 SRCS = $(sort $(wildcard src/*.c))
 OBJS = $(SRCS:.c=.o)
-LOBJS = src/core.o src/common.o src/libproxychains.o
+LOBJS = src/core.o src/libproxychains.o
 
-CCFLAGS  = -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe -DTHREAD_SAFE -Werror 
+CCFLAGS  = -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe -DTHREAD_SAFE -Werror
 LDFLAGS = -shared -fPIC -ldl -lpthread
 INC     = 
 PIC     = -fPIC
@@ -38,20 +38,20 @@ PXCHAINS = proxychains4
 ALL_TOOLS = $(PXCHAINS)
 
 
-CFLAGS+=$(USER_CFLAGS) $(MAC_CFLAGS)
-CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DSYSCONFDIR=\"$(confdir)\" -DDLL_NAME=\"$(LDSO_PATHNAME)\"
+CCFLAGS+=$(USER_CFLAGS) $(MAC_CFLAGS)
+LDFLAGS+=$(USER_LDFLAGS) $(MAC_LDFLAGS)
+CXXFLAGS+=$(CCFLAGS) $(USER_CFLAGS) $(MAC_CFLAGS)
+CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DINSTALL_PREFIX=\"$(prefix)\" -DDLL_NAME=\"$(LDSO_PATHNAME)\"
 
 
 all: $(ALL_LIBS) $(ALL_TOOLS)
 
-install-config:
-	install -d $(DESTDIR)/$(confdir)
-	install $(INSTALL_FLAGS) 644 src/proxychains.conf $(DESTDIR)/$(confdir)/
-
-install: 
-	install -d $(DESTDIR)/$(bindir)/ $(DESTDIR)/$(libdir)/
+#install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(DESTDIR)$(LDSO_PATHNAME)
+install:
+	install -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(libdir) $(DESTDIR)/$(confdir) $(DESTDIR)/$(includedir)
 	install $(INSTALL_FLAGS) 755 $(ALL_TOOLS) $(DESTDIR)/$(bindir)/
 	install $(INSTALL_FLAGS) 644 $(ALL_LIBS) $(DESTDIR)/$(libdir)/
+	install $(INSTALL_FLAGS) 644 src/proxychains.conf $(DESTDIR)/$(confdir)
 
 clean:
 	rm -f $(ALL_LIBS)
@@ -65,7 +65,6 @@ $(LDSO_PATHNAME): $(LOBJS)
 	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
 
 $(ALL_TOOLS): $(OBJS)
-	$(CC) src/main.o src/common.o -o $(PXCHAINS)
-
+	$(CC) src/main.o -o $(PXCHAINS)
 
 .PHONY: all clean install

README

@@ -1,43 +1,23 @@
 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)
+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 is Unix version only.
 
-  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.
+How to mess with sources - How to Install : read INSTALL !!!!!!
 
-  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
+This program forces any tcp connection made by any given tcp client
+to follow through proxy (or proxy chain). It is a kind of proxifier.
+It acts like sockscap / permeo / eborder driver ( intercepts TCP calls )
+It is FREE.
 
 Changelog:
 ----------
@@ -94,21 +74,21 @@ proxychains looks for config file in following order:
 
 Usage Example:
 
-	$ proxychains telnet targethost.com
+	bash$ 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
+      	bash$ 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
+	bash$ proxyresolv targethost.com
 
 in this example it will resolve targethost.com through proxy(or chained proxies)
 specified by proxychains.conf

configure

@@ -2,18 +2,6 @@
 
 prefix=/usr/local
 
-usage() {
-	echo "supported arguments"
-	echo "--prefix=/path 		default: $prefix"
-	echo "--exec_prefix=/path	default: $prefix/bin"
-	echo "--bindir=/path		default: $prefix/bin"
-	echo "--libdir=/path		default: $prefix/lib"
-	echo "--includedir=/path	default: $prefix/include"
-	echo "--sysconfdir=/path	default: $prefix/etc"
-	echo "--help : show this text"
-	exit 1
-}
-
 spliteq() {
 	arg=$1
 	echo "${arg#*=}"
@@ -29,7 +17,6 @@ parsearg() {
 	--libdir=*) libdir=`spliteq $1`;;
 	--includedir=*) includedir=`spliteq $1`;;
 	--sysconfdir=*) sysconfdir=`spliteq $1`;;
-	--help) usage;;
 	esac
 }
 
@@ -79,7 +66,8 @@ 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>>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=-Wl,-install_name,>>config.mak
 	echo INSTALL_FLAGS=-m>>config.mak
 fi

proxychains.lsm

@@ -0,0 +1,14 @@
+Begin3
+Title:          ProxyChains 
+Version:        3.0
+Entered-date:   
+Description:    
+Keywords:        
+Author:          <N37CR347UR3>
+Maintained-by:   <NetCreature>
+Primary-site:   	        
+Home-page:      http://proxychains.sourceforge.net
+Original-site:  
+Platforms:       Linux and other Unices
+Copying-policy: GNU Public License
+End

src/common.c

@@ -1,54 +0,0 @@
-#include "common.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-
-static int check_path(char *path) {
-	if(!path)
-		return 0;
-	return access(path, R_OK) != -1;
-}
-
-char *get_config_path(char* default_path, char* pbuf, size_t bufsize) {
-	char buf[512];
-	// top priority: user defined path
-	char *path = default_path;
-	if(check_path(path))
-		goto have;
-	
-	// priority 1: env var PROXYCHAINS_CONF_FILE
-	path = getenv(PROXYCHAINS_CONF_FILE_ENV_VAR);
-	if(check_path(path))
-		goto have;
-
-	// priority 2; proxychains conf in actual dir
-	path = getcwd(buf, sizeof(buf));
-	snprintf(pbuf, bufsize, "%s/%s", path, PROXYCHAINS_CONF_FILE);
-	path = pbuf;
-	if(check_path(path))
-		goto have;
-
-	// priority 3; $HOME/.proxychains/proxychains.conf
-	path = getenv("HOME");
-	snprintf(pbuf, bufsize, "%s/.proxychains/%s", path, PROXYCHAINS_CONF_FILE);
-	path = pbuf;
-	if(check_path(path))
-		goto have;
-
-	// priority 4: $SYSCONFDIR/proxychains.conf
-	path = SYSCONFDIR "/" PROXYCHAINS_CONF_FILE;
-	if(check_path(path))
-		goto have;
-
-	// priority 5: /etc/proxychains.conf
-	path = "/etc/" PROXYCHAINS_CONF_FILE;
-	if(check_path(path))
-		goto have;
-	
-	perror("couldnt find configuration file");
-	exit(1);
-	
-	return NULL;
-	have:
-	return path;
-}

src/common.h

@@ -2,7 +2,3 @@
 #define PROXYCHAINS_QUIET_MODE_ENV_VAR "PROXYCHAINS_QUIET_MODE"
 #define PROXYCHAINS_CONF_FILE "proxychains.conf"
 #define LOG_PREFIX "[proxychains] "
-
-#include <stddef.h>
-
-char *get_config_path(char* default_path, char* pbuf, size_t bufsize);

src/core.c

@@ -33,11 +33,6 @@
 #include <time.h>
 #include <sys/time.h>
 #include <stdarg.h>
-#include <assert.h>
-#ifdef THREAD_SAFE
-#include <pthread.h>
-pthread_mutex_t internal_ips_lock;
-#endif
 
 #include "core.h"
 #include "common.h"
@@ -152,16 +147,21 @@ static void encode_base_64(char *src, char *dest, int max_len) {
 	*dest++ = 0;
 }
 
-void proxychains_write_log(char *str, ...) {
-	char buff[1024*20];
+#define LOG_BUFF 1024*20
+
+int proxychains_write_log(char *str, ...) {
+	char buff[LOG_BUFF];
 	va_list arglist;
+	FILE *log_file;
+	log_file = stderr;
 	if(!proxychains_quiet_mode) {
 		va_start(arglist, str);
-		vsnprintf(buff, sizeof(buff), str, arglist);
+		vsprintf(buff, str, arglist);
 		va_end(arglist);
-		fprintf(stderr, "%s", buff);
-		fflush(stderr);
+		fprintf(log_file, "%s", buff);
+		fflush(log_file);
 	}
+	return EXIT_SUCCESS;
 }
 
 static int write_n_bytes(int fd, char *buff, size_t size) {
@@ -202,15 +202,26 @@ static int timed_connect(int sock, const struct sockaddr *addr, socklen_t len) {
 	pfd[0].events = POLLOUT;
 	fcntl(sock, F_SETFL, O_NONBLOCK);
 	ret = true_connect(sock, addr, len);
-	PDEBUG("\nconnect ret=%d\n", ret);
-	
+#ifdef DEBUG
+	if(ret == -1)
+		perror("true_connect");
+	printf("\nconnect ret=%d\n", ret);
+
+	fflush(stdout);
+#endif
 	if(ret == -1 && errno == EINPROGRESS) {
 		ret = poll_retry(pfd, 1, tcp_connect_time_out);
-		PDEBUG("\npoll ret=%d\n", ret);
+#ifdef DEBUG
+		printf("\npoll ret=%d\n", ret);
+		fflush(stdout);
+#endif
 		if(ret == 1) {
 			value_len = sizeof(socklen_t);
 			getsockopt(sock, SOL_SOCKET, SO_ERROR, &value, &value_len);
-			PDEBUG("\nvalue=%d\n", value);
+#ifdef DEBUG
+			printf("\nvalue=%d\n", value);
+			fflush(stdout);
+#endif
 			if(!value)
 				ret = 0;
 			else
@@ -219,10 +230,6 @@ static int timed_connect(int sock, const struct sockaddr *addr, socklen_t len) {
 			ret = -1;
 		}
 	} else {
-#ifdef DEBUG
-		if(ret == -1)
-			perror("true_connect");
-#endif
 		if(ret != 0)
 			ret = -1;
 	}
@@ -253,8 +260,6 @@ static int tunnel_to(int sock, ip_type ip, unsigned short port, proxy_type pt, c
 		if(!dns_len)
 			goto err;
 	}
-	
-	PDEBUG("host dns %s\n", dns_name ? dns_name : "<NULL>");
 
 	size_t ulen = strlen(user);
 	size_t passlen = strlen(pass);
@@ -592,7 +597,7 @@ static int chain_step(int ns, proxy_data * pfrom, proxy_data * pto) {
 			break;
 		case SOCKET_ERROR:
 			pto->ps = DOWN_STATE;
-			proxychains_write_log("<--socket error or timeout!\n");
+			proxychains_write_log("<--timeout\n");
 			close(ns);
 			break;
 	}
@@ -714,9 +719,14 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 	return -1;
 }
 
+// TODO: all those buffers aren't threadsafe, but since no memory allocation happens there shouldnt be any segfaults
+static struct hostent hostent_space;
+static in_addr_t resolved_addr;
+static char *resolved_addr_p[2];
+static char addr_name[1024 * 8];
 static const ip_type local_host = { {127, 0, 0, 1} };
 
-struct hostent *proxy_gethostbyname(const char *name, struct gethostbyname_data* data) {
+struct hostent *proxy_gethostbyname(const char *name) {
 	char buff[256];
 	uint32_t i, hash;
 	// yep, new_mem never gets freed. once you passed a fake ip to the client, you can't "retreat" it
@@ -724,20 +734,18 @@ struct hostent *proxy_gethostbyname(const char *name, struct gethostbyname_data*
 	size_t l;
 	struct hostent *hp;
 
-	data->resolved_addr_p[0] = (char *) &data->resolved_addr;
-	data->resolved_addr_p[1] = NULL;
-
-	data->hostent_space.h_addr_list = data->resolved_addr_p;
-
-	data->resolved_addr = 0;
+	resolved_addr_p[0] = (char *) &resolved_addr;
+	resolved_addr_p[1] = NULL;
+	hostent_space.h_addr_list = resolved_addr_p;
+	resolved_addr = 0;
 
 	gethostname(buff, sizeof(buff));
 
 	if(!strcmp(buff, name)) {
-		data->resolved_addr = inet_addr(buff);
-		if(data->resolved_addr == (in_addr_t) (-1))
-			data->resolved_addr = (in_addr_t) (local_host.as_int);
-		return &data->hostent_space;
+		resolved_addr = inet_addr(buff);
+		if(resolved_addr == (in_addr_t) (-1))
+			resolved_addr = (in_addr_t) (local_host.as_int);
+		return &hostent_space;
 	}
 
 	memset(buff, 0, sizeof(buff));
@@ -754,7 +762,7 @@ struct hostent *proxy_gethostbyname(const char *name, struct gethostbyname_data*
 	if(internal_ips.counter) {
 		for(i = 0; i < internal_ips.counter; i++) {
 			if(internal_ips.list[i]->hash == hash && !strcmp(name, internal_ips.list[i]->string)) {
-				data->resolved_addr = make_internal_ip(i);
+				resolved_addr = make_internal_ip(i);
 				PDEBUG("got cached ip for %s\n", name);
 				goto have_ip;
 			}
@@ -775,8 +783,8 @@ struct hostent *proxy_gethostbyname(const char *name, struct gethostbyname_data*
 		}
 	}
 
-	data->resolved_addr = make_internal_ip(internal_ips.counter);
-	if(data->resolved_addr == (in_addr_t) - 1)
+	resolved_addr = make_internal_ip(internal_ips.counter);
+	if(resolved_addr == (in_addr_t) - 1)
 		goto err_plus_unlock;
 
 	l = strlen(name);
@@ -799,77 +807,73 @@ struct hostent *proxy_gethostbyname(const char *name, struct gethostbyname_data*
 
 	MUTEX_UNLOCK(&internal_ips_lock);
 
-	strncpy(data->addr_name, name, sizeof(data->addr_name));
+	strncpy(addr_name, name, sizeof(addr_name));
 
-	data->hostent_space.h_name = data->addr_name;
-	data->hostent_space.h_length = sizeof(in_addr_t);
-	return &data->hostent_space;
+	hostent_space.h_name = addr_name;
+	hostent_space.h_length = sizeof(in_addr_t);
+	return &hostent_space;
 
 	err_plus_unlock:
 	MUTEX_UNLOCK(&internal_ips_lock);
 	return NULL;
 }
-
-struct addrinfo_data {
-	struct addrinfo addrinfo_space;
-	struct sockaddr sockaddr_space;
-	char addr_name[256];
-};
-
-void proxy_freeaddrinfo(struct addrinfo *res) {
-	free(res);
-}
-
-
 int proxy_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res) {
-	struct gethostbyname_data ghdata;
-	struct addrinfo_data *space;
 	struct servent *se = NULL;
 	struct hostent *hp = NULL;
-	struct servent se_buf;
-	struct addrinfo *p;
-	char buf[1024];
-	int port;
+
+	struct sockaddr *sockaddr_space = NULL;
+	struct addrinfo *addrinfo_space = NULL;
 
 //      printf("proxy_getaddrinfo node %s service %s\n",node,service);
-	space = calloc(1, sizeof(struct addrinfo_data));
-	if(!space) goto err1;
-	
-	if(node && !inet_aton(node, &((struct sockaddr_in *) &space->sockaddr_space)->sin_addr)) {
-		hp = proxy_gethostbyname(node, &ghdata);
+	addrinfo_space = malloc(sizeof(struct addrinfo));
+	if(!addrinfo_space)
+		goto err1;
+	sockaddr_space = malloc(sizeof(struct sockaddr));
+	if(!sockaddr_space)
+		goto err2;
+	memset(sockaddr_space, 0, sizeof(*sockaddr_space));
+	memset(addrinfo_space, 0, sizeof(*addrinfo_space));
+	if(node && !inet_aton(node, &((struct sockaddr_in *) sockaddr_space)->sin_addr)) {
+		hp = proxy_gethostbyname(node);
+
 		if(hp)
-			memcpy(&((struct sockaddr_in *) &space->sockaddr_space)->sin_addr,
+			memcpy(&((struct sockaddr_in *) sockaddr_space)->sin_addr,
 			       *(hp->h_addr_list), sizeof(in_addr_t));
 		else
-			goto err2;
+			goto err3;
 	}
-	if(service) getservbyname_r(service, NULL, &se_buf, buf, sizeof(buf), &se);
+	if(service)
+		se = getservbyname(service, NULL);
 
-	port = se ? se->s_port : htons(atoi(service ? service : "0"));
-	((struct sockaddr_in *) &space->sockaddr_space)->sin_port = port;
+	if(!se) {
+		((struct sockaddr_in *) sockaddr_space)->sin_port = htons(atoi(service ? : "0"));
+	} else
+		((struct sockaddr_in *) sockaddr_space)->sin_port = se->s_port;
 
-	*res = p = &space->addrinfo_space;
-	assert((size_t)p == (size_t) space);
-	
-	p->ai_addr = &space->sockaddr_space;
+	*res = addrinfo_space;
+	(*res)->ai_addr = sockaddr_space;
 	if(node)
-		strncpy(space->addr_name, node, sizeof(space->addr_name));
-	p->ai_canonname = space->addr_name;
-	p->ai_next = NULL;
-	p->ai_family = space->sockaddr_space.sa_family = AF_INET;
-	p->ai_addrlen = sizeof(space->sockaddr_space);
+		strcpy(addr_name, node);
+	(*res)->ai_canonname = addr_name;
+	(*res)->ai_next = NULL;
+	(*res)->ai_family = sockaddr_space->sa_family = AF_INET;
+	(*res)->ai_addrlen = sizeof(*sockaddr_space);
 
-	if(hints) {
-		p->ai_socktype = hints->ai_socktype;
-		p->ai_flags = hints->ai_flags;
-		p->ai_protocol = hints->ai_protocol;
+	if (hints != NULL) {
+		(*res)->ai_socktype = hints->ai_socktype;
+		(*res)->ai_flags = hints->ai_flags;
+		(*res)->ai_protocol = hints->ai_protocol;
 	} else {
-		p->ai_flags = (AI_V4MAPPED | AI_ADDRCONFIG);
+		(*res)->ai_socktype = 0;
+		(*res)->ai_flags = 0;
+		(*res)->ai_protocol = 0;
 	}
-	
+
 	goto out;
+	err3:
+	free(sockaddr_space);
 	err2:
-	free(space);
+	free(addrinfo_space);
 	err1:
 	return 1;
 	out:

src/core.h

@@ -4,8 +4,10 @@
     begin                : Tue May 14 2002
     copyright          :  netcreature (C) 2002
     email                 : netcreature@users.sourceforge.net
- ***************************************************************************
- ***************************************************************************
+ ***************************************************************************/
+#include <stdint.h>
+ /*     GPL */
+/***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -13,9 +15,6 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
-#include <stdint.h>
-
 #ifndef __CORE_HEADER
 #define __CORE_HEADER
 #define BUFF_SIZE 8*1024  // used to read responses from proxies.
@@ -103,42 +102,40 @@ int connect_proxy_chain (int sock, ip_type target_ip, unsigned short target_port
 			 proxy_data * pd, unsigned int proxy_count, chain_type ct,
 			 unsigned int max_chain );
 
-void proxychains_write_log(char *str, ...);
+int proxychains_write_log(char *str,...);
 
 typedef int (*connect_t)(int, const struct sockaddr *, socklen_t);
+connect_t true_connect;
+
 typedef struct hostent* (*gethostbyname_t)(const char *);
+gethostbyname_t true_gethostbyname;
+
+typedef int (*getaddrinfo_t)(const char *, const char *,
+		const struct addrinfo *,
+		struct addrinfo **);
+getaddrinfo_t true_getaddrinfo;
+
 typedef int (*freeaddrinfo_t)(struct addrinfo *);
+freeaddrinfo_t true_freeaddrinfo;
+
+typedef int (*getnameinfo_t) (const struct sockaddr *,
+		socklen_t, char *,
+		socklen_t, char *,
+		socklen_t, int);
+getnameinfo_t true_getnameinfo;
+
 typedef struct hostent *(*gethostbyaddr_t) (const void *, socklen_t, int);
+gethostbyaddr_t true_gethostbyaddr;
 
-typedef int (*getaddrinfo_t)(const char *, const char *, const struct addrinfo *, 
-			     struct addrinfo **);
+struct hostent* proxy_gethostbyname(const char *name);
 
-typedef int (*getnameinfo_t) (const struct sockaddr *, socklen_t, char *, 
-			      socklen_t, char *, socklen_t, int);
+int proxy_getaddrinfo(const char *node, const char *service,
+		                const struct addrinfo *hints,
+				                struct addrinfo **res);
 
 
-extern connect_t true_connect;
-extern gethostbyname_t true_gethostbyname;
-extern getaddrinfo_t true_getaddrinfo;
-extern freeaddrinfo_t true_freeaddrinfo;
-extern getnameinfo_t true_getnameinfo;
-extern gethostbyaddr_t true_gethostbyaddr;
-
-struct gethostbyname_data {
-	struct hostent hostent_space;
-	in_addr_t resolved_addr;
-	char *resolved_addr_p[2];
-	char addr_name[1024 * 8];
-};
-
-struct hostent* proxy_gethostbyname(const char *name, struct gethostbyname_data *data);
-
-int proxy_getaddrinfo(const char *node, const char *service, 
-		      const struct addrinfo *hints, struct addrinfo **res);
-void proxy_freeaddrinfo(struct addrinfo *res);
-
 #ifdef DEBUG
-# define PDEBUG(fmt, args...) do { fprintf(stderr,"DEBUG:"fmt, ## args); fflush(stderr); } while(0)
+# define PDEBUG(fmt, args...) fprintf(stderr,"DEBUG:"fmt, ## args)
 #else
 # define PDEBUG(fmt, args...) do {} while (0)
 #endif

src/libproxychains.c

@@ -43,18 +43,16 @@
 #define     SOCKFAMILY(x)     (satosin(x)->sin_family)
 #define     MAX_CHAIN 512
 
-connect_t true_connect;
-gethostbyname_t true_gethostbyname;
-getaddrinfo_t true_getaddrinfo;
-freeaddrinfo_t true_freeaddrinfo;
-getnameinfo_t true_getnameinfo;
-gethostbyaddr_t true_gethostbyaddr;
-
 int tcp_read_time_out;
 int tcp_connect_time_out;
 int proxychains_got_chain_data = 0;
 int proxychains_quiet_mode = 0;
 int proxychains_resolver = 0;
+
+unsigned int proxychains_proxy_count = 0;
+unsigned int proxychains_max_chain = 1;
+unsigned int remote_dns_subnet = 224;
+
 localaddr_arg localnet_addr[MAX_LOCALNET];
 chain_type proxychains_ct;
 proxy_data proxychains_pd[MAX_CHAIN];
@@ -68,41 +66,49 @@ static int init_l = 0;
 
 static inline void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_type * ct);
 
-static void* load_sym(char* symname, void* proxyfunc) {
+static void load_sym(void** funcptr, char* symname, void* proxyfunc) {
 
-	void *funcptr = dlsym(RTLD_NEXT, symname);
-	
-	if(!funcptr) {
+	*funcptr = dlsym(RTLD_NEXT, symname);
+
+	if(!(*funcptr)) {
 		fprintf(stderr, "Cannot load symbol '%s' %s\n", symname, dlerror());
 		exit(1);
 	} else {
-		PDEBUG("loaded symbol '%s'" " real addr %p  wrapped addr %p\n", symname, funcptr, proxyfunc);
+		PDEBUG("loaded symbol '%s'" " real addr %p  wrapped addr %p\n", symname, (*funcptr), proxyfunc);
 	}
-	if(funcptr == proxyfunc) {
+	if((*funcptr) == proxyfunc) {
 		PDEBUG("circular reference detected, aborting!\n");
 		abort();
 	}
-	return funcptr;
 }
 
 #define INIT() init_lib_wrapper(__FUNCTION__)
 
-#define SETUP_SYM(X) do { true_ ## X = load_sym( # X, X ); } while(0)
-
 static void do_init(void) {
+	static const struct override_info {
+		void* funcptr;
+		char* symname;
+		void* proxyfunc;
+	} override_symbols[] = {
+		#define SYM_ENTRY(X) { .funcptr = &true_ ## X,  .symname = # X, .proxyfunc = X,}
+		SYM_ENTRY(connect),
+		SYM_ENTRY(gethostbyname),
+		SYM_ENTRY(getaddrinfo),
+		SYM_ENTRY(freeaddrinfo),
+		SYM_ENTRY(gethostbyaddr),
+		SYM_ENTRY(getnameinfo),
+		#undef SYM_ENTRY
+	};
+	unsigned i;
 	MUTEX_INIT(&internal_ips_lock, NULL);
 	/* read the config file */
 	get_chain_data(proxychains_pd, &proxychains_proxy_count, &proxychains_ct);
 
 	proxychains_write_log(LOG_PREFIX "DLL init\n");
-	
-	SETUP_SYM(connect);
-	SETUP_SYM(gethostbyname);
-	SETUP_SYM(getaddrinfo);
-	SETUP_SYM(freeaddrinfo);
-	SETUP_SYM(gethostbyaddr);
-	SETUP_SYM(getnameinfo);
-	
+
+	for (i = 0; i < (sizeof(override_symbols) / sizeof(override_symbols[0])); i++) {
+		load_sym(override_symbols[i].funcptr, override_symbols[i].symname, override_symbols[i].proxyfunc);
+	}
 	init_l = 1;
 }
 
@@ -120,10 +126,10 @@ static void init_lib_wrapper(const char* caller) {
 #endif
 }
 
-/* if we use gcc >= 3, we can instruct the dynamic loader 
+/* if we use gcc >= 3, we can instruct the dynamic loader
  * to call init_lib at link time. otherwise it gets loaded
  * lazily, which has the disadvantage that there's a potential
- * race condition if 2 threads call it before init_l is set 
+ * race condition if 2 threads call it before init_l is set
  * and PTHREAD support was disabled */
 #if __GNUC__ > 2
 __attribute__((constructor))
@@ -139,7 +145,7 @@ 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];
-	FILE *file = NULL;
+	FILE *file;
 
 	if(proxychains_got_chain_data)
 		return;
@@ -148,9 +154,22 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 	tcp_read_time_out = 4 * 1000;
 	tcp_connect_time_out = 10 * 1000;
 	*ct = DYNAMIC_TYPE;
-	
-	env = get_config_path(getenv(PROXYCHAINS_CONF_FILE_ENV_VAR), buff, sizeof(buff));
-	file = fopen(env, "r");
+
+	/*
+	 * Get path to configuration file from env this file has priority
+	 * if it's defined.
+	 */
+	env = getenv(PROXYCHAINS_CONF_FILE_ENV_VAR);
+
+	snprintf(buff, 256, "%s/.proxychains/proxychains.conf", getenv("HOME"));
+
+	if(!env || (!(file = fopen(env, "r"))))
+		if(!(file = fopen("./proxychains.conf", "r")))
+			if(!(file = fopen(buff, "r")))
+				if(!(file = fopen("/etc/proxychains.conf", "r"))) {
+					perror("Can't locate proxychains.conf");
+					exit(1);
+				}
 
 	env = getenv(PROXYCHAINS_QUIET_MODE_ENV_VAR);
 	if(env && *env == '1')
@@ -162,7 +181,7 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 			if(list) {
 				if(count >= MAX_CHAIN)
 					break;
-				
+
 				memset(&pd[count], 0, sizeof(proxy_data));
 
 				pd[count].ps = PLAY_STATE;
@@ -277,6 +296,7 @@ int connect(int sock, const struct sockaddr *addr, unsigned int len) {
 	unsigned short port;
 	size_t i;
 	int remote_dns_connect = 0;
+
 	INIT();
 	optlen = sizeof(socktype);
 	getsockopt(sock, SOL_SOCKET, SO_TYPE, &socktype, &optlen);
@@ -323,14 +343,13 @@ int connect(int sock, const struct sockaddr *addr, unsigned int len) {
 	return ret;
 }
 
-static struct gethostbyname_data ghbndata;
 struct hostent *gethostbyname(const char *name) {
 	INIT();
 
 	PDEBUG("gethostbyname: %s\n", name);
 
 	if(proxychains_resolver)
-		return proxy_gethostbyname(name, &ghbndata);
+		return proxy_gethostbyname(name);
 	else
 		return true_gethostbyname(name);
 
@@ -359,8 +378,12 @@ void freeaddrinfo(struct addrinfo *res) {
 
 	if(!proxychains_resolver)
 		true_freeaddrinfo(res);
-	else
-		proxy_freeaddrinfo(res);
+	else {
+		if (res != NULL) {
+			free(res->ai_addr);
+			free(res);
+		}
+	}
 	return;
 }
 
@@ -378,7 +401,7 @@ int getnameinfo(const struct sockaddr *sa,
 	int ret = 0;
 
 	INIT();
-	
+
 	PDEBUG("getnameinfo: %s %s\n", host, serv);
 
 	if(!proxychains_resolver) {

src/main.c

@@ -1,4 +1,12 @@
-/*   (C) 2011, 2012 rofl0r
+/***************************************************************************
+                          main.c  -  description
+
+    begin                : Tue May 14 2002
+    copyright            :  netcreature (C) 2002
+    email                : netcreature@users.sourceforge.net
+ ***************************************************************************/
+ /*     GPL */
+/***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -6,7 +14,6 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
 #undef _POSIX_C_SOURCE
 #define _POSIX_C_SOURCE 200809L
 #undef _XOPEN_SOURCE
@@ -33,6 +40,12 @@ static int usage(char **argv) {
 	return EXIT_FAILURE;
 }
 
+int check_path(char *path) {
+	if(!path)
+		return 0;
+	return access(path, R_OK) != -1;
+}
+
 static const char *dll_name = DLL_NAME;
 
 static char own_dir[256];
@@ -93,8 +106,46 @@ int main(int argc, char *argv[]) {
 		return usage(argv);
 
 	/* check if path of config file has not been passed via command line */
-	path = get_config_path(path, pbuf, sizeof(pbuf));
-	
+	if(!path) {
+		// priority 1: env var PROXYCHAINS_CONF_FILE
+		path = getenv(PROXYCHAINS_CONF_FILE_ENV_VAR);
+
+		if(check_path(path))
+			goto have;
+
+		// priority 2; proxychains conf in actual dir
+		path = getcwd(buf, sizeof(buf));
+		snprintf(pbuf, sizeof(pbuf), "%s/%s", path, PROXYCHAINS_CONF_FILE);
+		path = pbuf;
+
+		if(check_path(path))
+			goto have;
+
+		// priority 3; $HOME/.proxychains/proxychains.conf
+		path = getenv("HOME");
+		snprintf(pbuf, sizeof(pbuf), "%s/.proxychains/%s", path, PROXYCHAINS_CONF_FILE);
+		path = pbuf;
+		if(check_path(path))
+			goto have;
+
+		/* Check for default config file in two locations {install_prefix}/etc /etc */
+		// priority 4: $INSTALL_PREFIX/etc/proxychains.conf
+		snprintf(pbuf, sizeof(pbuf), "%s/etc/%s", INSTALL_PREFIX, PROXYCHAINS_CONF_FILE);
+		path = pbuf;
+		if(check_path(path))
+			goto have;
+
+		// priority 5: /etc/proxychains.conf
+		snprintf(pbuf, sizeof(pbuf), "/etc/%s", PROXYCHAINS_CONF_FILE);
+		path = pbuf;
+		if(check_path(path))
+			goto have;
+		perror("Couldn't find configuration file");
+		return 1;
+	}
+
+	have:
+
 	if(!quiet)
 		fprintf(stderr, LOG_PREFIX "config file found: %s\n", path);
 
@@ -125,12 +176,12 @@ int main(int argc, char *argv[]) {
 		fprintf(stderr, LOG_PREFIX "preloading %s/%s\n", prefix, dll_name);
 
 #ifndef IS_MAC
-	snprintf(buf, sizeof(buf), "LD_PRELOAD=%s/%s", prefix, dll_name);
-	putenv(buf);
+	snprintf(buf, sizeof(buf), "%s/%s", prefix, dll_name);
+	setenv("LD_PRELOAD", buf, 1);
 #else
-	snprintf(buf, sizeof(buf), "DYLD_INSERT_LIBRARIES=%s/%s", prefix, dll_name);
-	putenv(buf);
-	putenv("DYLD_FORCE_FLAT_NAMESPACE=1");
+	snprintf(buf, sizeof(buf), "%s/%s", prefix, dll_name);
+	setenv("DYLD_INSERT_LIBRARIES", buf, 1);
+	setenv("DYLD_FORCE_FLAT_NAMESPACE", "1", 1);
 #endif
 	execvp(argv[start_argv], &argv[start_argv]);
 	perror("proxychains can't load process....");

src/proxychains

@@ -1,26 +1,106 @@
 #!/bin/sh
-echo "ProxyChains-3.1 (http://proxychains.sf.net)"
+echo "ProxyChains-4.0 (https://github.com/haad/proxychains)"
 
 usage() {
 
 	echo "	usage:"
-	echo "		$0 [h] [f config-file] <prog> [args]"
+	echo "	$0 [hq] [-f config-file] <prog> [args]"
+	echo "		-q make proxychains quiet"
 	exit
 }
 
+find_proxy_conf() {
+
+	show_proxy_env
+	if [ -f "/usr/local/etc/proxychains.conf" ]; then
+		export PROXYCHAINS_CONF_FILE="/usr/local/etc/proxychains.conf"
+	else 
+		if [ -f "/etc/proxychains.conf" ];then
+			PROXYCHAINS_CONF_FILE="/etc/proxychains.conf"
+		fi
+	fi
+}
+
+#
+# XXX We should not overide possible user settings here. Just add libproxychains to it.
+# 
+setup_proxy_env() {
+
+	if [ -z "$PROXYCHAINS_CONF_FILE" ]; then
+		find_proxy_conf
+	fi
+
+	if [ $(uname -s) = "Darwin" ]; then
+		export DYLD_FORCE_FLAT_NAMESPACE=
+		export DYLD_INSERT_LIBRARIES=libproxychains4.dylib
+	else
+		export LD_PRELOAD=libproxychains.so.4
+	fi
+}
+
+disable_proxy_env() {
+
+	if [ $(uname -s) = "Darwin" ]; then
+		unset DYLD_FORCE_FLAT_NAMESPACE
+		export DYLD_INSERT_LIBRARIES=$(echo $DYLD_INSERT_LIBRARIES | sed -e 's/libproxychains4.dylib//g')
+		if [ -z $DYLD_INSERT_LIBRARIES ]; then
+			unset DYLD_INSERT_LIBRARIES
+		fi
+	else
+		export LD_PRELOAD=$(echo $DYLD_INSERT_LIBRARIES | sed -e 's/libproxychains.so.4//g')
+		if [ -z $LD_PRELOAD ]; then
+			unset LD_PRELOAD
+		fi
+	fi
+}
+
+show_proxy_env() {
+
+	echo "Proxified environment setup"
+	echo "PROXYCHAINS_CONF_FILE = $PROXYCHAINS_CONF_FILE"
+	
+	if [ $(uname -s) = "Darwin" ]; then
+		echo "DYLD_FORCE_FLAT_NAMESPACE = $DYLD_FORCE_FLAT_NAMESPACE"
+		echo "DYLD_INSERT_LIBRARIES = $DYLD_INSERT_LIBRARIES"
+	else
+		echo "LD_PRELOAD = $LD_PRELOAD"
+	fi
+}
+
 if [ $# = 0 ] ; then
 	usage
 fi
 
-if [ $1 = "-h" ]; then
-	usage
-fi
+case "$1" in
+	-h)
+		usage
+		;;
+	-f)
+		export PROXYCHAINS_CONF_FILE=$2;
+		shift;
+		shift;
+		;;
+	-q)
+		export PROXYCHAINS_QUIET_MODE=1;
+		shift;
+		;;
+	show)
+		show_proxy_env
+		return
+		;;
+esac
 
-if [ "$1" = "-f" ]; then
-	export PROXYCHAINS_CONF_FILE=$2;
-	shift;
-	shift;
-fi
-
-export LD_PRELOAD=libproxychains.so.3
-exec "$@"
+case "$1" in
+	on)
+		setup_proxy_env
+		show_proxy_env
+		;;
+	off)
+		disable_proxy_env
+		show_proxy_env
+		;;
+	*)
+		setup_proxy_env
+		exec "$@"
+		;;
+esac

src/proxychains.conf

@@ -1,4 +1,4 @@
-# proxychains.conf  VER 3.1
+# proxychains.conf  VER 4
 #
 #        HTTP, SOCKS4, SOCKS5 tunneling proxifier with DNS.
 #	
@@ -54,6 +54,15 @@ remote_dns_subnet 224
 tcp_read_time_out 15000
 tcp_connect_time_out 8000
 
+# By default enable localnet for loopback address ranges
+# RFC5735 Loopback address range
+localnet 127.0.0.0/255.0.0.0
+# RFC1918 Private Address Ranges
+# localnet 10.0.0.0/255.0.0.0
+# localnet 172.16.0.0/255.240.0.0
+# localnet 192.168.0.0/255.255.0.0
+
+
 # Example for localnet exclusion
 ## Exclude connections to 192.168.1.0/24 with port 80
 # localnet 192.168.1.0:80/255.255.255.0

tests/test_getaddrinfo.c

@@ -1,41 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
- 
-#ifndef   NI_MAXHOST
-#define   NI_MAXHOST 1025
-#endif
- 
-int main(void) {
-	struct addrinfo *result;
-	struct addrinfo *res;
-	int error;
-	
-	/* resolve the domain name into a list of addresses */
-	error = getaddrinfo("www.example.com", NULL, NULL, &result);
-	if (error != 0)
-	{   
-		fprintf(stderr, "error in getaddrinfo: %s\n", gai_strerror(error));
-		return EXIT_FAILURE;
-	}   
-	
-	/* loop over all returned results and do inverse lookup */
-	for (res = result; res != NULL; res = res->ai_next)
-	{   
-		char hostname[NI_MAXHOST] = "";
-	
-		error = getnameinfo(res->ai_addr, res->ai_addrlen, hostname, NI_MAXHOST, NULL, 0, 0); 
-		if (error != 0)
-		{
-		fprintf(stderr, "error in getnameinfo: %s\n", gai_strerror(error));
-		continue;
-		}
-		if (*hostname != '\0')
-		printf("hostname: %s\n", hostname);
-	}   
-	
-	freeaddrinfo(result);
-	return EXIT_SUCCESS;
-}