113 Commits

Author SHA1 Message Date
Adam Hamsik 5294214150 Fix merge error. 2012-06-18 15:46:22 +02:00
Adam Hamsik 385b349a8e Add support for both i386 and amd64 in mac os x binary. 2012-06-18 15:45:45 +02:00
Adam Hamsik 2320f6608a Merge rofl0r changes to main stream. 2012-06-16 12:10: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
Jahrome 229eb7cc5a bugfix: localnet never used if no port specified. Fix typo. 2012-05-22 23:11:03 +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
rofl0r 45f50ac754 cosmetic fix 2012-04-24 02:04:02 +02:00
rofl0r d72e668767 use sane defaults 2012-04-24 01:48:17 +02:00
rofl0r 561679fbcd remove dead code 2012-04-24 01:46:57 +02:00
rofl0r bc23ef8f46 fix debug message 2012-04-23 22:56:44 +02:00
rofl0r 88a54e872a use dynloader to call init() func when gcc is available, and lock it properly 2012-04-23 22:21:40 +02:00
rofl0r caed782652 macros 2012-04-23 22:21:40 +02:00
rofl0r f55c6bc4d5 fix PDEBUG macro 2012-04-23 22:21:40 +02:00
rofl0r 49293b180d some cleanup in core.h 2012-04-23 20:26:13 +02:00
rofl0r 3260ee812a debloat init_lib() 2012-04-23 19:51:14 +02:00
rofl0r 1000366f88 Makefile: create destination dirs in case they do not exist 2012-03-07 18:05:04 +01:00
rofl0r 598a41a671 Makefile: add support for DESTDIR 2012-03-07 18:02:37 +01:00
Jianing Yang 65471b750c bugfix: localnet conflicts with proxydns 2012-03-07 17:58:37 +01: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
rofl0r 03b49f529e fix bogus use of ! in configure 2012-01-30 18:35:03 +01:00
rofl0r e99dd76941 complete sysconfdir support 2012-01-30 18:29:35 +01:00
rofl0r 0ee539f31c added support for --sysconfdir 2012-01-30 18:26:38 +01:00
rofl0r f4e4c8c2b1 remove unnecessary sprintf call 2012-01-29 02:34:04 +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. proxychains-4.0.1 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
rofl0r dbb172b510 use PROXYCHAINS_CONF_FILE consistently 2012-01-28 18:34:40 +01:00
rofl0r 48373ab7a5 fix forgotten etc 2012-01-28 18:33:40 +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