Commit Graph

28 Commits

Author SHA1 Message Date
Jianing Yang 6dda28a2c8 bugfix: localnet conflicts with proxydns 2012-03-03 14:24:05 +08: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 5b5cc604a6 remove dangerous uses of inet_ntoa 2012-01-27 20:00:22 +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
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 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 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
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
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
Adam Hamsik 9a29a4c0d1 Merge pull request #3 from rofl0r/master
everything works as expected now.
2012-01-11 01:43:46 -08:00
Adam Hamsik ca599cbc86 Fix localnet issue with fix suggested in #issue 4 on github. 2012-01-10 15:53:03 +01:00
rofl0r a6d778a0f1 cleanup debug code and remove warnings 2011-11-06 23:35:57 +01:00
rofl0r 41e73ab58d fix realloc and add a layer of threadsafety upon dns-list accesses 2011-11-06 17:46:11 +01:00
rofl0r 5de7fa20c8 implemented remote proxy dns lookup via use of reserved ip ranges and a lookup table 2011-11-06 14:12:50 +01:00
rofl0r b8bdfc2d5e care about HOME also in proxychains loader. put common symbols in common.h 2011-09-10 22:32:27 +02:00
rofl0r 4d517cdfb0 exact fix for the wrong getnameinfo prototype in GLIBC < 2.14 2011-09-04 18:13:30 +02:00
rofl0r 218d242aab some cosmetic changes 2011-09-04 02:03:47 +02:00
rofl0r 5095296ddf fixed a couple of bugs, warnings, added basic gethostbyaddr support and a plain Makefile 2011-09-04 01:45:16 +02:00
rofl0r 86be015f0d remove gnu autocrap 2011-09-02 20:32:04 +02:00