preliminary support for new DYLD hooking method for OSX Monterey

there's currently no build system support yet. after ./configure
was executed, add -DMONTEREY_HOOKING to CFLAGS/CPPFLAGS in config.mak
to activate this.

addressing #409

.gitignore

@@ -1,5 +1,4 @@
 proxychains4
-proxychains4-daemon
 *.bz2
 *.xz
 *.o

Makefile

@@ -11,8 +11,7 @@ bindir = $(exec_prefix)/bin
 prefix = /usr/local/
 includedir = $(prefix)/include
 libdir = $(prefix)/lib
-sysconfdir = $(prefix)/etc
+sysconfdir=$(prefix)/etc
-zshcompletiondir = $(prefix)/share/zsh/site-functions
 
 OBJS = src/common.o src/main.o
 
@@ -30,6 +29,7 @@ GENH = src/version.h
 
 CFLAGS  += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
 NO_AS_NEEDED = -Wl,--no-as-needed
+LIBDL   = -ldl
 LDFLAGS = -fPIC $(NO_AS_NEEDED) $(LIBDL) $(PTHREAD)
 INC     = 
 PIC     = -fPIC
@@ -49,7 +49,6 @@ PXCHAINS = proxychains4
 PXCHAINS_D = proxychains4-daemon
 ALL_TOOLS = $(PXCHAINS) $(PXCHAINS_D)
 ALL_CONFIGS = src/proxychains.conf
-ZSH_COMPLETION = completions/zsh/_proxychains4
 
 -include config.mak
 
@@ -70,13 +69,9 @@ $(DESTDIR)$(libdir)/%: %
 $(DESTDIR)$(sysconfdir)/%: src/%
 	$(INSTALL) -D -m 644 $< $@
 
-$(DESTDIR)$(zshcompletiondir)/%: completions/zsh/%
-	$(INSTALL) -D -m 644 $< $@
-
 install-libs: $(ALL_LIBS:%=$(DESTDIR)$(libdir)/%)
 install-tools: $(ALL_TOOLS:%=$(DESTDIR)$(bindir)/%)
 install-config: $(ALL_CONFIGS:src/%=$(DESTDIR)$(sysconfdir)/%)
-install-zsh-completion: $(ZSH_COMPLETION:completions/zsh/%=$(DESTDIR)$(zshcompletiondir)/%)
 
 clean:
 	rm -f $(ALL_LIBS)
@@ -93,14 +88,14 @@ src/version.o: src/version.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
 
 $(LDSO_PATHNAME): $(LOBJS)
-	$(CC) $(LDFLAGS) $(FAT_LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) \
+	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) $(USER_LDFLAGS) \
-		$(USER_LDFLAGS) -shared -o $@ $^ $(SOCKET_LIBS)
+		-shared -o $@ $^ $(SOCKET_LIBS)
 
 $(PXCHAINS): $(OBJS)
-	$(CC) $^ $(FAT_BIN_LDFLAGS) $(USER_LDFLAGS) $(LIBDL) -o $@
+	$(CC) $^ $(USER_LDFLAGS) $(LIBDL) -o $@
 
 $(PXCHAINS_D): $(DOBJS)
-	$(CC) $^ $(FAT_BIN_LDFLAGS) $(USER_LDFLAGS) -o $@
+	$(CC) $^ $(USER_LDFLAGS) -o $@
 
 
-.PHONY: all clean install install-config install-libs install-tools install-zsh-completion
+.PHONY: all clean install install-config install-libs install-tools

README

@@ -1,4 +1,4 @@
-ProxyChains-NG ver 4.17 README
+ProxyChains-NG ver 4.15 README
 =============================
 
   ProxyChains is a UNIX program, that hooks network-related libc functions
@@ -52,24 +52,6 @@ ProxyChains-NG ver 4.17 README
 
 Changelog:
 ----------
-Version 4.17
-- add hook for close_range function, fixing newer versions of openssh
-- fat-binary-m1 option for mac
-- fix DNS error handling in proxy_dns_old
-- simplify init code
-- fix openbsd preloading
-- fix double-close in multithreaded apps
-- various improvements to configure script
-
-Version 4.16
-- fix regression in configure script linker flag detection
-- remove 10 year old workaround for wrong glibc getnameinfo signature
-- support for new DYLD hooking method for OSX Monterey
-- netbsd compilation fix
-- support IPv6 localnets
-- more user-friendly error message when execvp fails
-- proxy_getaddrinfo(): fill in ai_socktype if requested
-
 Version 4.15
 - fix configure script for buggy binutils version
 - initialize rand_seed with nano-second granularity
@@ -263,15 +245,6 @@ Known Problems:
   there are unconfirmed reports that it works as root though.
   musl libc is unaffected from the bug.
 
-Useful links
-------------
-the following sites may prove useful to check for leaks:
-https://ipfighter.com/
-https://browserleaks.com/webrtc
-https://dnsleaktest.com
-http://check.torproject.org - tor specific
-http://ifconfig.me - can be used via curl
-http://ifconfig.io/
 
 Community:
 ----------

VERSION

@@ -1 +1 @@
-4.17
+4.15

completions/zsh/_proxychains4

@@ -1,8 +0,0 @@
-#compdef proxychains4
-
-_arguments \
-  '(- : *)--help[More help in README file]' \
-  '-q[makes proxychains quiet - this overrides the config setting]' \
-  '-f[allows one to manually specify a configfile to use]: :_files' \
-  '(-)1: :{_command_names -e}' \
-  '*:: :_normal'

configure

@@ -28,20 +28,10 @@ check_compile() {
 	return $res
 }
 
-get_define() {
-	$CC $OUR_CPPFLAGS $CPPFLAGS $CFLAGS -dM -E - </dev/null | grep "$1"
-}
-
-get_define_stripped() {
-	local output=$(get_define "$1")
-	test "$?" = 0 || return 1
-	printf "%s\n" "$output" | sed 's/^.* .* //'
-}
-
 check_define() {
 	printf "checking whether \$CC defines %s ... " "$1"
 	local res=1
-	get_define "$1" >/dev/null && res=0
+	$CC $OUR_CPPFLAGS $CPPFLAGS $CFLAGS -dM -E - </dev/null | grep "$1" >/dev/null && res=0
 	test x$res = x0 && printf "yes\n" || printf "no\n"
 	return $res
 }
@@ -84,12 +74,8 @@ usage() {
 	echo "--sysconfdir=/path        default: $prefix/etc"
 	echo "--ignore-cve              default: no"
 	echo "	if set to yes ignores CVE-2015-3887 and makes it possible"
-	echo "	to preload from current dir (possibly insecure, but handy)"
+	echo "	to preload from current dir (insecure)"
 	echo "--fat-binary : build for both i386 and x86_64 architectures on 64-bit Macs"
-	echo "--fat-binary-m1 : build for both arm64e and x86_64 architectures on M1 Macs"
-	echo "--fat-binary-m2 : build for arm64, arm64e and x86_64 architectures on M2+ Macs"
-	echo "--hookmethod=dlsym|dyld   hook method for osx. default: auto"
-	echo "  if OSX >= 12 is detected, dyld method will be used if auto."
 	echo "--help : show this text"
 	exit 1
 }
@@ -102,11 +88,7 @@ spliteq() {
 }
 
 fat_binary=
-fat_binary_m1=
-fat_binary_m2=
 ignore_cve=no
-hookmethod=auto
-
 parsearg() {
 	case "$1" in
 	--prefix=*) prefix=`spliteq $1`;;
@@ -117,10 +99,7 @@ parsearg() {
 	--sysconfdir=*) sysconfdir=`spliteq $1`;;
 	--ignore-cve) ignore_cve=1;;
 	--ignore-cve=*) ignore_cve=`spliteq $1`;;
-	--hookmethod=*) hookmethod=`spliteq $1`;;
 	--fat-binary) fat_binary=1;;
-	--fat-binary-m1) fat_binary_m1=1;;
-	--fat-binary-m2) fat_binary_m2=1;;
 	--help) usage;;
 	esac
 }
@@ -180,25 +159,6 @@ ishaiku() {
 }
 
 check_compile 'whether C compiler works' '' 'int main() {return 0;}' || fail 'error: install a C compiler and library'
-check_compile 'whether libc headers are complete' '' '#include <netdb.h>\nint main() {return 0;}' || fail 'error: necessary libc headers are not installed'
-check_compile 'whether C compiler understands -Wno-unknown-pragmas' '-Wno-unknown-pragmas' 'int main() {return 0;}'
-check_compile 'whether C compiler understands -Werror=implicit-function-declaration' '-Werror=implicit-function-declaration' 'int main() {return 0;}'
-
-if ! check_compile 'whether getnameinfo() servlen argument is POSIX compliant (socklen_t)' "-DGN_NODELEN_T=socklen_t -DGN_SERVLEN_T=socklen_t -DGN_FLAGS_T=int" \
-'#define _GNU_SOURCE\n#include <netdb.h>\nint getnameinfo(const struct sockaddr *, socklen_t, char *, socklen_t, char *, socklen_t, int);int main() {\nreturn 0;}' ; then
- # GLIBC < 2.14
- if ! check_compile 'whether getnameinfo() flags argument is unsigned' "-DGN_NODELEN_T=socklen_t -DGN_SERVLEN_T=socklen_t -DGN_FLAGS_T=unsigned" \
-  '#define _GNU_SOURCE\n#include <netdb.h>\nint getnameinfo(const struct sockaddr *, socklen_t, char *, socklen_t, char *, socklen_t, unsigned);int main() {\nreturn 0;}' ; then
-  if ! check_compile 'whether getnameinfo() servlen argument is size_t' "-DGN_NODELEN_T=socklen_t -DGN_SERVLEN_T=size_t -DGN_FLAGS_T=int" \
-   '#define _GNU_SOURCE\n#include <netdb.h>\nint getnameinfo(const struct sockaddr *, socklen_t, char *, socklen_t, char *, size_t, int);int main() {\nreturn 0;}' ; then
-   # OpenBSD & FreeBSD
-   if ! check_compile 'whether getnameinfo() servlen and nodelen argument is size_t' "-DGN_NODELEN_T=size_t -DGN_SERVLEN_T=size_t -DGN_FLAGS_T=int" \
-    '#define _GNU_SOURCE\n#include <netdb.h>\nint getnameinfo(const struct sockaddr *, socklen_t, char *, size_t, char *, size_t, int);int main() {\nreturn 0;}' ; then
-     fail "failed to detect getnameinfo signature"
-   fi
-  fi
- fi
-fi
 
 check_compile 'whether we have GNU-style getservbyname_r()' "-DHAVE_GNU_GETSERVBYNAME_R" \
 '#define _GNU_SOURCE\n#include <netdb.h>\nint main() {\nstruct servent *se = 0;struct servent se_buf;char buf[1024];\ngetservbyname_r("foo", (void*) 0, &se_buf, buf, sizeof(buf), &se);\nreturn 0;}'
@@ -215,13 +175,8 @@ check_compile 'whether we have clock_gettime' "-DHAVE_CLOCK_GETTIME" \
 check_define __APPLE__ && {
 	mac_detected=true
 	check_define __x86_64__ && mac_64=true
-	if test "$hookmethod" = auto ; then
-		osver=$(get_define_stripped __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 2>/dev/null)
-		test "$osver" -gt $((120000 - 1)) && hookmethod=dyld
-	fi
 }
 check_define __FreeBSD__ && bsd_detected=true
-check_define __NetBSD__ && bsd_detected=true
 check_define __OpenBSD__ && {
 bsd_detected=true
 echo "CFLAGS+=-DIS_OPENBSD">>config.mak
@@ -251,7 +206,7 @@ check_link "whether we can use -Wl,--no-as-needed" "-Wl,--no-as-needed" \
 LD_SONAME_FLAG=
 printf "checking what's the option to use in linker to set library name ... "
 for o in --soname -h -soname -install_name; do
-	check_link_silent "-shared -Wl,$o,libconftest.so" "void test_func(void) {}" && LD_SONAME_FLAG=$o && break
+	check_link_silent "-shared -Wl,$o,libconftest.so" "void test_func(int a) {}" && LD_SONAME_FLAG=$o && break
 done
 if [ -z "$LD_SONAME_FLAG" ]; then
 	printf '\ncannot find an option to set library name\n'
@@ -260,11 +215,6 @@ fi
 echo "$LD_SONAME_FLAG"
 echo "LD_SET_SONAME = -Wl,$LD_SONAME_FLAG," >> config.mak
 
-if check_link "checking whether we can use -ldl" "-ldl" \
-"int main(){return 0;}" ; then
-echo "LIBDL = -ldl" >> config.mak
-fi
-
 if check_link "checking whether we can use -lpthread" "-lpthread" \
 "int main(){return 0;}" ; then
 echo "PTHREAD = -lpthread" >> config.mak
@@ -278,27 +228,10 @@ make_cmd=make
 if ismac ; then
 	echo LDSO_SUFFIX=dylib>>config.mak
 	echo MAC_CFLAGS+=-DIS_MAC=1>>config.mak
-	if test "$hookmethod" = dyld ; then
-		echo "using Monterey style DYLD hooking"
-		echo "CFLAGS+=-DMONTEREY_HOOKING">>config.mak
-	fi
 	if ismac64 && [ "$fat_binary" = 1 ] ; then
 		echo "Configuring a fat binary for i386 and x86_64"
-		echo "MAC_CFLAGS+=-arch i386 -arch x86_64">>config.mak
+		echo MAC_CFLAGS+=-arch i386 -arch x86_64>>config.mak
-		echo "FAT_LDFLAGS=-arch i386 -arch x86_64">>config.mak
+		echo LDFLAGS+=-arch i386 -arch x86_64>>config.mak
-		echo "FAT_BIN_LDFLAGS=-arch i386 -arch x86_64">>config.mak
-	fi
-	if [ "$fat_binary_m1" = 1 ] ; then
-		echo "Configuring a fat binary for arm64[e] and x86_64"
-		echo "MAC_CFLAGS+=-arch arm64 -arch arm64e -arch x86_64">>config.mak
-		echo "FAT_LDFLAGS=-arch arm64 -arch arm64e -arch x86_64">>config.mak
-		echo "FAT_BIN_LDFLAGS=-arch arm64 -arch x86_64">>config.mak
-	fi
-	if [ "$fat_binary_m2" = 1 ] ; then
-		echo "Configuring a fat binary for arm64[e] and x86_64"
-		echo "MAC_CFLAGS+=-arch arm64 -arch arm64e -arch x86_64">>config.mak
-		echo "FAT_LDFLAGS=-arch arm64 -arch arm64e -arch x86_64">>config.mak
-		echo "FAT_BIN_LDFLAGS=-arch arm64 -arch arm64e -arch x86_64">>config.mak
 	fi
 elif isbsd ; then
 	echo LIBDL=>>config.mak
@@ -313,6 +246,3 @@ elif ishaiku ; then
 fi
 
 echo "Done, now run $make_cmd && $make_cmd install"
-if [ "$fat_binary_m2" = 1 ] ; then
-echo "Don't forget to run csrutil disable and sudo nvram boot-args=-arm64e_preview_abi"
-fi

src/core.c

@@ -462,10 +462,8 @@ static int start_chain(int *fd, proxy_data * pd, char *begin_mark) {
 	error1:
 	proxychains_write_log(TP " timeout\n");
 	error:
-	if(*fd != -1) {
+	if(*fd != -1)
 		close(*fd);
-		*fd = -1;
-	}
 	return SOCKET_ERROR;
 }
 
@@ -522,9 +520,9 @@ static unsigned int calc_alive(proxy_data * pd, unsigned int proxy_count) {
 }
 
 
-static int chain_step(int *ns, proxy_data * pfrom, proxy_data * pto) {
+static int chain_step(int ns, proxy_data * pfrom, proxy_data * pto) {
 	int retcode = -1;
-	char *hostname, *errmsg = 0;
+	char *hostname;
 	char hostname_buf[MSG_LEN_MAX];
 	char ip_buf[INET6_ADDRSTRLEN];
 	int v6 = pto->ip.is_v6;
@@ -538,34 +536,31 @@ static int chain_step(int *ns, proxy_data * pfrom, proxy_data * pto) {
 	usenumericip:
 		if(!inet_ntop(v6?AF_INET6:AF_INET,pto->ip.addr.v6,ip_buf,sizeof ip_buf)) {
 			pto->ps = DOWN_STATE;
-			errmsg = "<--ip conversion error!\n";
+			proxychains_write_log("<--ip conversion error!\n");
-			retcode = SOCKET_ERROR;
+			close(ns);
-			goto err;
+			return SOCKET_ERROR;
 		}
 		hostname = ip_buf;
 	}
 
 	proxychains_write_log(TP " %s:%d ", hostname, htons(pto->port));
-	retcode = tunnel_to(*ns, pto->ip, pto->port, pfrom->pt, pfrom->user, pfrom->pass);
+	retcode = tunnel_to(ns, pto->ip, pto->port, pfrom->pt, pfrom->user, pfrom->pass);
 	switch (retcode) {
 		case SUCCESS:
 			pto->ps = BUSY_STATE;
 			break;
 		case BLOCKED:
 			pto->ps = BLOCKED_STATE;
-			errmsg = "<--denied\n";
+			proxychains_write_log("<--denied\n");
-			goto err;
+			close(ns);
+			break;
 		case SOCKET_ERROR:
 			pto->ps = DOWN_STATE;
-			errmsg = "<--socket error or timeout!\n";
+			proxychains_write_log("<--socket error or timeout!\n");
-			goto err;
+			close(ns);
+			break;
 	}
 	return retcode;
-err:
-	if(errmsg) proxychains_write_log(errmsg);
-	if(*ns != -1) close(*ns);
-	*ns = -1;
-	return retcode;
 }
 
 int connect_proxy_chain(int sock, ip_type target_ip,
@@ -601,7 +596,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 				p2 = select_proxy(FIFOLY, pd, proxy_count, &offset);
 				if(!p2)
 					break;
-				if(SUCCESS != chain_step(&ns, p1, p2)) {
+				if(SUCCESS != chain_step(ns, p1, p2)) {
 					PDEBUG("GOTO AGAIN 1\n");
 					goto again;
 				}
@@ -610,7 +605,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 			//proxychains_write_log(TP);
 			p3->ip = target_ip;
 			p3->port = target_port;
-			if(SUCCESS != chain_step(&ns, p1, p3))
+			if(SUCCESS != chain_step(ns, p1, p3))
 				goto error;
 			break;
 
@@ -648,7 +643,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 					/* Try from the beginning to where we started */
 					offset = 0;
 					continue;
-				} else if(SUCCESS != chain_step(&ns, p1, p2)) {
+				} else if(SUCCESS != chain_step(ns, p1, p2)) {
 					PDEBUG("GOTO AGAIN 1\n");
 					goto again;
 				} else
@@ -660,7 +655,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 			p3->port = target_port;
 			proxychains_proxy_offset = offset+1;
 			PDEBUG("pd_offset = %d, curr_len = %d\n", proxychains_proxy_offset, curr_len);
-			if(SUCCESS != chain_step(&ns, p1, p3))
+			if(SUCCESS != chain_step(ns, p1, p3))
 				goto error;
 			break;
 
@@ -678,7 +673,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 			while(offset < proxy_count) {
 				if(!(p2 = select_proxy(FIFOLY, pd, proxy_count, &offset)))
 					break;
-				if(SUCCESS != chain_step(&ns, p1, p2)) {
+				if(SUCCESS != chain_step(ns, p1, p2)) {
 					PDEBUG("chain_step failed\n");
 					goto error_strict;
 				}
@@ -687,7 +682,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 			//proxychains_write_log(TP);
 			p3->ip = target_ip;
 			p3->port = target_port;
-			if(SUCCESS != chain_step(&ns, p1, p3))
+			if(SUCCESS != chain_step(ns, p1, p3))
 				goto error;
 			break;
 
@@ -703,7 +698,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 			while(++curr_len < max_chain) {
 				if(!(p2 = select_proxy(RANDOMLY, pd, proxy_count, &offset)))
 					goto error_more;
-				if(SUCCESS != chain_step(&ns, p1, p2)) {
+				if(SUCCESS != chain_step(ns, p1, p2)) {
 					PDEBUG("GOTO AGAIN 2\n");
 					goto again;
 				}
@@ -712,7 +707,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 			//proxychains_write_log(TP);
 			p3->ip = target_ip;
 			p3->port = target_port;
-			if(SUCCESS != chain_step(&ns, p1, p3))
+			if(SUCCESS != chain_step(ns, p1, p3))
 				goto error;
 
 	}
@@ -829,8 +824,7 @@ struct hostent* proxy_gethostbyname_old(const char *name)
 			close(pipe_fd[0]);
 got_buff:
 			l = strlen(buff);
-			if (!l) goto err_dns;
+			if(l && buff[l-1] == '\n') buff[l-1] = 0;
-			if (buff[l-1] == '\n') buff[l-1] = 0;
 			addr = inet_addr(buff);
 			if (addr == (in_addr_t) (-1))
 				goto err_dns;
@@ -845,7 +839,8 @@ got_buff:
 			name, inet_ntoa(*(struct in_addr*)&addr));
 	return &hostent_space;
 err_dns:
-	proxychains_write_log("|DNS-response|: %s lookup error\n", name);
+	proxychains_write_log("|DNS-response|: %s does not exist\n", name);
+	perror("err_dns");
 err:
 	return NULL;
 }
@@ -974,13 +969,12 @@ int proxy_getaddrinfo(const char *node, const char *service, const struct addrin
 		node?node:"",service?service:"",hints?(int)hints->ai_flags:0);
 
 	space = calloc(1, sizeof(struct addrinfo_data));
-	if(!space) return EAI_MEMORY;
+	if(!space) goto err1;
 
 	if(node && !my_inet_aton(node, space)) {
 		/* some folks (nmap) use getaddrinfo() with AI_NUMERICHOST to check whether a string
 		   containing a numeric ip was passed. we must return failure in that case. */
 		if(hints && (hints->ai_flags & AI_NUMERICHOST)) {
-err_nn:
 			free(space);
 			return EAI_NONAME;
 		}
@@ -993,13 +987,13 @@ err_nn:
 			memcpy(&((struct sockaddr_in *) &space->sockaddr_space)->sin_addr,
 			       *(hp->h_addr_list), sizeof(in_addr_t));
 		else
-			goto err_nn;
+			goto err2;
 	} else if(node) {
 		af = ((struct sockaddr_in *) &space->sockaddr_space)->sin_family;
 	} else if(!node && !(hints->ai_flags & AI_PASSIVE)) {
 		af = ((struct sockaddr_in *) &space->sockaddr_space)->sin_family = AF_INET;
 		memcpy(&((struct sockaddr_in *) &space->sockaddr_space)->sin_addr,
-		       "\177\0\0\1", 4);
+		       (char[]){127,0,0,1}, 4);
 	}
 	if(service) mygetservbyname_r(service, NULL, &se_buf, buf, sizeof(buf), &se);
 
@@ -1024,13 +1018,18 @@ err_nn:
 		p->ai_socktype = hints->ai_socktype;
 		p->ai_flags = hints->ai_flags;
 		p->ai_protocol = hints->ai_protocol;
-		if(!p->ai_socktype && p->ai_protocol == IPPROTO_TCP)
-			p->ai_socktype = SOCK_STREAM;
 	} else {
 #ifndef AI_V4MAPPED
 #define AI_V4MAPPED 0
 #endif
 		p->ai_flags = (AI_V4MAPPED | AI_ADDRCONFIG);
 	}
+
+	goto out;
+	err2:
+	free(space);
+	err1:
+	return 1;
+	out:
 	return 0;
 }

src/core.h

@@ -65,18 +65,8 @@ typedef enum {
 } select_type;
 
 typedef struct {
-	sa_family_t family;
+	struct in_addr in_addr, netmask;
 	unsigned short port;
-	union {
-		struct {
-			struct in_addr in_addr;
-			struct in_addr in_mask;
-		};
-		struct {
-			struct in6_addr in6_addr;
-			unsigned char in6_prefix;
-		};
-	};
 } localaddr_arg;
 
 typedef struct {
@@ -100,17 +90,16 @@ int connect_proxy_chain (int sock, ip_type target_ip, unsigned short target_port
 void proxychains_write_log(char *str, ...);
 
 typedef int (*close_t)(int);
-typedef int (*close_range_t)(unsigned, unsigned, int);
 typedef int (*connect_t)(int, const struct sockaddr *, socklen_t);
 typedef struct hostent* (*gethostbyname_t)(const char *);
-typedef void (*freeaddrinfo_t)(struct addrinfo *);
+typedef int (*freeaddrinfo_t)(struct addrinfo *);
 typedef struct hostent *(*gethostbyaddr_t) (const void *, socklen_t, int);
 
 typedef int (*getaddrinfo_t)(const char *, const char *, const struct addrinfo *, 
 			     struct addrinfo **);
 
 typedef int (*getnameinfo_t) (const struct sockaddr *, socklen_t, char *, 
-			      GN_NODELEN_T, char *, GN_SERVLEN_T, GN_FLAGS_T);
+			      socklen_t, char *, socklen_t, int);
 
 typedef ssize_t (*sendto_t) (int sockfd, const void *buf, size_t len, int flags,
 			     const struct sockaddr *dest_addr, socklen_t addrlen);

src/daemon/daemon.c

@@ -5,7 +5,6 @@
 
 */
 
-#undef _GNU_SOURCE
 #define _GNU_SOURCE
 #include <unistd.h>
 #define _POSIX_C_SOURCE 200809L

src/libproxychains.c

@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 #include <ctype.h>
 #include <errno.h>
 #include <assert.h>
@@ -56,7 +55,6 @@ connect_t true___xnet_connect;
 #endif
 
 close_t true_close;
-close_range_t true_close_range;
 connect_t true_connect;
 gethostbyname_t true_gethostbyname;
 getaddrinfo_t true_getaddrinfo;
@@ -87,14 +85,13 @@ static int init_l = 0;
 
 static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_type * ct);
 
-static void* load_sym(char* symname, void* proxyfunc, int is_mandatory) {
+static void* load_sym(char* symname, void* proxyfunc) {
+
 	void *funcptr = dlsym(RTLD_NEXT, symname);
 
-	if(is_mandatory && !funcptr) {
+	if(!funcptr) {
 		fprintf(stderr, "Cannot load symbol '%s' %s\n", symname, dlerror());
 		exit(1);
-	} else if (!funcptr) {
-		return funcptr;
 	} else {
 		PDEBUG("loaded symbol '%s'" " real addr %p  wrapped addr %p\n", symname, funcptr, proxyfunc);
 	}
@@ -105,22 +102,17 @@ static void* load_sym(char* symname, void* proxyfunc, int is_mandatory) {
 	return funcptr;
 }
 
+#define INIT() init_lib_wrapper(__FUNCTION__)
+
+
 #include "allocator_thread.h"
 
 const char *proxychains_get_version(void);
 
 static void setup_hooks(void);
 
-typedef struct {
-	unsigned int first, last, flags;
-} close_range_args_t;
-
-/* If there is some `close` or `close_range` system call before do_init, 
-   we buffer it, and actually execute them in do_init. */
 static int close_fds[16];
 static int close_fds_cnt = 0;
-static close_range_args_t close_range_buffer[16];
-static int close_range_buffer_cnt = 0;
 
 static unsigned get_rand_seed(void) {
 #ifdef HAVE_CLOCK_GETTIME
@@ -133,28 +125,18 @@ static unsigned get_rand_seed(void) {
 }
 
 static void do_init(void) {
-	char *env;
-
 	srand(get_rand_seed());
 	core_initialize();
 
-	env = getenv(PROXYCHAINS_QUIET_MODE_ENV_VAR);
-	if(env && *env == '1')
-		proxychains_quiet_mode = 1;
-
-	proxychains_write_log(LOG_PREFIX "DLL init: proxychains-ng %s\n", proxychains_get_version());
-
-	setup_hooks();
-
 	/* read the config file */
 	get_chain_data(proxychains_pd, &proxychains_proxy_count, &proxychains_ct);
 	DUMP_PROXY_CHAIN(proxychains_pd, proxychains_proxy_count);
 
+	proxychains_write_log(LOG_PREFIX "DLL init: proxychains-ng %s\n", proxychains_get_version());
+
+	setup_hooks();
+
 	while(close_fds_cnt) true_close(close_fds[--close_fds_cnt]);
-	while(close_range_buffer_cnt) {
-		int i = --close_range_buffer_cnt;
-		true_close_range(close_range_buffer[i].first, close_range_buffer[i].last, close_range_buffer[i].flags);
-	}
 	init_l = 1;
 
 	rdns_init(proxychains_resolver);
@@ -173,14 +155,11 @@ static void init_lib_wrapper(const char* caller) {
  * lazily, which has the disadvantage that there's a potential
  * race condition if 2 threads call it before init_l is set 
  * and PTHREAD support was disabled */
-#if __GNUC__+0 > 2
+#if __GNUC__ > 2
 __attribute__((constructor))
 static void gcc_init(void) {
-	init_lib_wrapper(__FUNCTION__);
+	INIT();
 }
-#define INIT() do {} while(0)
-#else
-#define INIT() init_lib_wrapper(__FUNCTION__)
 #endif
 
 
@@ -241,7 +220,7 @@ static int proxy_from_string(const char *proxystring,
 		ul = p-u;
 		p++;
 		pl = at-p;
-		if(ul > 255 || pl > 255)
+		if(proxytype == RS_PT_SOCKS5 && (ul > 255 || pl > 255))
 			return 0;
 		memcpy(user_buf, u, ul);
 		user_buf[ul]=0;
@@ -290,7 +269,8 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 	int count = 0, port_n = 0, list = 0;
 	char buf[1024], type[1024], host[1024], user[1024];
 	char *buff, *env, *p;
-	char local_addr_port[64], local_addr[64], local_netmask[32];
+	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];
 	char rdnsd_addr[32], rdnsd_port[8];
@@ -313,6 +293,10 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
         	exit(1);
 	}
 
+	env = getenv(PROXYCHAINS_QUIET_MODE_ENV_VAR);
+	if(env && *env == '1')
+		proxychains_quiet_mode = 1;
+
 	while(fgets(buf, sizeof(buf), file)) {
 		buff = buf;
 		/* remove leading whitespace */
@@ -351,7 +335,7 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 					if(*ct == STRICT_TYPE && proxychains_resolver >= DNSLF_RDNS_START && count > 0) {
 						/* we can allow dns hostnames for all but the first proxy in the list if chaintype is strict, as remote lookup can be done */
 						rdns_init(proxychains_resolver);
-						ip_type4 internal_ip = rdns_get_ip_for_host(host, strlen(host));
+						ip_type4 internal_ip = at_get_ip_for_host(host, strlen(host));
 						pd[count].ip.is_v6 = 0;
 						host_ip->addr.v4 = internal_ip;
 						if(internal_ip.as_int == IPT4_INVALID.as_int)
@@ -401,76 +385,42 @@ inv_host:
 						exit(1);
 					}
 				} else if(STR_STARTSWITH(buff, "localnet")) {
-					char colon, extra, right_bracket[2];
+					if(sscanf(buff, "%s %21[^/]/%15s", user, local_in_addr_port, local_netmask) < 3) {
-					unsigned short local_port = 0, local_prefix;
-					int local_family, n, valid;
-					if(sscanf(buff, "%s %53[^/]/%15s%c", user, local_addr_port, local_netmask, &extra) != 3) {
 						fprintf(stderr, "localnet format error");
 						exit(1);
 					}
-					p = strchr(local_addr_port, ':');
+					/* clean previously used buffer */
-					if(!p || p == strrchr(local_addr_port, ':')) {
+					memset(local_in_port, 0, sizeof(local_in_port) / sizeof(local_in_port[0]));
-						local_family = AF_INET;
+
-						n = sscanf(local_addr_port, "%15[^:]%c%5hu%c", local_addr, &colon, &local_port, &extra);
+					if(sscanf(local_in_addr_port, "%15[^:]:%5s", local_in_addr, local_in_port) < 2) {
-						valid = n == 1 || (n == 3 && colon == ':');
-					} else if(local_addr_port[0] == '[') {
-						local_family = AF_INET6;
-						n = sscanf(local_addr_port, "[%45[^][]%1[]]%c%5hu%c", local_addr, right_bracket, &colon, &local_port, &extra);
-						valid = n == 2 || (n == 4 && colon == ':');
-					} else {
-						local_family = AF_INET6;
-						valid = sscanf(local_addr_port, "%45[^][]%c", local_addr, &extra) == 1;
-					}
-					if(!valid) {
-						fprintf(stderr, "localnet address or port error\n");
-						exit(1);
-					}
-					if(local_port) {
-						PDEBUG("added localnet: netaddr=%s, port=%u, netmask=%s\n",
-						       local_addr, local_port, local_netmask);
-					} else {
 						PDEBUG("added localnet: netaddr=%s, netmask=%s\n",
-						       local_addr, local_netmask);
+						       local_in_addr, local_netmask);
+					} else {
+						PDEBUG("added localnet: netaddr=%s, port=%s, netmask=%s\n",
+						       local_in_addr, local_in_port, local_netmask);
 					}
 					if(num_localnet_addr < MAX_LOCALNET) {
-						localnet_addr[num_localnet_addr].family = local_family;
+						int error;
-						localnet_addr[num_localnet_addr].port = local_port;
+						error =
-						valid = 0;
+						    inet_pton(AF_INET, local_in_addr,
-						if (local_family == AF_INET) {
+							      &localnet_addr[num_localnet_addr].in_addr);
-							valid =
+						if(error <= 0) {
-							    inet_pton(local_family, local_addr,
-							              &localnet_addr[num_localnet_addr].in_addr) > 0;
-						} else if(local_family == AF_INET6) {
-							valid =
-							    inet_pton(local_family, local_addr,
-							              &localnet_addr[num_localnet_addr].in6_addr) > 0;
-						}
-						if(!valid) {
 							fprintf(stderr, "localnet address error\n");
 							exit(1);
 						}
-						if(local_family == AF_INET && strchr(local_netmask, '.')) {
+						error =
-							valid =
+						    inet_pton(AF_INET, local_netmask,
-							    inet_pton(local_family, local_netmask,
+							      &localnet_addr[num_localnet_addr].netmask);
-							              &localnet_addr[num_localnet_addr].in_mask) > 0;
+						if(error <= 0) {
-						} else {
-							valid = sscanf(local_netmask, "%hu%c", &local_prefix, &extra) == 1;
-							if (valid) {
-								if(local_family == AF_INET && local_prefix <= 32) {
-									localnet_addr[num_localnet_addr].in_mask.s_addr =
-										htonl(0xFFFFFFFFu << (32u - local_prefix));
-								} else if(local_family == AF_INET6 && local_prefix <= 128) {
-									localnet_addr[num_localnet_addr].in6_prefix =
-										local_prefix;
-								} else {
-									valid = 0;
-								}
-							}
-						}
-						if(!valid) {
 							fprintf(stderr, "localnet netmask error\n");
 							exit(1);
 						}
+						if(local_in_port[0]) {
+							localnet_addr[num_localnet_addr].port =
+							    (short) atoi(local_in_port);
+						} else {
+							localnet_addr[num_localnet_addr].port = 0;
+						}
 						++num_localnet_addr;
 					} else {
 						fprintf(stderr, "# of localnet exceed %d.\n", MAX_LOCALNET);
@@ -603,69 +553,6 @@ static int is_v4inv6(const struct in6_addr *a) {
 	return !memcmp(a->s6_addr, "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
 }
 
-static void intsort(int *a, int n) {
-	int i, j, s;
-	for(i=0; i<n; ++i)
-		for(j=i+1; j<n; ++j)
-			if(a[j] < a[i]) {
-				s = a[i];
-				a[i] = a[j];
-				a[j] = s;
-			}
-}
-
-/* Warning: Linux manual says the third arg is `unsigned int`, but unistd.h says `int`. */
-HOOKFUNC(int, close_range, unsigned first, unsigned last, int flags) {
-	if(true_close_range == NULL) {
-		fprintf(stderr, "Calling close_range, but this platform does not provide this system call. ");
-		return -1;
-	}
-	if(!init_l) {
-		/* push back to cache, and delay the execution. */
-		if(close_range_buffer_cnt >= (sizeof close_range_buffer / sizeof close_range_buffer[0])) {
-			errno = ENOMEM;
-			return -1;
-		}
-		int i = close_range_buffer_cnt++;
-		close_range_buffer[i].first = first;
-		close_range_buffer[i].last = last;
-		close_range_buffer[i].flags = flags;
-		return errno = 0;
-	}
-	if(proxychains_resolver != DNSLF_RDNS_THREAD) return true_close_range(first, last, flags);
-
-	/* prevent rude programs (like ssh) from closing our pipes */
-	int res = 0, uerrno = 0, i;
-	int protected_fds[] = {req_pipefd[0], req_pipefd[1], resp_pipefd[0], resp_pipefd[1]};
-	intsort(protected_fds, 4);
-	/* We are skipping protected_fds while calling true_close_range()
-	 * If protected_fds cut the range into some sub-ranges, we close sub-ranges BEFORE cut point in the loop. 
-	 * [first, cut1-1] , [cut1+1, cut2-1] , [cut2+1, cut3-1]
-	 * Finally, we delete the remaining sub-range, outside the loop. [cut3+1, tail]
-	 */
-	int next_fd_to_close = first;
-	for(i = 0; i < 4; ++i) {
-		if(protected_fds[i] < first || protected_fds[i] > last)
-			continue;
-		int prev = (i == 0 || protected_fds[i-1] < first) ? first : protected_fds[i-1]+1;
-		if(prev != protected_fds[i]) {
-			if(-1 == true_close_range(prev, protected_fds[i]-1, flags)) {
-				res = -1;
-				uerrno = errno;
-			}
-		}
-		next_fd_to_close = protected_fds[i]+1;
-	}
-	if(next_fd_to_close <= last) {
-		if(-1 == true_close_range(next_fd_to_close, last, flags)) {
-			res = -1;
-			uerrno = errno;
-		}
-	}
-	errno = uerrno;
-	return res;
-}
-
 HOOKFUNC(int, connect, int sock, const struct sockaddr *addr, unsigned int len) {
 	INIT();
 	PFUNC();
@@ -729,24 +616,14 @@ HOOKFUNC(int, connect, int sock, const struct sockaddr *addr, unsigned int len)
 			port = dnat->new_port;
 	}
 
-	for(i = 0; i < num_localnet_addr && !remote_dns_connect; i++) {
+	if (!v6) for(i = 0; i < num_localnet_addr && !remote_dns_connect; i++) {
-		if (localnet_addr[i].port && localnet_addr[i].port != port)
+		if((localnet_addr[i].in_addr.s_addr & localnet_addr[i].netmask.s_addr)
-			continue;
+		   == (p_addr_in->s_addr & localnet_addr[i].netmask.s_addr)) {
-		if (localnet_addr[i].family != (v6 ? AF_INET6 : AF_INET))
+			if(!localnet_addr[i].port || localnet_addr[i].port == port) {
-			continue;
+				PDEBUG("accessing localnet using true_connect\n");
-		if (v6) {
+				return true_connect(sock, addr, len);
-			size_t prefix_bytes = localnet_addr[i].in6_prefix / CHAR_BIT;
+			}
-			size_t prefix_bits = localnet_addr[i].in6_prefix % CHAR_BIT;
-			if (prefix_bytes && memcmp(p_addr_in6->s6_addr, localnet_addr[i].in6_addr.s6_addr, prefix_bytes) != 0)
-				continue;
-			if (prefix_bits && (p_addr_in6->s6_addr[prefix_bytes] ^ localnet_addr[i].in6_addr.s6_addr[prefix_bytes]) >> (CHAR_BIT - prefix_bits))
-				continue;
-		} else {
-			if((p_addr_in->s_addr ^ localnet_addr[i].in_addr.s_addr) & localnet_addr[i].in_mask.s_addr)
-				continue;
 		}
-		PDEBUG("accessing localnet using true_connect\n");
-		return true_connect(sock, addr, len);
 	}
 
 	flags = fcntl(sock, F_GETFL, 0);
@@ -767,7 +644,7 @@ HOOKFUNC(int, connect, int sock, const struct sockaddr *addr, unsigned int len)
 }
 
 #ifdef IS_SOLARIS
-HOOKFUNC(int, __xnet_connect, int sock, const struct sockaddr *addr, unsigned int len) {
+HOOKFUNC(int, __xnet_connect, int sock, const struct sockaddr *addr, unsigned int len)
 	return connect(sock, addr, len);
 }
 #endif
@@ -808,8 +685,8 @@ HOOKFUNC(void, freeaddrinfo, struct addrinfo *res) {
 }
 
 HOOKFUNC(int, getnameinfo, const struct sockaddr *sa, socklen_t salen,
-	           char *host, GN_NODELEN_T hostlen, char *serv,
+	           char *host, socklen_t hostlen, char *serv,
-	           GN_SERVLEN_T servlen, GN_FLAGS_T flags)
+	           socklen_t servlen, int flags)
 {
 	INIT();
 	PFUNC();
@@ -904,11 +781,8 @@ HOOKFUNC(ssize_t, sendto, int sockfd, const void *buf, size_t len, int flags,
 
 #ifdef MONTEREY_HOOKING
 #define SETUP_SYM(X) do { if (! true_ ## X ) true_ ## X = &X; } while(0)
-#define SETUP_SYM_OPTIONAL(X)
 #else
-#define SETUP_SYM_IMPL(X, IS_MANDATORY) do { if (! true_ ## X ) true_ ## X = load_sym( # X, X, IS_MANDATORY ); } while(0)
+#define SETUP_SYM(X) do { if (! true_ ## X ) true_ ## X = load_sym( # X, X ); } while(0)
-#define SETUP_SYM(X) SETUP_SYM_IMPL(X, 1)
-#define SETUP_SYM_OPTIONAL(X) SETUP_SYM_IMPL(X, 0)
 #endif
 
 static void setup_hooks(void) {
@@ -923,7 +797,6 @@ static void setup_hooks(void) {
 	SETUP_SYM(__xnet_connect);
 #endif
 	SETUP_SYM(close);
-	SETUP_SYM_OPTIONAL(close_range);
 }
 
 #ifdef MONTEREY_HOOKING

src/main.c

@@ -135,20 +135,16 @@ int main(int argc, char *argv[]) {
 	if(!quiet)
 		fprintf(stderr, LOG_PREFIX "preloading %s/%s\n", prefix, dll_name);
 
-#if defined(IS_MAC) || defined(IS_OPENBSD)
-#define LD_PRELOAD_SEP ":"
-#else
-/* Dynlinkers for Linux and most BSDs seem to support space
-   as LD_PRELOAD separator, with colon added only recently.
-   We use the old syntax for maximum compat */
-#define LD_PRELOAD_SEP " "
-#endif
-
 #ifdef IS_MAC
 	putenv("DYLD_FORCE_FLAT_NAMESPACE=1");
 #define LD_PRELOAD_ENV "DYLD_INSERT_LIBRARIES"
+#define LD_PRELOAD_SEP ":"
 #else
 #define LD_PRELOAD_ENV "LD_PRELOAD"
+/* all historic implementations of BSD and linux dynlinkers seem to support
+   space as LD_PRELOAD separator, with colon added only recently.
+   we use the old syntax for maximum compat */
+#define LD_PRELOAD_SEP " "
 #endif
 	char *old_val = getenv(LD_PRELOAD_ENV);
 	snprintf(buf, sizeof(buf), LD_PRELOAD_ENV "=%s/%s%s%s",
@@ -158,8 +154,7 @@ int main(int argc, char *argv[]) {
 	         old_val ? old_val : "");
 	putenv(buf);
 	execvp(argv[start_argv], &argv[start_argv]);
-	fprintf(stderr, "proxychains: can't load process '%s'.", argv[start_argv]);
+	perror("proxychains can't load process....");
-	perror(" (hint: it's probably a typo)");
 
 	return EXIT_FAILURE;
 }

src/proxychains.conf

@@ -53,9 +53,9 @@ strict_chain
 
 # method 1. this uses the proxychains4 style method to do remote dns:
 # a thread is spawned that serves DNS requests and hands down an ip
-# assigned from an internal list (via remote_dns_subnet).
+# assigned from an internal list (via remote_dns_subset).
 # this is the easiest (setup-wise) and fastest method, however on
-# systems with buggy libcs and very complex software like webbrowsers
+# systems with buggy libcs and very complex software like webbrosers
 # this might not work and/or cause crashes.
 proxy_dns
 
@@ -94,7 +94,7 @@ tcp_connect_time_out 8000
 
 ### Examples for localnet exclusion
 ## localnet ranges will *not* use a proxy to connect.
-## note that localnet works only when plain IP addresses are passed to the app,
+## note that localnet works only when plain IPv4 addresses are passed to the app,
 ## the hostname resolves via /etc/hosts, or proxy_dns is disabled or proxy_dns_old used.
 
 ## Exclude connections to 192.168.1.0/24 with port 80
@@ -105,14 +105,12 @@ tcp_connect_time_out 8000
 
 ## Exclude connections to ANYwhere with port 80
 # localnet 0.0.0.0:80/0.0.0.0
-# localnet [::]:80/0
 
-## RFC6890 Loopback address range
+## RFC5735 Loopback address range
 ## if you enable this, you have to make sure remote_dns_subnet is not 127
 ## you'll need to enable it if you want to use an application that 
 ## connects to localhost.
 # localnet 127.0.0.0/255.0.0.0
-# localnet ::1/128
 
 ## RFC1918 Private Address Ranges
 # localnet 10.0.0.0/255.0.0.0