30 Commits

Author SHA1 Message Date
Adam Hamsik 2ec9e1d7ca Install proxyresolv and proxychains script along with proxychains library and proxychains4 binary. 2024-01-02 12:23:22 +01:00
Adam Hamsik b42945b771 Add labels to keep issues/pr from stale 2024-01-02 10:13:18 +01:00
Adam Hamsik 80dc652d55 Some fixes 2023-12-29 02:10:25 +01:00
Adam Hamsik bc653b680b change linux ping args 2023-12-29 01:38:31 +01:00
Adam Hamsik 5cd04b70ca Fix issue with libproxychains library naming on mac os. 2023-12-29 01:35:27 +01:00
Adam Hamsik 87733ca08a Fix config 2023-12-29 01:08:17 +01:00
Adam Hamsik e04cdc351f Add some tests 2023-12-29 01:05:13 +01:00
Adam Hamsik 564bb6ac03 Remove travis ci, update readme badge 2023-12-29 00:31:28 +01:00
Adam Hamsik c7181350f5 add macos-latest build 2023-12-29 00:20:47 +01:00
Adam Hamsik 4993ada3e5 Add mac os build 2023-12-29 00:01:59 +01:00
Adam Hamsik 357e4235ed Add version flag. 2023-12-28 23:57:40 +01:00
Adam Hamsik ccd3c34662 Update issue templates 2023-12-28 20:22:51 +01:00
Adam Hamsik 8d666c81b0 Create stale.yml 2023-12-28 19:46:45 +01:00
Adam Hamsik 1103af27b0 Update github build-ci workflow, add support for multiple macos archs[done by @thehappydinoa] 2023-12-28 19:39:55 +01:00
Adam Hamsik 59326e6bc3 Create super-linter.yml 2023-12-28 19:37:55 +01:00
Adam Hamsik 912c63136b Create buildci.yml 2023-12-28 19:37:23 +01:00
Adam Hamsik 96c9f917c0 Print version string if not arguments are given. 2023-12-28 19:21:50 +01:00
Adam Hamsik 0362e8a560 Merge pull request #132 from BlueSkyDetector/pr-update_readme_about_socks5_vars
Update README.adoc about socks5 environment variable
2023-12-28 19:07:01 +01:00
Adam Hamsik e3e27132b4 Merge pull request #150 from Freed-Wu/master
Add zsh completion script
2023-12-28 19:04:37 +01:00
Wu Zhenyu 02409fba79 Add zsh completion script
Refer <https://www.gnu.org/software/automake/manual/automake.html#Third_002dParty-Makefiles>, use install-exec
2023-04-05 18:30:55 +08:00
Takanori Suzuki a6d99f7dbe Update README.adoc about socks5 environment variable 2022-05-06 07:43:40 +09:00
Adam Hamsik 1f04b93d35 Merge pull request #129 from sosamuel/patch-1
Update README.adoc
2022-03-26 12:00:31 +01:00
Adam Hamsik 5597c2a5a2 Merge pull request #115 from 7c6f434c/patch-1
Reinitialise i before using it for iterating over dll_dirs
2022-03-26 12:00:18 +01:00
Adam Hamsik 0ef3d6d5c8 Merge pull request #112 from sorki/fixWarnings
fix GCC strncpy warnings
2022-03-26 11:58:34 +01:00
Adam Hamsik 8aa0ed2549 Merge pull request #121 from specialpointcentral/master
Fix GCC errors in DEBUG mode
2022-03-26 11:57:59 +01:00
Samuel Chia a00e7386f6 Update README.adoc
update pkgsrc-wip  homepage link.
2022-03-25 16:28:07 +08:00
Jack Hu d99c64bb78 Fix GCC errors in DEBUG mode
When we open debug mode(`./configure --devel`),
GCC will check `sign-conversion` and `conversion`.
It will cause some warnings.

Also add `-DDEBUG` to `CFLAGS` if we open debug
mode. This can open `PDEBUG()` and help you to get
detail information.

Signed-off-by: Jack Hu <spcreply@126.com>
2021-09-05 17:13:12 +08:00
Michael Raskin 3b1aac2084 Reinitialise i before using it for iterating over dll_dirs
Previously, the value of it was kept from the loop over all the command-line arguments; as `/usr/lib` or `/lib` were far enough in the list, on many systems there was no difference, but `own_dir` and `LIB_DIR` could be ignored or not based on the argument count, which was confusing.
2021-03-31 07:46:58 +00:00
Richard Marko 412ef4235b fix GCC strncpy warnings
Recent GCC added checks for this and it triggers `Werror` with

```
In function 'strncpy',
    inlined from 'proxy_gethostbyname' at src/core.c:832:2:
/nix/store/hayaj8q9rc7swx4llcjqymmg3zr525lx-glibc-2.32-25-dev/include/bits/string_fortified.h:91:10: error: '__builtin_strncpy' specified bound 8192 equals destination size [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wstringop-truncation-Werror=stringop-truncation8;;]
   91 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
    inlined from 'proxy_getaddrinfo' at src/core.c:917:3:
/nix/store/hayaj8q9rc7swx4llcjqymmg3zr525lx-glibc-2.32-25-dev/include/bits/string_fortified.h:91:10: error: '__builtin_strncpy' specified bound 256 equals destination size [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wstringop-truncation-Werror=stringop-truncation8;;]
   91 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
```
2021-02-13 11:14:08 +01:00
Adam Hamsik 148b851d10 Update mac os build. 2021-02-08 11:36:04 +01:00
20 changed files with 291 additions and 91 deletions
+24
View File
@@ -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.
+20
View File
@@ -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.
+55
View File
@@ -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
+31
View File
@@ -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'
+29
View File
@@ -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 }}
+1 -1
View File
@@ -5,7 +5,7 @@
.deps/
.libs/
.*
src/*.d
# Autoconf stuff
libtool
config.*
-16
View File
@@ -1,16 +0,0 @@
# Enable C support
language: c
# OS selection
os:
- linux
- osx
# Compiler selection
compiler:
- clang
- gcc
# Build steps
script:
- ./configure
- make
+1 -1
View File
@@ -8,7 +8,7 @@ rofl0r.
https://github.com/rofl0r/proxychains
localnet, bugfixes, macos x support, bsd support, packaging
adam hamsik.
haad.
https://github.com/haad/proxychains
localnet-port, bugfixes
+23 -7
View File
@@ -9,9 +9,11 @@ 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)
@@ -25,14 +27,11 @@ 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
@@ -43,18 +42,35 @@ 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: 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) $(DESTDIR)/$(bindir)/
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-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)
@@ -70,6 +86,6 @@ $(LDSO_PATHNAME): $(LOBJS)
$(ALL_TOOLS): $(OBJS)
$(CC) src/main.o src/common.o -o $(PXCHAINS)
.PHONY: all clean install install-config
.PHONY: all clean install install-exec install-config install-zsh-completion
-include $(DEPS)
+52 -45
View File
@@ -1,6 +1,7 @@
= ProxyChains ver. 4.3.0 README
# ProxyChains ver. 4.3.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
@@ -10,12 +11,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 behaviour, so you have to pass the resolved ip address
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.
@@ -25,13 +26,13 @@ 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
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
## Installation
=== Using release version
### 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
@@ -40,28 +41,28 @@ pkgsrc-wip repository and run
in a wip/proxychains directory.
You can find out more about pkgsrc on link:http://www.pkgsrc.org[pkgsrc] and about pkgsrc-wip on
link:http://pkgsrc-wip.sourceforge.net[Pkgsrc-wip homepage]
link:https://pkgsrc.org/wip[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.
@@ -79,24 +80,28 @@ 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 )
@@ -104,18 +109,20 @@ it supports SOCKS4, SOCKS5 and HTTP CONNECT proxy servers.
* 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
## Configuration
proxychains looks for configuration in the following order:
* SOCKS5 proxy port in environment variable ${PROXYCHAINS_SOCKS5}
(if set, no further configuration will be searched)
* 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
@@ -124,49 +131,49 @@ proxychains looks for configuration in the following order:
see more in */etc/proxychains.conf*
=== Usage Example
### Usage Example
----
$ proxychains telnet targethost.com
----
```
$ proxychains4 telnet targethost.com
```
in this example it will run telnet through proxy(or chained proxies)
specified by *proxychains.conf*
=== Usage Example
### Usage Example
----
$ proxychains -f /etc/proxychains-other.conf targethost2.com
----
```
$ 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
### 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=4321 proxychains zsh
----
$ 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:
### Usage Example:
----
```
$ export PROXY_DNS_SERVER=8.8.8.8
$ proxychains telnet targethost.com
----
$ 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
+6 -2
View File
@@ -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
+3
View File
@@ -0,0 +1,3 @@
#compdef proxychains4
_arguments -s -S '1: :{_command_names -e}' '*:: :_normal'
Vendored
+8 -4
View File
@@ -80,7 +80,7 @@ if [ -z "$CC" ] ; then
fi
if [ $develflg -eq 1 ]; then
CFLAGS="-Wextra -Wunused -Wuninitialized -Wconversion -fno-common -g -O0"
CFLAGS="-Wextra -Wunused -Wuninitialized -Wconversion -fno-common -g -O0 -DDEBUG"
fi
echo CC?=$CC>config.mak
@@ -96,10 +96,13 @@ 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
@@ -117,3 +120,4 @@ fi
echo done, now run make \&\& make install
+13
View File
@@ -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
+2 -2
View File
@@ -1,13 +1,13 @@
Begin3
Title: ProxyChains
Version: 4.0
Version: 4.3
Entered-date:
Description:
Keywords:
Author: <N37CR347UR3>
Maintained-by: <haad@netbsd.org>
Primary-site:
Home-page: http://proxychains.sourceforge.net
Home-page: https://github.com/haad/proxychains
Original-site:
Platforms: Linux and other Unices
Copying-policy: GNU Public License
+2 -1
View File
@@ -1,4 +1,5 @@
#include "common.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
@@ -48,6 +49,6 @@ char *get_config_path(char* default_path, char* pbuf, size_t bufsize) {
return path;
err:
perror("couldnt find configuration file");
perror("couldn't find configuration file");
exit(1);
}
+4 -4
View File
@@ -528,7 +528,7 @@ unsigned int get_rand_int(unsigned int range){
return (randval % range);
} else {
srand((unsigned int)time(NULL));
return (rand() % range);
return ((unsigned int)rand() % range);
}
}
@@ -829,7 +829,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));
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);
@@ -906,7 +906,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(atoi(service ? service : "0"));
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;
@@ -914,7 +914,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));
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;
+2 -2
View File
@@ -335,14 +335,14 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
if(dnat_orig_port[0]) {
dnats[num_dnats].orig_port =
(short) atoi(dnat_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 =
(short) atoi(dnat_new_port);
(unsigned short) atoi(dnat_new_port);
} else {
dnats[num_dnats].new_port = 0;
}
+14 -5
View File
@@ -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-f allows to manually specify a configfile to use\n"
"\tfor example : proxychains telnet somehost.com\n" "More help in README file\n\n", argv[0]);
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;
}
@@ -77,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)
@@ -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;
}
+1 -1
View File
@@ -4,7 +4,7 @@ echo "ProxyChains-4.0 (https://github.com/haad/proxychains)"
usage() {
echo " usage:"
echo " $0 [hq] [-f config-file] <prog> [args]"
echo " $0 [hqv] [-f config-file] <prog> [args]"
echo " -q make proxychains quiet"
exit
}