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
631 Commits 4 Branches 29 Tags 2.5 MiB
98ff3464f7
Commit Graph

631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
z3APA3A
98ff3464f7 resolve conflicts 2020-11-03 13:27:58 +03:00
z3APA3A
82d827180d resolve conflicts 2020-11-03 13:10:16 +03:00
z3APA3A
d2366775a5 resolve conflicts 2020-11-03 12:59:02 +03:00
z3APA3A
ce043e482a Remove RDHUP processing 
Do not actually need it, may lead to connection closed before all data
read
 2020-11-03 12:50:24 +03:00
z3APA3A
ca8788c65f ignore events on non-initialised log 2020-10-31 02:18:39 +03:00
z3APA3A
b3a843aacb Do not start log thread before logging is actually required to prevent daemon problem 2020-10-30 23:20:44 +03:00
z3APA3A
9e51fe7308 Do not use 2020-10-30 23:01:11 +03:00
z3APA3A
d0f735e87b fix warning 2020-10-30 19:37:01 +03:00
z3APA3A
12a4f89e85 fix udpresolve 2020-10-30 19:15:06 +03:00
z3APA3A
245222f59c fix some warnings, add log flushing for standalone services 2020-10-30 18:56:09 +03:00
z3APA3A
a0da9c97e8 fix type warnings 2020-10-30 18:36:05 +03:00
z3APA3A
1f7a33d5ab get rid of unsigned chars 2020-10-30 17:25:27 +03:00
z3APA3A
3e35fdd054 Correct NORADIUS compilarion support 2020-10-30 16:02:29 +03:00
z3APA3A
0f560a4725 Merge remote-tracking branch 'refs/remotes/origin/devel-logthread' into devel 2020-10-30 15:43:19 +03:00
z3APA3A
7973c8b757 Logging for plugins fixed 2020-10-30 14:51:07 +03:00
z3APA3A
ee8cdbc85b log rotation re-implemented 2020-10-30 12:39:37 +03:00
z3APA3A
f219544d6a remove debug output 2020-10-30 11:58:40 +03:00
z3APA3A
fa52a1ae92 fixes for linux 2020-10-30 11:53:33 +03:00
z3APA3A
48b330da7c intermediate commit for logging 2020-10-30 11:17:28 +03:00
z3APA3A
4965bb5d9f Merge remote-tracking branch 'refs/remotes/origin/devel' into devel-logthread 2020-10-28 18:44:02 +03:00
z3APA3A
7124b4a141 Corrected: acl was ignored if preacl is empty 2020-10-28 17:08:12 +03:00
z3APA3A
8d73f977de initial logging refatoring commit, should be very buggy 2020-10-28 16:45:21 +03:00
z3APA3A
fa4322afee Merge remote-tracking branch 'refs/remotes/origin/devel' into devel-logthread 
# Conflicts:
#	src/plugins.c
#	src/proxymain.c
#	src/sockmap.c
 2020-10-24 11:35:47 +03:00
z3APA3A
cc8d3fc494 readme update 2020-10-19 13:28:02 +03:00
z3APA3A
677ed39c8f More accurate conditions in sockmap's main event loop 2020-10-19 13:03:55 +03:00
z3APA3A
53521393e9 fail portmapping if name can not be resolved 2020-10-16 23:15:28 +03:00
z3APA3A
5ee573dc7f correct IPv6 parsing where hostname is expected 2020-10-16 23:15:10 +03:00
z3APA3A
f4efbf12c2 README updated 2020-10-16 02:33:59 +03:00
z3APA3A
da215a152e Preauthorization added 
ACL which can be checked prior to request parsing and authentication
(first entries with only IP and time, if any) are automatically marked
as preauthentication and checked immediately after connection is
accepted, prior to any resources are allocated. Connection is silently
dropped if preauthentication fails.
 2020-10-16 01:38:21 +03:00
z3APA3A
b1a3755a94 Minor documentation update 2020-10-15 18:31:57 +03:00
z3APA3A
cb509c360f Use MAXFAILATTEMPT to limit socket failuers 2020-10-15 16:45:13 +03:00
z3APA3A
6092fd640f Better handle socket closing 2020-10-15 16:25:37 +03:00
z3APA3A
c63392f1ea Do not sigmask main thread for standalone services 2020-10-15 16:01:41 +03:00
z3APA3A
ef6d1d14e6 Allow to specify binding address for RADIUS 2020-10-15 12:28:53 +03:00
z3APA3A
42d4af4b98 Document RADIUS support 2020-10-15 12:28:32 +03:00
z3APA3A
7be5ba4981 Continue devel as 10 branch 2020-10-15 02:47:40 +03:00
z3APA3A
47f1bbc8d7 Merge branch 'master' into devel 2020-10-15 01:49:04 +03:00
z3APA3A
c9097154c6 ignore version 2020-10-15 01:38:13 +03:00
z3APA3A
9f6a8460ac limit failed mapping attempts to 13 2020-10-15 01:17:10 +03:00
z3APA3A
637cb2e76d adding guard for polling loop to prevent CPU exhastion in the case of system misbihavior 2020-10-14 18:58:52 +03:00
z3APA3A
7f0797178b Correct returning 98 code from socksmap 2020-10-14 16:16:27 +03:00
z3APA3A
47affa0add Correct returning 98 code from socksmap 2020-10-14 16:15:11 +03:00
z3APA3A
a4f95462b3 intermediate commit 2020-10-14 16:10:35 +03:00
z3APA3A
eb829b062b Major code refactoring 
- sockmapping rewritten from stratch to minimilse polling. poll() is now
only called if blocking is actually expected, splice pipes are now
polled if splice fails, buffers flushing is much more accurate.
- logging code moved to separate files
- signal masks added to client threads to prevent unneeded interruptions
- bandwidth limitation will not delay the thread after client or server
shutdown
 2020-10-09 15:42:34 +03:00
z3APA3A
3dd1969657 Move logging to log.c 2020-10-07 19:03:59 +03:00
z3APA3A
b6629850e5 Revert "index file re-generated" 
This reverts commit e3840d2258.
 2020-10-07 11:50:51 +03:00
z3APA3A
e3840d2258 index file re-generated 2020-10-07 11:42:01 +03:00
z3APA3A
8c92470124 countall, nocountall -N options are documented 2020-10-07 11:35:51 +03:00
z3APA3A
024c0fb749 countall, nocountall, -N options are documented 2020-10-07 11:35:20 +03:00
z3APA3A
ebd7b34159 -N(NAT_address) option added for socks 2020-10-07 11:21:01 +03:00