Commit Graph

92 Commits

Author SHA1 Message Date
Adam Hamsik
c14bf58cd7 Add support for both i386 and amd64 in mac os x binary. 2012-06-18 15:46:41 +02:00
Michel Oosterhof
251fd7cd4a Only enable loopback localnet by default, not private address range. 2012-06-16 12:04:28 +02:00
Michel Oosterhof
b0d9d1da41 Enable localnet by default for loopback and private address ranges. 2012-06-16 12:04:23 +02:00
Michel Oosterhof
a7831a8f53 Typo fix. 2012-06-16 12:02:51 +02:00
Adam Hamsik
c9b8ce35b2 Merge pull request #16 from jahrome/master
Hi ! Nice job with localnet, just what I was needing, here is just a small fix. Hope this helps.
2012-05-22 06:07:35 -07:00
Jahrome
63c3a4b0d2 bugfix: localnet never used if no port specified. Fix typo. 2012-05-22 14:25:53 +02:00
Adam Hamsik
4d40a4790f Merge pull request #15 from jianingy/master
bugfix: localnet conflicts with proxydns
2012-03-04 23:21:43 -08:00
Jianing Yang
50820ce80d new: added DESTDIR option to Makefile so that packaging will be easier 2012-03-03 14:57:49 +08:00
Jianing Yang
b6746997d2 bugfix: localnet conflicts with proxydns (fixed bytes-order) 2012-03-03 14:30:14 +08:00
Jianing Yang
6dda28a2c8 bugfix: localnet conflicts with proxydns 2012-03-03 14:24:05 +08:00
Adam Hamsik
fb3d8e04a1 Change example config version to 4. 2012-03-02 12:57:05 +01:00
Adam Hamsik
0938a940c5 Create install destionation directories first with install -d. 2012-01-28 23:10:40 +01:00
Adam Hamsik
788ffd9d26 Use standard PROXYCHAINS_CONF_FILE instead of hardcoded config name. 2012-01-28 19:51:23 +01:00
Adam Hamsik
99dcfe085e Change proxychains script to add different ways of usage.
To run a command from shell use
proxychains -f {config_file} {command}

To turn proxychains on for all processes inside your shell use
. proxychains on
. proxychains off
2012-01-28 19:47:56 +01:00
Adam Hamsik
89e8bfddf4 Add etc/ to path where we search for config file. 2012-01-28 18:18:58 +01:00
Adam Hamsik
adb13c7e79 Check for default config file in 2 locations /etc/ and {install_prefix}/etc. 2012-01-28 16:56:47 +01:00
Adam Hamsik
2250ef66a8 Make proxychains working on Mac OS X, build universal binaries to make older
versions of Mac OS X working. Make both proxychains shell script and proxychains program working.

Tested on my 10.7.3
2012-01-28 14:01:28 +01:00
Adam Hamsik
e991cabb94 Merge rofl0r updates to bring both forks of proxychains to same base and to not diverge them more then they are now.
Merge branch 'master' of https://github.com/rofl0r/proxychains into rofl0r-master

Conflicts:
	Makefile
	src/core.c
	src/core.h
	src/libproxychains.c
	src/main.c
2012-01-28 00:16:53 +01:00
rofl0r
070051bb73 use macros for mutex stuff 2012-01-27 21:30:42 +01:00
rofl0r
c36db11ebc complete mac support 2012-01-27 20:48:24 +01:00
rofl0r
6d25f5d89e allow dll suffix to be passed from ./configure 2012-01-27 20:30:44 +01:00
rofl0r
9c83402d37 detect MAC in configure 2012-01-27 20:21:06 +01:00
rofl0r
5b5cc604a6 remove dangerous uses of inet_ntoa 2012-01-27 20:00:22 +01:00
rofl0r
526fb8b410 pass dll_name to proxychains app, makes it easier to port to MAC 2012-01-27 19:31:01 +01:00
rofl0r
2acdcd9707 pass install prefix to proxychains app, to find /etc 2012-01-27 19:28:00 +01:00
rofl0r
3bb03892fa remove superfluous DEBUG checks 2012-01-27 19:14:17 +01:00
rofl0r
e32ef26fec ran indent tool on the source code
now everythings finally correctly indented and future patches
will not be overshadowed by whitespace noise.
used the following settings
--braces-on-func-def-line
--braces-on-struct-decl-line
--braces-on-if-line
--dont-break-procedure-type
--leave-preprocessor-space
--continue-at-parentheses
-linux
-i8
-brace-indent1
--case-indentation8
--space-after-cast
--line-length120
--no-space-after-for
--no-space-after-if
--no-space-after-while
--leave-optional-blank-lines
--ignore-profile
--space-special-semicolon
--indent-label8
2012-01-27 19:03:21 +01:00
rofl0r
80817dbf6f fix *all* trailing whitespace at once 2012-01-27 17:55:37 +01:00
rofl0r
73c4195ce3 remove magic number 2012-01-27 17:50:04 +01:00
rofl0r
cce902b301 eliminate dead code 2012-01-27 17:48:41 +01:00
Adam Hamsik
d28cf03c61 Replace inet_ntoa which is not thread safe by re-entrant threadsafe inet_ntop. 2012-01-27 16:26:51 +01:00
Adam Hamsik
952a039801 Pull some fixes from proxychains sf forum. 2012-01-27 15:41:40 +01:00
Adam Hamsik
8d9bb5545c Check variable install/etc directory for proxychains config. Fix for #12 on github reported by sheepdestroyer. 2012-01-27 15:28:25 +01:00
Adam Hamsik
f512779539 Replace homegrown pc_stringfromipv4 standard libc inet_ntoa, this should be available on all libcs (musl checked). Reenable accidentaly disabled THREAD_SAFE. 2012-01-27 14:35:00 +01:00
Adam Hamsik
f53119773a remove cdefs.h from include, fix non THREAD_SAFE build, do some more PDEBUG cleanup. 2012-01-27 14:02:36 +01:00
Adam Hamsik
2f9a9cf0b0 Remove -Wextra which is unsupported on old gcc. 2012-01-26 16:41:48 +01:00
Adam Hamsik
cdec339f11 Remove THREAD_SAFE ifdefs and use macros for it. Is there any reason to not require threads by default ? 2012-01-26 15:41:48 +01:00
Adam Hamsik
fe8672eab6 Merge branch 'master' of github.com:haad/proxychains 2012-01-26 15:17:28 +01:00
Adam Hamsik
d9341a8c74 Add some more code checking to CCFLAGS, remove unnecessary ifdef's 2012-01-26 15:17:12 +01:00
Adam Hamsik
af5163bccf Merge pull request #9 from rofl0r/master
this fixes the getopt issue and makes the subnet for remote dns lookup a config option
2012-01-26 05:57:49 -08:00
rofl0r
b618a4ece3 updated TODO 2012-01-26 13:25:48 +01:00
rofl0r
4da71e1b44 make remote_dns_subnet a config option 2012-01-26 12:44:42 +01:00
Adam Hamsik
1471c5756f Merge branch 'remote-dns' of https://github.com/rofl0r/proxychains into rofl0r-remote-dns
Conflicts:
	Makefile
2012-01-26 10:04:43 +01:00
rofl0r
75d41dea3d use the right tool for the job. getopt clearly isnt 2012-01-26 05:11:52 +01:00
Adam Hamsik
75bd465038 Fix localnet issue with fix suggested in #issue 4 on github. 2012-01-24 08:42:04 +01:00
rofl0r
8fd0d95bc3 add quiet mode to proxychains launcher
this will be passed on to the DLL via a env variable
- additionally, now everything prints to stderr
- fixes a bug which would print DLL init even in quiet mode
- fixed a couple of bugs in argv parsing
2012-01-24 08:26:37 +01:00
rofl0r
b20106ce2e make Makefile simpler and more correct 2012-01-24 07:29:34 +01:00
rofl0r
e5f3422b16 prevent configure-generated config to always overwrite CFLAGS in env 2012-01-24 07:29:04 +01:00
rofl0r
150e624182 add proper feature tests for putenv, getenv 2012-01-24 07:14:45 +01:00
rofl0r
c3a0f677fb fix signedness of hashfunc 2012-01-17 16:09:55 +01:00