bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-24 02:55:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
347 Commits 4 Branches 29 Tags 2.5 MiB
883784dcc3
Commit Graph

251 Commits

Author SHA1 Message Date
z3APA3A
4cb43b438f Use mutex with pam auth, because pam is not thread safe 2016-05-11 19:03:16 +03:00
z3APA3A
cfa4d11027 Do not fail connection with 333 error on configuration reload 2016-04-26 18:50:57 +03:00
z3APA3A
8b1c12005f avoid type mismatch in ?: operator 2016-04-08 15:08:18 +03:00
z3APA3A
3c8c866ac1 Fix counters time check for different platforms 2016-04-08 14:53:15 +03:00
z3APA3A
d3f9d80b65 Resolve races on log buffer without mutex 2016-04-05 19:12:18 +03:00
z3APA3A
1d162abec3 Merge branch 'devel' of https://github.com/z3APA3A/3proxy into devel 2016-04-04 13:43:30 +03:00
z3APA3A
d6f72a51fe fix race condition on 'log' command processing 2016-04-04 13:43:08 +03:00
Vladimir Dubrovin
e210f24194 fix for noforce 2016-04-02 12:00:53 +03:00
Vladimir Dubrovin
9bfae5faaa force / no force commands added 2016-04-02 11:43:25 +03:00
Vladimir Dubrovin
2fed299b9d warning fix 2016-04-02 11:22:33 +03:00
z3APA3A
6cac541e33 fix broken extip functionality 2016-03-30 19:16:12 +03:00
z3APA3A
938b1d1aab re-authenticate connection on configuration change 2016-03-28 17:57:37 +03:00
z3APA3A
eeb2d78fb1 re-authenticate user on 2016-03-28 17:49:27 +03:00
z3APA3A
dcec2cadaa support external username / password up to 128 octets 2016-03-10 17:05:56 +03:00
z3APA3A
f67c9a39f1 Use setreuid/setregid instead of setuid / setgid 2016-03-09 18:28:52 +03:00
z3APA3A
a44a32c484 Do not fail for zero address on SOCKSv5 BIND/UDPASSOC 2016-03-08 13:28:29 +03:00
z3APA3A
b513584fdb More distinct error codes for SOCKS 2016-03-08 12:43:07 +03:00
z3APA3A
5d0504cd33 Always reset bind sa on connect 2016-03-04 13:44:53 +03:00
z3APA3A
58a64924dd log_mutex used prior to initialization 2016-03-02 19:00:28 +03:00
z3APA3A
10a79faa32 publish as devel 2016-02-28 15:10:38 +03:00
z3APA3A
6db42f70e9 fix compilation warnings in PamAuth 2016-02-26 13:15:34 +03:00
z3APA3A
e2351034e6 Change encoding to utf-8 in strings 2016-02-22 22:43:22 +03:00
z3APA3A
57f1140734 Changes in makefiles to support LDAP plugin compilation 2016-02-22 21:46:32 +03:00
z3APA3A
c96d415020 Defer SSL init to first command in ssl_plugin 2016-02-22 21:14:17 +03:00
z3APA3A
604cc22d16 mark as 0.8.4 2016-02-22 00:53:10 +03:00
z3APA3A
01857354c8 Merge remote-tracking branch 'refs/remotes/origin/devel' 2016-02-22 00:22:01 +03:00
z3APA3A
021a8928bf Avoid windows compilation warnings 2016-02-22 00:18:45 +03:00
z3APA3A
cf3bae0f6b Revert "additional memset for hint on retry" 
This reverts commit bb206869de.
 2016-02-22 00:14:54 +03:00
z3APA3A
bb206869de additional memset for hint on retry 2016-02-20 15:45:44 +03:00
z3APA3A
5c5f4e258f Increase default stack size for *nix 2016-02-20 09:11:03 +03:00
z3APA3A
f8a7266bdf Handle malformed HTTP headers without \r 2016-02-19 20:47:56 +03:00
z3APA3A
ad9b0046d9 Fix thread init bug introduced 2016-02-19 20:21:16 +03:00
z3APA3A
b40e8fae4c increase stack size for FreeBSD 2016-02-19 19:44:38 +03:00
z3APA3A
6fcd12cb08 TransparentPlugin - remove debug output 2016-02-19 17:10:15 +03:00
Vladimir Dubrovin
9ddc1fb874 fix *nix warnings 2016-02-18 17:01:18 +03:00
z3APA3A
43a36ec813 Warnings cleanup 2016-02-18 16:43:37 +03:00
z3APA3A
3b8e7741b3 Compilation warnings cleanup 2016-02-16 15:29:51 +03:00
z3APA3A
5fc1d81e5c add stack size configuration 
'stacksize' command and -S configuration option added
 2016-02-11 16:16:44 +03:00
z3APA3A
3680f2d3b1 Do not negotiate handshake for extip redirection 2016-02-08 14:39:29 +03:00
z3APA3A
6713530fda log_mutex init moved to proxymain 2016-02-05 19:04:16 +03:00
z3APA3A
13a7d6be11 Replace memcpy with assignment where appropriate 2016-02-05 18:31:17 +03:00
z3APA3A
3cc9796583 Support for 'extip' and 'smtp' parent types added 2016-02-05 01:52:45 +03:00
z3APA3A
0e168f17f9 Merge remote-tracking branch 'refs/remotes/origin/devel' 2016-01-31 15:08:21 +03:00
z3APA3A
4202cee566 Merge remote-tracking branch 'refs/remotes/origin/devel' 
# Conflicts:
#	src/version.h
 2016-01-31 15:04:22 +03:00
z3APA3A
faf7f665c3 do memset for 'external' sockaddr structures 2016-01-31 15:01:17 +03:00
z3APA3A
485ccb3ab4 publish as devel 2016-01-28 01:21:13 +03:00
z3APA3A
e23dd7b746 minor logging changes 2016-01-28 01:18:16 +03:00
z3APA3A
95efeb8a93 Handle accept() errors more accurate 2016-01-28 01:07:09 +03:00
z3APA3A
43da6cc32b remove premake from makefile 2016-01-28 01:04:25 +03:00
z3APA3A
0473e1b2f7 publish as devel 2016-01-27 23:08:17 +03:00
z3APA3A
975b4ac445 Remove date from copyright notice in proxy.h 2016-01-27 17:56:01 +03:00
z3APA3A
48361db51c Add versioning information only to 3proxy.exe 2016-01-27 17:55:40 +03:00
z3APA3A
0883fb6e34 Show traffic limit in MBs 2016-01-27 15:38:47 +03:00
z3APA3A
79170af2bc publish as 0.8.3 2016-01-26 12:10:55 +03:00
z3APA3A
331c933508 publish as 0.8.3 2016-01-25 22:55:08 +03:00
z3APA3A
2de3f0c380 publish as devel 2016-01-25 22:48:09 +03:00
z3APA3A
d1334e5157 Merge remote-tracking branch 'refs/remotes/origin/devel' 
# Conflicts:
#	src/version.h
 2016-01-25 15:06:42 +03:00
z3APA3A
fec0da52af fixed: use SASIZE() instead of sizeof() in connect() for FreeBSD compatibility 2016-01-25 14:49:17 +03:00
z3APA3A
c2a7fdc2a2 release as devel 2016-01-23 19:26:20 +03:00
z3APA3A
3cbbe1aef7 publish as 0.8.2 2016-01-23 19:17:36 +03:00
z3APA3A
69cb310481 Merge remote-tracking branch 'refs/remotes/origin/devel' 2016-01-23 18:48:28 +03:00
z3APA3A
375a2c9f6e Do not use SO_REUSEADDR by default 
to avoid misbehavior in some glibc versions
 2016-01-23 18:43:30 +03:00
z3APA3A
1ed5229a54 Do not use SO_REUSEADDR by default 
to avoid misbehavior in some glibc versions
 2016-01-23 18:41:20 +03:00
z3APA3A
d6f29ac6df reset transparent flag on keep-alive connection 2016-01-23 17:16:49 +03:00
z3APA3A
82e76d1d2a Merge remote-tracking branch 'refs/remotes/origin/devel' 2016-01-22 16:20:12 +03:00
z3APA3A
4af5f2fde7 Use SASIZE() instead of sizeof() in bind() for FreeBSD compatibility 2016-01-22 15:59:40 +03:00
z3APA3A
3a4f3b5cd1 publish as 0.8.1 2016-01-21 16:26:08 +03:00
z3APA3A
a6383bbd10 Merge remote-tracking branch 'refs/remotes/origin/devel' 
# Conflicts:
#	src/version.h
 2016-01-21 15:50:17 +03:00
z3APA3A
359026cb5f !!Fix: destination IP may be not checked against ACL 2016-01-21 15:45:39 +03:00
z3APA3A
244be50405 publish as 0.8.0 
only version number is changed
 2016-01-20 01:20:05 +03:00
z3APA3A
e3fb268b64 publish as 0.8 2016-01-20 01:08:48 +03:00
z3APA3A
5e440b4482 publish as 0.9-devel 2016-01-20 01:04:03 +03:00
z3APA3A
fcbccf39ef Use configured timeouts for DNS operations instead static ones 2016-01-17 02:13:17 +03:00
z3APA3A
e59ccd22b1 typo corrected in last update 2016-01-16 00:38:53 +03:00
z3APA3A
75c63d2de6 add support for -u2 in socks 2016-01-15 15:29:57 +03:00
z3APA3A
1ef7308cbf Update documentation for connect back 2016-01-15 02:26:56 +03:00
z3APA3A
e78d9f8327 plugins documentation added 2016-01-13 23:35:35 +03:00
z3APA3A
8b7c95ff93 Update man pages 2016-01-13 02:13:49 +03:00
z3APA3A
9dd2170d6f publish as 0.8-pre 2016-01-13 00:42:48 +03:00
z3APA3A
93967af747 publishing as devel 2016-01-09 21:09:00 +03:00
z3APA3A
bef5b6f473 minor logging correction 2016-01-06 22:06:33 +03:00
z3APA3A
7f90b6eae2 fixed parent IPv6 connect proxy 2016-01-06 21:09:17 +03:00
z3APA3A
9dda666d8d minor changes in clientnegotiate() 
1. Use [] for hostname in form of IPv6 address
2. Remove large buffer from stack
 2016-01-04 01:30:49 +03:00
z3APA3A
4c3f19cd20 publish as devel 2016-01-03 20:03:17 +03:00
z3APA3A
889c5caa1f typo in logsyslog() 2016-01-03 19:57:51 +03:00
z3APA3A
0e9cc9e330 http connect parent proxy fixed 2016-01-03 19:44:48 +03:00
z3APA3A
d49a19cb29 invalid source port selection in socls 2016-01-03 19:43:16 +03:00
z3APA3A
e312a1aa11 Fileplugin: commands added 
file_cachedir /path/to/cache/
h_preview 32768
 2015-12-28 17:11:07 +03:00
z3APA3A
22e7d9cdae SSL plugin commands renamed 
plugin /path/to/SslPlugin.dll ssl_plugin
ssl_certcache /path/to/cache/
ssl_mitm
proxy -p3128
ssl_nomitm
proxy -p3129
 2015-12-28 16:28:26 +03:00
z3APA3A
347d7736c7 ssl_plugin: configuration commands added 
plugin /path_to/SslPlugin.dll ssl_plugin
ssl_certpath /path_to/certificates/
ssl_strip
proxy -p3128
ssl_nostrip
proxy -p3129
 2015-12-28 15:57:47 +03:00
z3APA3A
d9271bfec8 + Increase static buffer size 2015-12-27 19:45:15 +03:00
z3APA3A
b56702e670 Increase static bufer 2015-12-27 19:44:21 +03:00
z3APA3A
9876172e0b Reduce stack usage for threads 
Reduce stack usage, because large logging buffers are removed from
stack.
 2015-12-27 19:43:04 +03:00
z3APA3A
7df2461a26 Unify logging (make it always blocking in exchange for memory) 2015-12-27 19:27:17 +03:00
z3APA3A
0487084161 Publish as devel 2015-12-21 21:23:47 +03:00
z3APA3A
a4e0f1fb9a NULL pointer deferefence (depends on libc) if no "log" in config 2015-12-21 13:41:35 +03:00
z3APA3A
fa2679555e print IPv6 address in [] 2015-12-21 13:40:30 +03:00
z3APA3A
c263428cf6 published as devel 2015-12-11 02:28:14 +03:00
z3APA3A
1be800c334 Fixed: request by host name in SOCKSv5 2015-12-11 02:20:22 +03:00
z3APA3A
f1ab0771a9 remove unused defines 2015-12-08 01:45:17 +03:00