Install proxyresolv and proxychains script along with proxychains library and proxychains4 binary.

Update README.adoc about socks5 environment variable

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Run command
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/buildci.yml

@@ -0,0 +1,55 @@
+name: Makefile CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build-linux-ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: configure
+        run: ./configure
+
+      - name: Build Proxychains
+        run: make
+
+      - name: Run Proxychains
+        run: ./proxychains4 -v
+
+      - name: Run tests
+        run: ./src/proxychains -f dist/proxychains.conf on
+
+      # - name: Run tests
+      #   run: ./src/proxychains -f dist/proxychains.conf curl -o /dev/null -v https://sme.sk
+
+      # - name: Run tests
+      #   run: ./src/proxychains -f dist/proxychains.conf ping -c 1 sme.sk
+  build-macos:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: configure
+        run: ./configure
+
+      - name: Build Proxychains
+        run: make
+
+      - name: Run Proxychains
+        run: ./proxychains4 -v
+
+      - name: Run tests
+        run: ./src/proxychains -f dist/proxychains.conf on
+
+      # - name: Run tests
+      #   run: ./src/proxychains -f dist/proxychains.conf curl -o /dev/null -v https://sme.sk
+
+      # - name: Run tests
+      #   run: ./src/proxychains -f dist/proxychains.conf ping -t 1 sme.sk
+
+

.github/workflows/stale.yml

@@ -0,0 +1,31 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '24 3 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        days-before-stale: 90
+        days-before-close: 120
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        exempt-issue-labels: 'docu,roadmap,bug,possible-feature'
+        stale-pr-label: 'no-pr-activity'
+        exempt-pr-labels: 'feature'

.github/workflows/super-linter.yml

@@ -0,0 +1,29 @@
+# This workflow executes several linters on changed files based on languages used in your code base whenever
+# you push a code or open a pull request.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/github/super-linter
+name: Lint Code Base
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+jobs:
+  run-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          # Full git history is needed to get a proper list of changed files within `super-linter`
+          fetch-depth: 0
+
+      - name: Lint Code Base
+        uses: github/super-linter@v4
+        env:
+          VALIDATE_ALL_CODEBASE: false
+          DEFAULT_BRANCH: "master"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -4,8 +4,11 @@
 *.lo
 .deps/
 .libs/
-
+.*
+src/*.d
 # Autoconf stuff 
 libtool
 config.*
 stamp-h
+proxychains4
+*.dylib

AUTHORS

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

ChangeLog

@@ -1,6 +1,27 @@
 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
+
+-------------------------------------------------------------------------
+
+ver 4.0
+
+changed:
+       * Add a lot of fixes
+       * localnet-patch
+       * remote-dns
+       * thread-safe
+-------------------------------------------------------------------------
+
 ver 3.1
 
 changed:

Makefile

@@ -9,54 +9,73 @@ prefix = /usr/local
 includedir = $(prefix)/include
 libdir = $(prefix)/lib
 confdir = $(prefix)/etc
+datadir = $(prefix)/share
 
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
+zshcompdir = $(datadir)/zsh/site-functions
 
 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 -O0 -g -std=c99 -D_GNU_SOURCE -pipe -DTHREAD_SAFE -Werror 
-LDFLAGS = -shared -fPIC -ldl -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
 
-LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
-
 SHARED_LIBS = $(LDSO_PATHNAME)
 ALL_LIBS = $(SHARED_LIBS)
 PXCHAINS = proxychains4
 ALL_TOOLS = $(PXCHAINS)
 
+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)\"
 
-CFLAGS+=$(USER_CFLAGS) $(MAC_CFLAGS)
-CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DSYSCONFDIR=\"$(confdir)\" -DDLL_NAME=\"$(LDSO_PATHNAME)\"
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+	LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX)
+    LDSO_SUFFIX = so.4
+endif
+ifeq ($(UNAME_S),Darwin)
+	LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
+    LDSO_SUFFIX = dylib
+endif
 
 
 all: $(ALL_LIBS) $(ALL_TOOLS)
 
+#install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(DESTDIR)$(LDSO_PATHNAME)
+install: install-exec install-config install-zsh-completion
+
+install-exec:
+	install -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(libdir) $(DESTDIR)/$(confdir) $(DESTDIR)/$(includedir)
+	install $(INSTALL_FLAGS) 755 $(ALL_TOOLS) src/proxychains src/proxyresolv $(DESTDIR)/$(bindir)/
+	install $(INSTALL_FLAGS) 644 $(ALL_LIBS) $(DESTDIR)/$(libdir)/
+
 install-config:
 	install -d $(DESTDIR)/$(confdir)
 	install $(INSTALL_FLAGS) 644 src/proxychains.conf $(DESTDIR)/$(confdir)/
 
-install: 
-	install -d $(DESTDIR)/$(bindir)/ $(DESTDIR)/$(libdir)/
-	install $(INSTALL_FLAGS) 755 $(ALL_TOOLS) $(DESTDIR)/$(bindir)/
-	install $(INSTALL_FLAGS) 644 $(ALL_LIBS) $(DESTDIR)/$(libdir)/
+install-zsh-completion:
+	install -d $(DESTDIR)/$(zshcompdir)
+	install $(INSTALL_FLAGS) 644 completions/zsh/_proxychains4 -t $(DESTDIR)/$(zshcompdir)
 
 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 $@ $<
@@ -67,5 +86,6 @@ $(LDSO_PATHNAME): $(LOBJS)
 $(ALL_TOOLS): $(OBJS)
 	$(CC) src/main.o src/common.o -o $(PXCHAINS)
 
+.PHONY: all clean install install-exec install-config install-zsh-completion
 
-.PHONY: all clean install
+-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.md

@@ -0,0 +1,179 @@
+# ProxyChains ver. 4.3.0 README
+
+![build-badge](https://github.com/haad/proxychains/actions/workflows/buildci.yml/badge.svg)
+
+
+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 behavior, 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 behavior
+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:https://pkgsrc.org/wip[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 host ip and port in environment variable ${PROXYCHAINS_SOCKS5_HOST} ${PROXYCHAINS_SOCKS5_PORT}
+  (if ${PROXYCHAINS_SOCKS5_PORT} is set, no further configuration will be searched. if ${PROXYCHAINS_SOCKS5_HOST} isn't set, host ip will become "127.0.0.1")
+* 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
+
+```
+$ proxychains4 telnet targethost.com
+```
+
+in this example it will run telnet through proxy(or chained proxies)
+specified by *proxychains.conf*
+
+### Usage Example
+
+```
+$ proxychains4 -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_HOST=127.0.0.1 PROXYCHAINS_SOCKS5_PORT=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
+$ proxychains4 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

TODO

@@ -1,7 +1,11 @@
 ProxyChains ver 4.0 TODO
 ===================
 
-	
-   hooks for reentrant dns functions, i.e. gethostbyaddr_r
+- hooks for reentrant dns functions, i.e. gethostbyaddr_r
+- shadowsocks support #133
+- proxy change according to attempts #156
+
+
+
 
 

completions/zsh/_proxychains4

@@ -0,0 +1,3 @@
+#compdef proxychains4
+
+_arguments -s -S '1: :{_command_names -e}' '*:: :_normal'

configure

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 prefix=/usr/local
+develflg=0
 
 usage() {
 	echo "supported arguments"
@@ -10,6 +11,7 @@ usage() {
 	echo "--libdir=/path		default: $prefix/lib"
 	echo "--includedir=/path	default: $prefix/include"
 	echo "--sysconfdir=/path	default: $prefix/etc"
+	echo "--devel				default:no (set development mode)"
 	echo "--help : show this text"
 	exit 1
 }
@@ -29,6 +31,7 @@ parsearg() {
 	--libdir=*) libdir=`spliteq $1`;;
 	--includedir=*) includedir=`spliteq $1`;;
 	--sysconfdir=*) sysconfdir=`spliteq $1`;;
+	--devel) develflg=1;;
 	--help) usage;;
 	esac
 }
@@ -37,6 +40,14 @@ ismac() {
 	uname -s | grep Darwin
 }
 
+isbsd() {
+        uname -s | grep BSD
+}
+
+islinux() {
+        uname -s | grep Linux
+}
+
 while true ; do
 	case $1 in
 	-*) parsearg "$1"; shift;;
@@ -68,21 +79,45 @@ if [ -z "$CC" ] ; then
 	CC=cc
 fi
 
+if [ $develflg -eq 1 ]; then
+	CFLAGS="-Wextra -Wunused -Wuninitialized -Wconversion -fno-common -g -O0 -DDEBUG"
+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
+	arch=`uname -m`
+
 	echo LDSO_SUFFIX=dylib>>config.mak
-	echo MAC_CFLAGS+=-DIS_MAC=1>>config.mak
+	echo OS_CFLAGS+=-DIS_MAC=1 -arch $arch >>config.mak
+	echo OS_LDFLAGS+=-arch $arch -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 OS_LDFLAGS=-pthread -ldl -Wl,--no-as-needed>>config.mak
+    echo LD_SET_SONAME=-Wl,-soname= >>config.mak
+fi
+
+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
 
+

dist/proxychains.conf

@@ -0,0 +1,13 @@
+strict_chain
+#proxy_dns
+#remote_dns_subnet 224
+tcp_read_time_out 15000
+tcp_connect_time_out 8000
+
+localnet 127.0.0.0/255.0.0.0
+
+
+[ProxyList]
+http 162.243.184.252 8585
+#socks4 184.170.245.148 4145
+#raw 162.243.184.252 8585

proxychains.lsm

@@ -0,0 +1,14 @@
+Begin3
+Title:          ProxyChains
+Version:        4.3
+Entered-date:
+Description:
+Keywords:
+Author:          <N37CR347UR3>
+Maintained-by:   <haad@netbsd.org>
+Primary-site:
+Home-page:      https://github.com/haad/proxychains
+Original-site:
+Platforms:       Linux and other Unices
+Copying-policy: GNU Public License
+End

src/common.c

@@ -1,4 +1,5 @@
 #include "common.h"
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -14,41 +15,40 @@ char *get_config_path(char* default_path, char* pbuf, size_t bufsize) {
 	// top priority: user defined path
 	char *path = default_path;
 	if(check_path(path))
-		goto have;
-	
+		return path;
+	if (!pbuf)
+		goto err;
+
 	// priority 1: env var PROXYCHAINS_CONF_FILE
 	path = getenv(PROXYCHAINS_CONF_FILE_ENV_VAR);
 	if(check_path(path))
-		goto have;
+		return path;
 
 	// 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;
+		return path;
 
 	// 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;
+		return path;
 
 	// priority 4: $SYSCONFDIR/proxychains.conf
 	path = SYSCONFDIR "/" PROXYCHAINS_CONF_FILE;
 	if(check_path(path))
-		goto have;
+		return path;
 
 	// priority 5: /etc/proxychains.conf
 	path = "/etc/" PROXYCHAINS_CONF_FILE;
 	if(check_path(path))
-		goto have;
-	
-	perror("couldnt find configuration file");
+		return path;
+
+err:
+	perror("couldn't find configuration file");
 	exit(1);
-	
-	return NULL;
-	have:
-	return path;
 }

src/common.h

@@ -1,8 +1,15 @@
 #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 3
+#define PROXYCHAINS_VERSION_BUGFIX 0
+
 #include <stddef.h>
 
-char *get_config_path(char* default_path, char* pbuf, size_t bufsize);
+char *get_config_path(char* default_path, char* pbuf, size_t bufsize);

src/core.c

@@ -15,6 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 #include <sys/types.h>
+#include <sys/cdefs.h>
 
 #include <stdio.h>
 #include <unistd.h>
@@ -34,10 +35,15 @@
 #include <sys/time.h>
 #include <stdarg.h>
 #include <assert.h>
+
 #ifdef THREAD_SAFE
-#include <pthread.h>
 pthread_mutex_t internal_ips_lock;
-#endif
+
+#ifdef __APPLE__
+pthread_mutex_t internal_getsrvbyname_lock;
+#endif /* __APPLE__ */
+
+#endif /* THREAD_SAFE */
 
 #include "core.h"
 #include "common.h"
@@ -62,7 +68,7 @@ uint32_t dalias_hash(char *s0) {
 uint32_t index_from_internal_ip(ip_type internalip) {
 	ip_type tmp = internalip;
 	uint32_t ret;
-	ret = tmp.octet[3] + (tmp.octet[2] << 8) + (tmp.octet[1] << 16);
+	ret = (uint32_t) (tmp.octet[3] + (tmp.octet[2] << 8) + (tmp.octet[1] << 16));
 	ret -= 1;
 	return ret;
 }
@@ -106,7 +112,7 @@ static int poll_retry(struct pollfd *fds, nfds_t nfsd, int timeout)
 		//printf("Retry %d\n", time_remain);
 		ret = poll(fds, nfsd, time_remain);
 		gettimeofday(&tv, NULL);
-		time_elapsed = ((tv.tv_sec - start_time.tv_sec) * 1000 + (tv.tv_usec - start_time.tv_usec) / 1000);
+		time_elapsed = ((int)(tv.tv_sec - start_time.tv_sec) * 1000 + (int)(tv.tv_usec - start_time.tv_usec) / 1000);
 		//printf("Time elapsed %d\n", time_elapsed);
 		time_remain = timeout - time_elapsed;
 	} while(ret == -1 && errno == EINTR && time_remain > 0);
@@ -118,7 +124,9 @@ static int poll_retry(struct pollfd *fds, nfds_t nfsd, int timeout)
 
 
 static void encode_base_64(char *src, char *dest, int max_len) {
-	int n, l, i;
+	int n, i;
+	size_t l;
+
 	l = strlen(src);
 	max_len = (max_len - 1) / 4;
 	for(i = 0; i < max_len; i++, src += 3, l -= 3) {
@@ -164,11 +172,11 @@ void proxychains_write_log(char *str, ...) {
 	}
 }
 
-static int write_n_bytes(int fd, char *buff, size_t size) {
-	int i = 0;
+static size_t write_n_bytes(int fd, char *buff, size_t size) {
+	size_t i = 0;
 	size_t wrote = 0;
 	for(;;) {
-		i = write(fd, &buff[wrote], size - wrote);
+		i = (size_t) write(fd, &buff[wrote], size - wrote);
 		if(i <= 0)
 			return i;
 		wrote += i;
@@ -177,7 +185,7 @@ static int write_n_bytes(int fd, char *buff, size_t size) {
 	}
 }
 
-static int read_n_bytes(int fd, char *buff, size_t size) {
+static size_t read_n_bytes(int fd, char *buff, size_t size) {
 	int ready;
 	size_t i;
 	struct pollfd pfd[1];
@@ -188,9 +196,9 @@ static int read_n_bytes(int fd, char *buff, size_t size) {
 		pfd[0].revents = 0;
 		ready = poll_retry(pfd, 1, tcp_read_time_out);
 		if(ready != 1 || !(pfd[0].revents & POLLIN) || 1 != read(fd, &buff[i], 1))
-			return -1;
+			return 0;
 	}
-	return (int) size;
+	return size;
 }
 
 static int timed_connect(int sock, const struct sockaddr *addr, socklen_t len) {
@@ -203,7 +211,7 @@ static int timed_connect(int sock, const struct sockaddr *addr, socklen_t len) {
 	fcntl(sock, F_SETFL, O_NONBLOCK);
 	ret = true_connect(sock, addr, len);
 	PDEBUG("\nconnect ret=%d\n", ret);
-	
+
 	if(ret == -1 && errno == EINPROGRESS) {
 		ret = poll_retry(pfd, 1, tcp_connect_time_out);
 		PDEBUG("\npoll ret=%d\n", ret);
@@ -253,7 +261,7 @@ 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);
@@ -264,13 +272,16 @@ static int tunnel_to(int sock, ip_type ip, unsigned short port, proxy_type pt, c
 		goto err;
 	}
 
-	int len;
+	size_t len;
 	unsigned char buff[BUFF_SIZE];
 	char ip_buf[16];
-	
 	//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));
@@ -299,7 +310,7 @@ static int tunnel_to(int sock, ip_type ip, unsigned short port, proxy_type pt, c
 
 				len = strlen((char *) buff);
 
-				if(len != send(sock, buff, len, 0))
+				if(len != (size_t) send(sock, buff, len, 0))
 					goto err;
 
 				len = 0;
@@ -393,15 +404,15 @@ static int tunnel_to(int sock, ip_type ip, unsigned short port, proxy_type pt, c
 					int c;
 					*cur++ = 1;	// version
 					c = ulen & 0xFF;
-					*cur++ = c;
-					memcpy(cur, user, c);
+					*cur++ = (char)c;
+					memcpy(cur, user, (size_t)c);
 					cur += c;
 					c = passlen & 0xFF;
-					*cur++ = c;
-					memcpy(cur, pass, c);
+					*cur++ = (char)c;
+					memcpy(cur, pass, (size_t)c);
 					cur += c;
 
-					if((cur - out) != write_n_bytes(sock, out, cur - out))
+					if((size_t)(cur - out) != write_n_bytes(sock, out, (size_t) (cur - out)))
 						goto err;
 
 
@@ -414,7 +425,7 @@ static int tunnel_to(int sock, ip_type ip, unsigned short port, proxy_type pt, c
 							return BLOCKED;
 					}
 				}
-				int buff_iter = 0;
+				size_t buff_iter = 0;
 				buff[buff_iter++] = 5;	// version
 				buff[buff_iter++] = 1;	// connect
 				buff[buff_iter++] = 0;	// reserved
@@ -507,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 ((unsigned int)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;
@@ -515,10 +539,10 @@ static proxy_data *select_proxy(select_type how, proxy_data * pd, unsigned int p
 		return NULL;
 	switch (how) {
 		case RANDOMLY:
-			srand(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:
@@ -553,8 +577,7 @@ static void release_busy(proxy_data * pd, unsigned int proxy_count) {
 }
 
 static unsigned int calc_alive(proxy_data * pd, unsigned int proxy_count) {
-	unsigned int i;
-	int alive_count = 0;
+	unsigned int i, alive_count = 0;
 	release_busy(pd, proxy_count);
 	for(i = 0; i < proxy_count; i++)
 		if(pd[i].ps == PLAY_STATE)
@@ -617,7 +640,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 
 	switch (ct) {
 		case DYNAMIC_TYPE:
-			alive_count = calc_alive(pd, proxy_count);
+			calc_alive(pd, proxy_count);
 			offset = 0;
 			do {
 				if(!(p1 = select_proxy(FIFOLY, pd, proxy_count, &offset)))
@@ -641,7 +664,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 			break;
 
 		case STRICT_TYPE:
-			alive_count = calc_alive(pd, proxy_count);
+			calc_alive(pd, proxy_count);
 			offset = 0;
 			if(!(p1 = select_proxy(FIFOLY, pd, proxy_count, &offset))) {
 				PDEBUG("select_proxy failed\n");
@@ -706,7 +729,7 @@ int connect_proxy_chain(int sock, ip_type target_ip,
 	proxychains_write_log("\n!!!need more proxies!!!\n");
 	error_strict:
 	PDEBUG("error\n");
-	
+
 	release_all(pd, proxy_count);
 	if(ns != -1)
 		close(ns);
@@ -716,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;
@@ -737,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;
 	}
 
@@ -799,10 +829,12 @@ 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(data->addr_name, name, sizeof(data->addr_name) - 1);
 
 	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:
@@ -820,6 +852,31 @@ void proxy_freeaddrinfo(struct addrinfo *res) {
 	free(res);
 }
 
+void proxy_getservbyname(const char * service, struct servent *se_buf,
+	char * buf, size_t buf_len, struct servent **se_result)
+{
+
+#ifdef __linux__
+	getservbyname_r(service, NULL, se_buf, buf, buf_len, se_result);
+#endif
+
+#ifdef __APPLE__
+	struct servent *se;
+
+	MUTEX_LOCK(&internal_getsrvbyname_lock);
+	if(service) {
+		se = getservbyname(service, NULL);
+
+		if ( se != NULL ) {
+			memcpy(se_buf, se, buf_len);
+			*se_result = se_buf;
+		} else {
+			*se_result = NULL;
+		}
+	}
+	MUTEX_UNLOCK(&internal_getsrvbyname_lock);
+#endif /* __APPLE__ */
+}
 
 int proxy_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res) {
 	struct gethostbyname_data ghdata;
@@ -833,27 +890,31 @@ int proxy_getaddrinfo(const char *node, const char *service, const struct addrin
 
 //      printf("proxy_getaddrinfo node %s service %s\n",node,service);
 	space = calloc(1, sizeof(struct addrinfo_data));
-	if(!space) goto err1;
-	
+	if(!space)
+		return 1;
+
 	if(node && !inet_aton(node, &((struct sockaddr_in *) &space->sockaddr_space)->sin_addr)) {
 		hp = proxy_gethostbyname(node, &ghdata);
-		if(hp)
+		if(hp) {
 			memcpy(&((struct sockaddr_in *) &space->sockaddr_space)->sin_addr,
 			       *(hp->h_addr_list), sizeof(in_addr_t));
-		else
-			goto err2;
+		} else {
+			free(space);
+			return 1;
+		}
 	}
-	if(service) getservbyname_r(service, NULL, &se_buf, buf, sizeof(buf), &se);
+	if(service)
+		proxy_getservbyname(service, &se_buf, buf, sizeof(buf), &se);
 
-	port = se ? se->s_port : htons(atoi(service ? service : "0"));
-	((struct sockaddr_in *) &space->sockaddr_space)->sin_port = port;
+	port = se ? se->s_port : htons((uint16_t)atoi(service ? service : "0"));
+	((struct sockaddr_in *) &space->sockaddr_space)->sin_port = (in_port_t)port;
 
 	*res = p = &space->addrinfo_space;
 	assert((size_t)p == (size_t) space);
-	
+
 	p->ai_addr = &space->sockaddr_space;
 	if(node)
-		strncpy(space->addr_name, node, sizeof(space->addr_name));
+		strncpy(space->addr_name, node, sizeof(space->addr_name) - 1);
 	p->ai_canonname = space->addr_name;
 	p->ai_next = NULL;
 	p->ai_family = space->sockaddr_space.sa_family = AF_INET;
@@ -864,14 +925,12 @@ int proxy_getaddrinfo(const char *node, const char *service, const struct addrin
 		p->ai_flags = hints->ai_flags;
 		p->ai_protocol = hints->ai_protocol;
 	} else {
+#ifdef BSD
 		p->ai_flags = (AI_V4MAPPED | AI_ADDRCONFIG);
+#else
+		p->ai_flags = (AI_ADDRCONFIG);
+#endif
 	}
-	
-	goto out;
-	err2:
-	free(space);
-	err1:
-	return 1;
-	out:
+
 	return 0;
 }

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];
@@ -41,7 +42,10 @@ extern internal_ip_lookup_table internal_ips;
 
 #ifdef THREAD_SAFE
 #include <pthread.h>
-pthread_mutex_t internal_ips_lock;
+
+extern pthread_mutex_t internal_ips_lock;
+extern pthread_mutex_t internal_getsrvbyname_lock;
+
 # define MUTEX_LOCK(x) pthread_mutex_lock(x)
 # define MUTEX_UNLOCK(x) pthread_mutex_unlock(x)
 # define MUTEX_INIT(x,y) pthread_mutex_init(x, y)
@@ -63,6 +67,7 @@ typedef enum {
 
 typedef enum {
 	HTTP_TYPE,
+	RAW_TYPE,
 	SOCKS4_TYPE,
 	SOCKS5_TYPE
 } proxy_type;
@@ -90,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;
@@ -99,21 +109,24 @@ typedef struct {
 	char pass[256];
 } proxy_data;
 
-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 );
+int connect_proxy_chain (int, ip_type, unsigned short, proxy_data *, unsigned int,
+    chain_type, unsigned int);
 
-void proxychains_write_log(char *str, ...);
+void proxychains_write_log(char *, ...);
 
 typedef int (*connect_t)(int, const struct sockaddr *, socklen_t);
 typedef struct hostent* (*gethostbyname_t)(const char *);
 typedef int (*freeaddrinfo_t)(struct addrinfo *);
+
+#if (defined __linux__) || (defined __APPLE__)
 typedef struct hostent *(*gethostbyaddr_t) (const void *, socklen_t, int);
+#else
+typedef struct hostent *(*gethostbyaddr_t) (const char *, socklen_t, int);
+#endif
 
-typedef int (*getaddrinfo_t)(const char *, const char *, const struct addrinfo *, 
+typedef int (*getaddrinfo_t)(const char *, const char *, const struct addrinfo *,
 			     struct addrinfo **);
-
-typedef int (*getnameinfo_t) (const struct sockaddr *, socklen_t, char *, 
+typedef int (*getnameinfo_t) (const struct sockaddr *, socklen_t, char *,
 			      socklen_t, char *, socklen_t, int);
 
 
@@ -131,11 +144,10 @@ struct gethostbyname_data {
 	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);
+struct hostent* proxy_gethostbyname(const char *, struct gethostbyname_data *);
+void proxy_getservbyname(const char *, struct servent *, char *, size_t, struct servent **);
+int proxy_getaddrinfo(const char *, const char *, const struct addrinfo *, struct addrinfo **);
+void proxy_freeaddrinfo(struct addrinfo *);
 
 #ifdef DEBUG
 # define PDEBUG(fmt, args...) do { fprintf(stderr,"DEBUG:"fmt, ## args); fflush(stderr); } while(0)

src/libproxychains.c

@@ -19,6 +19,7 @@
 #define _GNU_SOURCE
 
 #include <sys/types.h>
+#include <sys/param.h>
 
 #include <dlfcn.h>
 #include <errno.h>
@@ -55,23 +56,31 @@ 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];
 
 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) {
 
 	void *funcptr = dlsym(RTLD_NEXT, symname);
-	
 	if(!funcptr) {
 		fprintf(stderr, "Cannot load symbol '%s' %s\n", symname, dlerror());
 		exit(1);
@@ -91,18 +100,24 @@ static void* load_sym(char* symname, void* proxyfunc) {
 
 static void do_init(void) {
 	MUTEX_INIT(&internal_ips_lock, NULL);
+
+#ifdef __APPLE__
+	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);
 
 	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);
-	
 	init_l = 1;
 }
 
@@ -120,10 +135,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))
@@ -132,37 +147,68 @@ static void gcc_init(void) {
 }
 #endif
 
+FILE *
+open_config_file() {
+	char home_conf[MAXPATHLEN], prefix_conf[MAXPATHLEN];
+	FILE *file;
+
+	snprintf(home_conf, 256, "%s/.proxychains/proxychains.conf", getenv("HOME"));
+	snprintf(prefix_conf, 256, "%s/etc/proxychains.conf", INSTALL_PREFIX);
+
+	if(!(file = fopen("./proxychains.conf", "r"))) {
+		if(!(file = fopen(home_conf, "r"))) {
+			if(!(file = fopen(prefix_conf, "r"))) {
+				if(!(file = fopen("/etc/proxychains.conf", "r"))) {
+					perror("Can't locate proxychains.conf");
+					exit(1);
+				}
+			}
+		}
+	}
+
+	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) {
-	int count = 0, port_n = 0, list = 0;
+	unsigned int count = 0;
+	int port_n = 0, list = 0;
 	char buff[1024], type[1024], host[1024], user[1024];
 	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 */
 			if(list) {
 				if(count >= MAX_CHAIN)
 					break;
-				
+
 				memset(&pd[count], 0, sizeof(proxy_data));
 
 				pd[count].ps = PLAY_STATE;
@@ -175,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")) {
@@ -237,7 +285,7 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 						}
 						if(local_in_port[0]) {
 							localnet_addr[num_localnet_addr].port =
-							    (short) atoi(local_in_port);
+							    (unsigned short) atoi(local_in_port);
 						} else {
 							localnet_addr[num_localnet_addr].port = 0;
 						}
@@ -250,11 +298,60 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 					int len;
 					pc = strchr(buff, '=');
 					len = atoi(++pc);
-					proxychains_max_chain = (len ? len : 1);
+					proxychains_max_chain = (unsigned int) (len ? len : 1);
 				} else if(strstr(buff, "quiet_mode")) {
 					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 =
+							    (unsigned short) atoi(dnat_orig_port);
+						} else {
+							dnats[num_dnats].orig_port = 0;
+						}
+
+						if(dnat_new_port[0]) {
+							dnats[num_dnats].new_port =
+							    (unsigned 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);
+					}
 				}
 			}
 		}
@@ -264,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;
@@ -274,9 +405,12 @@ 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;
+
 	INIT();
 	optlen = sizeof(socktype);
 	getsockopt(sock, SOL_SOCKET, SO_TYPE, &socktype, &optlen);
@@ -296,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)) {
@@ -378,7 +535,7 @@ int getnameinfo(const struct sockaddr *sa,
 	int ret = 0;
 
 	INIT();
-	
+
 	PDEBUG("getnameinfo: %s %s\n", host, serv);
 
 	if(!proxychains_resolver) {
@@ -394,7 +551,11 @@ int getnameinfo(const struct sockaddr *sa,
 	return ret;
 }
 
+#if (defined __linux__) || (defined __APPLE__)
 struct hostent *gethostbyaddr(const void *addr, socklen_t len, int type) {
+#else
+struct hostent *gethostbyaddr(const char *addr, socklen_t len, int type) {
+#endif
 	static char buf[16];
 	static char ipv4[4];
 	static char *list[2];

src/main.c

@@ -26,10 +26,14 @@
 #include "common.h"
 
 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"
-	       "\tfor example : proxychains telnet somehost.com\n" "More help in README file\n\n", argv[0]);
+	printf( "\nProxychains4: %d.%d.%d\n"
+			"Usage:\t%s -q -f config_file program_name [arguments]\n"
+			"\t-v print version and exit\n"
+	       	"\t-q makes proxychains quiet - this overrides the config setting\n"
+	       	"\t-f allows to manually specify a configfile to use\n"
+	       	"\n\tfor example : proxychains telnet somehost.com\n"
+	       	"\n\tMore help in README file\n\n", PROXYCHAINS_VERSION_MAJOR,
+	       		PROXYCHAINS_VERSION_MINOR, PROXYCHAINS_VERSION_BUGFIX, argv[0]);
 	return EXIT_FAILURE;
 }
 
@@ -37,7 +41,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 +56,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;
@@ -76,6 +81,10 @@ int main(int argc, char *argv[]) {
 			if(argv[start_argv][1] == 'q') {
 				quiet = 1;
 				start_argv++;
+			} else if(argv[start_argv][1] == 'v') {
+				printf("Proxychains4 version: %d.%d.%d\n", PROXYCHAINS_VERSION_MAJOR, PROXYCHAINS_VERSION_MINOR, PROXYCHAINS_VERSION_BUGFIX);
+				exit(EXIT_SUCCESS);
+
 			} else if(argv[start_argv][1] == 'f') {
 
 				if(start_argv + 1 < argc)
@@ -94,7 +103,6 @@ int main(int argc, char *argv[]) {
 
 	/* check if path of config file has not been passed via command line */
 	path = get_config_path(path, pbuf, sizeof(pbuf));
-	
 	if(!quiet)
 		fprintf(stderr, LOG_PREFIX "config file found: %s\n", path);
 
@@ -107,6 +115,7 @@ int main(int argc, char *argv[]) {
 	// search DLL
 	set_own_dir(argv[0]);
 
+	i = 0;
 	while(dll_dirs[i]) {
 		snprintf(buf, sizeof(buf), "%s/%s", dll_dirs[i], dll_name);
 		if(access(buf, R_OK) != -1) {
@@ -117,7 +126,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	if(!prefix) {
-		fprintf(stderr, "couldnt locate %s\n", dll_name);
+		fprintf(stderr, "couldn't locate %s\n", dll_name);
 		return EXIT_FAILURE;
 	}
 
@@ -125,12 +134,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 [hqv] [-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
@@ -64,6 +73,24 @@ tcp_connect_time_out 8000
 ## 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')
@@ -77,12 +104,13 @@ tcp_connect_time_out 8000
 #	        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;}'