Commit graph

  • 381ef993a7 Minor logging improvement / code cleanup master Vladimir Dubrovin 2026-05-12 21:21:59 +03:00
  • 1de06c5059 Fix invalid buffer calculation in sockmap Vladimir Dubrovin 2026-05-12 21:06:31 +03:00
  • aaa04116a8 Fix issues with -s Vladimir Dubrovin 2026-05-08 20:43:02 +03:00
  • 5fdd4a4d6f NOODBC inverted to WITH_ODBC Vladimir Dubrovin 2026-05-08 20:30:14 +03:00
  • 7871279fae Support namespaces for UDP in socks Vladimir Dubrovin 2026-05-08 20:21:04 +03:00
  • ff15a8d480 Update copyright Vladimir Dubrovin 2026-05-08 19:25:33 +03:00
  • 95029e9e41 Use blake2 hashsize Vladimir Dubrovin 2026-05-08 19:14:28 +03:00
  • 6286bfcd6e Fix crypt passwords Vladimir Dubrovin 2026-05-08 19:00:14 +03:00
  • b1d21cbdca Copyright update Vladimir Dubrovin 2026-05-08 18:07:08 +03:00
  • 978f351560 Add compatiblity with older SSL versions Vladimir Dubrovin 2026-05-08 17:16:47 +03:00
  • 41d1fa8b00 Do not use OSSL_LIB_CTX Vladimir Dubrovin 2026-05-08 17:03:00 +03:00
  • 8c638fcaff Revert usage of OpenSSL blake2 implementation Vladimir Dubrovin 2026-05-08 16:45:44 +03:00
  • 6963af7614 Do not use OSSL_PARAM_DIGEST_SIZE for blake2 in openssl Vladimir Dubrovin 2026-05-08 16:14:09 +03:00
  • f8c22d5f91 Fix: symbols collision with openssl, could lead to crash Vladimir Dubrovin 2026-05-08 14:03:47 +03:00
  • c104203765 Fix memory leak in hash functions Vladimir Dubrovin 2026-05-08 12:10:08 +03:00
  • 45c3b89484 3proxy_crypt cleanup Vladimir Dubrovin 2026-05-07 23:21:09 +03:00
  • 0d7f05b05b set hostname in proxy if hostname is numeric Vladimir Dubrovin 2026-05-07 19:10:36 +03:00
  • 750bb38907 Do not fail on -n Vladimir Dubrovin 2026-05-07 19:10:13 +03:00
  • 46cff56cf4 Use EVP_MD_CTX_reset instead of free/new Vladimir Dubrovin 2026-05-07 18:47:06 +03:00
  • d0d3b90226 Fix $1$ crypt Vladimir Dubrovin 2026-05-07 18:34:38 +03:00
  • 7a139e59a5 Use UDPMAP request address to limit client, not server Vladimir Dubrovin 2026-05-07 16:07:59 +03:00
  • ff7f4b8ea6 Dynamic link with ssl/pcre by default, static as option in makefiles Vladimir Dubrovin 2026-05-07 11:55:42 +03:00
  • ec48b7f30e Clear mingw warnings Vladimir Dubrovin 2026-05-06 23:07:16 +03:00
  • 88a09bc3ff Fix socks v5 derivations from standard Vladimir Dubrovin 2026-05-06 23:01:44 +03:00
  • 0e13f57139 Allocate udp buffer dynamically Vladimir Dubrovin 2026-05-06 22:44:29 +03:00
  • cbab76fe41 do not use static linking for .so Vladimir Dubrovin 2026-05-05 18:38:45 +03:00
  • fb9337c030 Add option for static libraries linking (ssl / pcre2 / pam) Vladimir Dubrovin 2026-05-05 18:34:58 +03:00
  • ef9386e29d More accurate flags in linking Vladimir Dubrovin 2026-05-05 18:13:32 +03:00
  • 334de0658c update datatypes Vladimir Dubrovin 2026-05-05 15:27:55 +03:00
  • ec469fa2a6 Fix: buffer size in hash Vladimir Dubrovin 2026-05-04 21:55:20 +03:00
  • fbd1788f4c increase stack size Vladimir Dubrovin 2026-05-04 21:34:13 +03:00
  • 830b2d39d1 Use standard malloc functions Vladimir Dubrovin 2026-05-04 18:50:02 +03:00
  • a338a0c689 Speedup passwords lists Vladimir Dubrovin 2026-05-04 18:37:18 +03:00
  • af8a6e0b91 minimize blake2 usage for hashing Vladimir Dubrovin 2026-05-04 16:48:07 +03:00
  • 2997533287 Use only defined PCRE2 options Vladimir Dubrovin 2026-05-04 12:46:33 +03:00
  • 5f06879843 Fix: crash on standalone services Vladimir Dubrovin 2026-05-04 12:03:02 +03:00
  • da8a8615f4 Remove UDPASSOC check from tcp sockmap Vladimir Dubrovin 2026-05-02 15:36:21 +03:00
  • 51a82613a6 Allow to set internal / external namespace on linux Vladimir Dubrovin 2026-05-02 14:49:35 +03:00
  • b87e998e4d remove 'usentlm' option Vladimir Dubrovin 2026-05-02 13:58:56 +03:00
  • 4068a6955f Fix UDP parent for SOCKSv5 Vladimir Dubrovin 2026-05-02 00:00:45 +03:00
  • 07c1dc1462 Fix shutdown for Windows Vladimir Dubrovin 2026-05-01 19:26:39 +03:00
  • acce67a512 Fix NULL address request for UDP ASSOC Vladimir Dubrovin 2026-05-01 17:26:06 +03:00
  • e986f8a747 FIx hanging connections in sockmap Vladimir Dubrovin 2026-05-01 17:19:23 +03:00
  • 314503d8df SOCKSv5 parent udp support (initial, untested) Vladimir Dubrovin 2026-05-01 15:13:53 +03:00
  • 8107f03062 Move PCRE/SSL to main code Vladimir Dubrovin 2026-05-01 15:11:08 +03:00
  • a3fb7aff07 Clean up UDP code Vladimir Dubrovin 2026-04-30 11:32:12 +03:00
  • b1ac46da79 Remove linux futext implementation Vladimir Dubrovin 2026-04-28 18:06:54 +03:00
  • d125261e8c fix: hashtables on recsize < 4 Vladimir Dubrovin 2026-04-28 16:32:30 +03:00
  • a4527783d6 Correctly process half-closed connections; add grace sleep before closing sockets Vladimir Dubrovin 2026-04-28 16:15:18 +03:00
  • fb70d06d3e Add linger sleep on connection close Vladimir Dubrovin 2026-04-28 14:55:37 +03:00
  • 57d687fcb8 add 3proxy_crypt man Vladimir Dubrovin 2026-04-28 14:41:14 +03:00
  • ada24a98ec Use semaphore/mutex insted of pipe for threads sync Vladimir Dubrovin 2026-04-28 14:00:15 +03:00
  • ba2584cebf change 3proxy.cfg.3 to 3proxy.cfg.5 Vladimir Dubrovin 2026-04-28 12:34:53 +03:00
  • 05096c222a Return standalone udppm; do not build standalone modules by default in cmake Vladimir Dubrovin 2026-04-28 12:21:11 +03:00
  • 6c3c5f31a2 Update mans Vladimir Dubrovin 2026-04-27 21:11:25 +03:00
  • 319a74de06 Update proxymain.c Vladimir Dubrovin 2026-04-27 20:12:28 +03:00
  • e088a5d7f9 Remove udppm from build Vladimir Dubrovin 2026-04-27 20:05:34 +03:00
  • f01c8bfee9 Code cleanup Vladimir Dubrovin 2026-04-27 19:58:34 +03:00
  • a7cdfa578d split auth.c Vladimir Dubrovin 2026-04-27 15:30:35 +03:00
  • d52701518d udppm switched to hashtable and supports multiple connections; no standalone udppm Vladimir Dubrovin 2026-04-27 15:12:39 +03:00
  • 7ddea44ffd Fix: blake crypt Vladimir Dubrovin 2026-04-27 13:23:32 +03:00
  • 760a521df8 remove pwl_mutex Vladimir Dubrovin 2026-04-26 20:43:13 +03:00
  • 62ceb36157 Use hashtables for password lists Vladimir Dubrovin 2026-04-26 20:38:58 +03:00
  • 62be3c7b5b cash the hash for auth cache Vladimir Dubrovin 2026-04-26 19:56:38 +03:00
  • 85c431b96e Merge branch 'master' of https://github.com/3proxy/3proxy Vladimir Dubrovin 2026-04-25 11:52:57 +03:00
  • 90c312f4cd Changelog added Vladimir Dubrovin 2026-04-25 11:52:54 +03:00
  • 451b3d180c Allow hashtables to grow index Vladimir Dubrovin 2026-04-24 21:08:57 +03:00
  • f63a83f554 Fix blake2 for watcom Vladimir Dubrovin 2026-04-24 18:13:30 +03:00
  • e9848b6622 Fix blake2 for Watcom test-ci Vladimir Dubrovin 2026-04-24 17:43:33 +03:00
  • e419a21cf9 build windows release Vladimir Dubrovin 2026-04-24 17:24:39 +03:00
  • 6b61cfde4c Fix for older Windows (7 and below) / VC Vladimir Dubrovin 2026-04-24 17:04:03 +03:00
  • e6c3427cab fix hashtable init Vladimir Dubrovin 2026-04-22 12:02:20 +03:00
  • 4f0f3c81e1 add 'cacheacl' auth type, dstaddr, dstport, dsthost, dstoper, srvaddr and srvport authcache types; allow to configure authcache by service Vladimir Dubrovin 2026-04-21 21:49:52 +03:00
  • bfbbf1f446 Fix FilePlugin warnings Vladimir Dubrovin 2026-04-21 16:28:28 +03:00
  • b79906da02 Add FilePlugin to builds Vladimir Dubrovin 2026-04-21 16:23:23 +03:00
  • 68ef9dcc59 Fix Windows compilation Vladimir Dubrovin 2026-04-21 16:10:17 +03:00
  • a01df2e232 Fix Windows build breakages in FilePlugin and WinSock includes Yudong An 2026-04-21 16:02:11 +08:00
  • 8bf0d3f4ae Fix authcachesize Vladimir Dubrovin 2026-04-20 20:13:21 +03:00
  • 3957210609 Allow different hash lengths; fix bug on hashtable grow Vladimir Dubrovin 2026-04-20 18:49:53 +03:00
  • ee00956b74 hash username/password with terminators Vladimir Dubrovin 2026-04-20 11:59:58 +03:00
  • 083a70393f Minor hashtable refactor Vladimir Dubrovin 2026-04-20 10:40:38 +03:00
  • d9b1493260 Fix hashadd Vladimir Dubrovin 2026-04-19 19:22:22 +03:00
  • 7102afe856 authcache switched to hashtables, overflow fixed Vladimir Dubrovin 2026-04-19 19:16:33 +03:00
  • a3729354b8 Allow hashtable to grow Vladimir Dubrovin 2026-04-18 17:24:01 +03:00
  • 45796f66c7 Cleanup 3proxy_crypt Vladimir Dubrovin 2026-04-18 15:47:07 +03:00
  • 260cbf7a3d Use uint32_t for hashtable indicies Vladimir Dubrovin 2026-04-18 15:36:14 +03:00
  • bba9871ed8 Use 3proxy_crypt instead of mycrypt Vladimir Dubrovin 2026-04-18 15:19:06 +03:00
  • f1af44f3a9 Refactor hashtables to use indices instead of pointers, use blake2 as a hash, mycrypt renamed to 3proxy_crypt Vladimir Dubrovin 2026-04-18 15:12:43 +03:00
  • 4ee7f71fb9 Использовать tablesize в хештаблице Vladimir Dubrovin 2026-04-17 21:15:21 +03:00
  • 98604b5421 Add hashcompact Vladimir Dubrovin 2026-04-17 20:40:27 +03:00
  • a0d580b36d move hashtable/resolve/sql functions to separate files Vladimir Dubrovin 2026-04-17 19:29:50 +03:00
  • 4c0e3a1bac Check OpenSSL version for SNI/TLS 1.3/alpn Vladimir Dubrovin 2026-04-14 17:36:35 +03:00
  • 454f5e1d54 -Ne / -Ni description added to man Vladimir Dubrovin 2026-04-13 21:37:46 +03:00
  • c4ac696919 Update documentation for parent tcps/https/etc Vladimir Dubrovin 2026-04-13 21:32:04 +03:00
  • afbdad0ac7 Fix for first in chain https/tcps parent Vladimir Dubrovin 2026-04-13 21:09:46 +03:00
  • a1a65c3fd5 ssl_client_mode = 3 added, allow 'secure' parent types ending with 's': https, tcps, socks5s, connect+s, etc. Vladimir Dubrovin 2026-04-13 20:53:38 +03:00
  • 2fd536781f Add unix sockets to man Vladimir Dubrovin 2026-04-13 11:54:24 +03:00
  • 878a432481 Support unix socket for parent and tcppm; abstract (fileless) unix sockets for linux support Vladimir Dubrovin 2026-04-12 19:18:15 +03:00
  • 3f92dc7355 Fix dockerfiles Vladimir Dubrovin 2026-04-12 15:18:20 +03:00
  • bae96b0823 Support plugins in chroot in Dockerfile.busybox Vladimir Dubrovin 2026-04-12 14:55:54 +03:00