.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,24 +0,0 @@
----
-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

@@ -1,20 +0,0 @@
----
-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

@@ -1,55 +0,0 @@
-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

@@ -1,31 +0,0 @@
-# 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

@@ -1,29 +0,0 @@
-# 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

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

.travis.yml

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

AUTHORS

@@ -8,7 +8,7 @@ rofl0r.
 https://github.com/rofl0r/proxychains
 
 localnet, bugfixes, macos x support, bsd support, packaging
-haad.
+adam hamsik.
 https://github.com/haad/proxychains
 
 localnet-port, bugfixes

Makefile

@@ -9,11 +9,9 @@ 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)
@@ -27,11 +25,14 @@ PIC     = -fPIC
 AR      = $(CROSS_COMPILE)ar
 RANLIB  = $(CROSS_COMPILE)ranlib
 
-LD_SET_SONAME = -Wl
+LDSO_SUFFIX = so
+LD_SET_SONAME = -Wl,-soname=
 INSTALL_FLAGS = -D -m
 
 -include config.mak
 
+LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
+
 SHARED_LIBS = $(LDSO_PATHNAME)
 ALL_LIBS = $(SHARED_LIBS)
 PXCHAINS = proxychains4
@@ -42,35 +43,18 @@ 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)\"
 
-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:
-
-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) 755 $(ALL_TOOLS) $(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-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)
@@ -86,6 +70,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 install-config
 
 -include $(DEPS)

README.adoc

@@ -1,7 +1,6 @@
-# ProxyChains ver. 4.3.0 README
+= ProxyChains ver. 4.2.0 README
-
-![build-badge](https://github.com/haad/proxychains/actions/workflows/buildci.yml/badge.svg)
 
+image:https://travis-ci.org/haad/proxychains.svg?branch=master["Build Status", link="https://travis-ci.org/haad/proxychains"]
 
 ProxyChains is a UNIX program, that hooks network-related libc functions
 in dynamically linked programs via a preloaded DLL and redirects the
@@ -11,12 +10,12 @@ 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
+== 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
+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.
@@ -26,43 +25,43 @@ 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
+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
+== Installation
 
-### Using release version
+=== Using release version
 
-*Proxychains-4.3.0* are available with pkgsrc to everyone using it on _Linux_,
+*Proxychains-4.2.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
+You can find out more about pkgsrc on link:www.pkgsrc.org[pkgsrc] and about pkgsrc-wip on
-link:https://pkgsrc.org/wip[Pkgsrc-wip homepage]
+link:http://pkgsrc-wip.sourceforge.net[Pkgsrc-wip homepage]
 
-### Installing on Mac OS X with homebrew
+=== 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
+=== Running Current Source code version
 
-```
+----
 # needs a working C compiler, preferably gcc
 ./configure
 make
 sudo make install
-```
+----
 
-## Changelog
+== Changelog
 
 *Version (4.x)* removes the dnsresolver script which required a dynamically
 linked "dig" binary to be present with remote DNS lookup.
@@ -80,49 +79,43 @@ it supports SOCKS4, SOCKS5 and HTTP CONNECT proxy servers.
  ** socks - "user/pass",
  ** http - "basic"
 
-## When to use it
+== 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
+=== 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).
+  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
+== Configuration
 
 proxychains looks for configuration in the following order:
 
-* SOCKS5 proxy host ip and port in environment variable ${PROXYCHAINS_SOCKS5_HOST} ${PROXYCHAINS_SOCKS5_PORT}
+* SOCKS5 proxy port in environment variable ${PROXYCHAINS_SOCKS5}
-  (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")
+  (if set, no further configuration will be searched)
 * file listed in environment variable ${PROXYCHAINS_CONF_FILE} or
   provided as a -f argument to proxychains script or binary.
 * ./proxychains.conf
@@ -131,49 +124,49 @@ proxychains looks for configuration in the following order:
 
 see more in */etc/proxychains.conf*
 
-### Usage Example
+=== Usage Example
 
-```
+----
-$ proxychains4 telnet targethost.com
+$ proxychains telnet targethost.com
-```
+----
 
 in this example it will run telnet through proxy(or chained proxies)
 specified by *proxychains.conf*
 
-### Usage Example
+=== Usage Example
 
-```
+----
-$ proxychains4 -f /etc/proxychains-other.conf targethost2.com
+$ 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
+=== Usage Example
 
-```
+----
 $ proxyresolv targethost.com
-```
+----
 
 in this example it will resolve targethost.com through proxy(or chained proxies)
 specified by *proxychains.conf*
 
-### Usage Example:
+=== Usage Example:
 
-```
+----
 $ ssh -fN -D 4321 some.example.com
-$ PROXYCHAINS_SOCKS5_HOST=127.0.0.1 PROXYCHAINS_SOCKS5_PORT=4321 proxychains zsh
+$ PROXYCHAINS_SOCKS5=4321 proxychains zsh
-```
+----
 
 in this example, it will run a shell with all traffic proxied through
 OpenSSH's "dynamic proxy" (SOCKS5 proxy) on localhost port 4321.
 
-### Usage Example:
+=== Usage Example:
 
-```
+----
 $ export PROXY_DNS_SERVER=8.8.8.8
-$ proxychains4 telnet targethost.com
+$ proxychains telnet targethost.com
-```
+----
 
 in this example, it will telnet to targethost.com using the 8.8.8.8
 nameserver supplied by the user through the PROXY_DNS_SERVER

TODO

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

completions/zsh/_proxychains4

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

configure

@@ -80,7 +80,7 @@ if [ -z "$CC" ] ; then
 fi
 
 if [ $develflg -eq 1 ]; then
-	CFLAGS="-Wextra -Wunused -Wuninitialized -Wconversion -fno-common -g -O0 -DDEBUG"
+	CFLAGS="-Wextra -Wunused -Wuninitialized -Wconversion -fno-common -g -O0"
 fi
 
 echo CC?=$CC>config.mak
@@ -96,13 +96,10 @@ echo includedir=$includedir>>config.mak
 echo sysconfdir=$sysconfdir>>config.mak
 
 if ismac ; then
-	arch=`uname -m`
-
-	echo LDSO_SUFFIX=dylib>>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 OS_CFLAGS+=-DIS_MAC=1 -arch x86_64 -arch i386 >>config.mak
+	echo OS_LDFLAGS+=-arch x86_64 -arch i386 -lpthread -ldl -Wl,>>config.mak
+	echo LD_SET_SONAME=-install_name,>>config.mak
 	echo INSTALL_FLAGS=-m>>config.mak
 fi
 
@@ -120,4 +117,3 @@ fi
 
 echo done, now run make \&\& make install
 
-

dist/proxychains.conf

@@ -1,13 +0,0 @@
-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

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

src/common.c

@@ -1,5 +1,4 @@
 #include "common.h"
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -49,6 +48,6 @@ char *get_config_path(char* default_path, char* pbuf, size_t bufsize) {
 		return path;
 
 err:
-	perror("couldn't find configuration file");
+	perror("couldnt find configuration file");
 	exit(1);
 }

src/common.h

@@ -7,7 +7,7 @@
 #define LOG_PREFIX "[proxychains] "
 
 #define PROXYCHAINS_VERSION_MAJOR 4
-#define PROXYCHAINS_VERSION_MINOR 3
+#define PROXYCHAINS_VERSION_MINOR 1
 #define PROXYCHAINS_VERSION_BUGFIX 0
 
 #include <stddef.h>

src/core.c

@@ -278,10 +278,6 @@ static int tunnel_to(int sock, ip_type ip, unsigned short port, proxy_type pt, c
 	//memset (buff, 0, sizeof(buff));
 
 	switch (pt) {
-		case RAW_TYPE: {
-			return SUCCESS;
-		}
-		break;
 		case HTTP_TYPE:{
 				if(!dns_len) {
 					inet_ntop(AF_INET, &ip.octet[0], ip_buf, sizeof(ip_buf));
@@ -528,7 +524,7 @@ unsigned int get_rand_int(unsigned int range){
 	return (randval % range);
     } else {
 	srand((unsigned int)time(NULL));
-	return ((unsigned int)rand() % range);
+	return (rand() % range);
     }
 }
 
@@ -829,7 +825,7 @@ struct hostent *proxy_gethostbyname(const char *name, struct gethostbyname_data*
 
 	MUTEX_UNLOCK(&internal_ips_lock);
 
-	strncpy(data->addr_name, name, sizeof(data->addr_name) - 1);
+	strncpy(data->addr_name, name, sizeof(data->addr_name));
 
 	data->hostent_space.h_name = data->addr_name;
 	data->hostent_space.h_length = sizeof(in_addr_t);
@@ -906,7 +902,7 @@ int proxy_getaddrinfo(const char *node, const char *service, const struct addrin
 	if(service)
 		proxy_getservbyname(service, &se_buf, buf, sizeof(buf), &se);
 
-	port = se ? se->s_port : htons((uint16_t)atoi(service ? service : "0"));
+	port = se ? se->s_port : htons(atoi(service ? service : "0"));
 	((struct sockaddr_in *) &space->sockaddr_space)->sin_port = (in_port_t)port;
 
 	*res = p = &space->addrinfo_space;
@@ -914,7 +910,7 @@ int proxy_getaddrinfo(const char *node, const char *service, const struct addrin
 
 	p->ai_addr = &space->sockaddr_space;
 	if(node)
-		strncpy(space->addr_name, node, sizeof(space->addr_name) - 1);
+		strncpy(space->addr_name, node, sizeof(space->addr_name));
 	p->ai_canonname = space->addr_name;
 	p->ai_next = NULL;
 	p->ai_family = space->sockaddr_space.sa_family = AF_INET;

src/core.h

@@ -20,7 +20,6 @@
 #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];
@@ -67,7 +66,6 @@ typedef enum {
 
 typedef enum {
 	HTTP_TYPE,
-	RAW_TYPE,
 	SOCKS4_TYPE,
 	SOCKS5_TYPE
 } proxy_type;
@@ -95,11 +93,6 @@ typedef struct {
 	unsigned short port;
 } localaddr_arg;
 
-typedef struct {
-	struct in_addr orig_dst, new_dst;
-	unsigned short orig_port, new_port;
-} dnat_arg;
-
 typedef struct {
 	ip_type ip;
 	unsigned short port;

src/libproxychains.c

@@ -66,8 +66,6 @@ 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;
@@ -190,8 +188,6 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 	char *env;
 	char local_in_addr_port[32];
 	char local_in_addr[32], local_in_port[32], local_netmask[32];
-	char dnat_orig_addr_port[32], dnat_new_addr_port[32];
-	char dnat_orig_addr[32], dnat_orig_port[32], dnat_new_addr[32], dnat_new_port[32];
 	FILE *file = NULL;
 
 	if(proxychains_got_chain_data)
@@ -221,8 +217,6 @@ 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")) {
@@ -303,55 +297,6 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 					proxychains_quiet_mode = 1;
 				} else if(strstr(buff, "proxy_dns")) {
 					proxychains_resolver = 1;
-				} else if(strstr(buff, "dnat")) {
-					if(sscanf(buff, "%s %21[^ ] %21s\n", user, dnat_orig_addr_port, dnat_new_addr_port) < 3) {
-						fprintf(stderr, "dnat format error");
-						exit(1);
-					}
-					/* clean previously used buffer */
-					memset(dnat_orig_port, 0, sizeof(dnat_orig_port) / sizeof(dnat_orig_port[0]));
-					memset(dnat_new_port, 0, sizeof(dnat_new_port) / sizeof(dnat_new_port[0]));
-
-					(void)sscanf(dnat_orig_addr_port, "%15[^:]:%5s", dnat_orig_addr, dnat_orig_port);
-					(void)sscanf(dnat_new_addr_port, "%15[^:]:%5s", dnat_new_addr, dnat_new_port);
-
-					if(num_dnats < MAX_DNAT) {
-						int error;
-						error =
-						    inet_pton(AF_INET, dnat_orig_addr,
-							      &dnats[num_dnats].orig_dst);
-						if(error <= 0) {
-							fprintf(stderr, "dnat original destination address error\n");
-							exit(1);
-						}
-
-						error =
-						    inet_pton(AF_INET, dnat_new_addr,
-							      &dnats[num_dnats].new_dst);
-						if(error <= 0) {
-							fprintf(stderr, "dnat effective destination address error\n");
-							exit(1);
-						}
-
-						if(dnat_orig_port[0]) {
-							dnats[num_dnats].orig_port =
-							    (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);
-					}
 				}
 			}
 		}
@@ -405,8 +350,6 @@ int connect(int sock, const struct sockaddr *addr, socklen_t 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;
@@ -430,29 +373,6 @@ int connect(int sock, const struct sockaddr *addr, socklen_t len) {
 	// check if connect called from proxydns
         remote_dns_connect = (ntohl(p_addr_in->s_addr) >> 24 == remote_dns_subnet);
 
-	// more specific first
-	for(i = 0; i < num_dnats && !remote_dns_connect && !dnat; i++)
-		if(dnats[i].orig_dst.s_addr == p_addr_in->s_addr)
-			if(dnats[i].orig_port && (dnats[i].orig_port == port))
-				dnat = &dnats[i];
-
-	for(i = 0; i < num_dnats && !remote_dns_connect && !dnat; i++)
-		if(dnats[i].orig_dst.s_addr == p_addr_in->s_addr)
-			if(!dnats[i].orig_port)
-				dnat = &dnats[i];
-
-	if (dnat) {
-		if (dnat->new_port)
-			new_addr.sin_port = htons(dnat->new_port);
-		else
-			new_addr.sin_port = htons(port);
-		new_addr.sin_addr = dnat->new_dst;
-
-		addr = (struct sockaddr *)&new_addr;
-		p_addr_in = &((struct sockaddr_in *) addr)->sin_addr;
-		port = ntohs(((struct sockaddr_in *) addr)->sin_port);
-	}
-
 	for(i = 0; i < num_localnet_addr && !remote_dns_connect; i++) {
 		if((localnet_addr[i].in_addr.s_addr & localnet_addr[i].netmask.s_addr)
 		   == (p_addr_in->s_addr & localnet_addr[i].netmask.s_addr)) {

src/main.c

@@ -26,14 +26,10 @@
 #include "common.h"
 
 static int usage(char **argv) {
-	printf( "\nProxychains4: %d.%d.%d\n"
+	printf("\nUsage:\t%s -q -f config_file program_name [arguments]\n"
-			"Usage:\t%s -q -f config_file program_name [arguments]\n"
+	       "\t-q makes proxychains quiet - this overrides the config setting\n"
-			"\t-v print version and exit\n"
+	       "\t-f allows to manually specify a configfile to use\n"
-	       	"\t-q makes proxychains quiet - this overrides the config setting\n"
+	       "\tfor example : proxychains telnet somehost.com\n" "More help in README file\n\n", argv[0]);
-	       	"\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;
 }
 
@@ -81,10 +77,6 @@ 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)
@@ -115,7 +107,6 @@ 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) {
@@ -126,7 +117,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	if(!prefix) {
-		fprintf(stderr, "couldn't locate %s\n", dll_name);
+		fprintf(stderr, "couldnt locate %s\n", dll_name);
 		return EXIT_FAILURE;
 	}
 

src/proxychains

@@ -4,7 +4,7 @@ echo "ProxyChains-4.0 (https://github.com/haad/proxychains)"
 usage() {
 
 	echo "	usage:"
-	echo "	$0 [hqv] [-f config-file] <prog> [args]"
+	echo "	$0 [hq] [-f config-file] <prog> [args]"
 	echo "		-q make proxychains quiet"
 	exit
 }

src/proxychains.conf

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