Commit Graph
2428 Commits
Author SHA1 Message Date
Max Lv f35c162357 Reduce size of UDP remote context 2019-03-24 22:15:25 -04:00
Max Lv 71cc0fb362 Merge pull request #2331 from chinsyo/master
bump copyright year to 2019
2019-03-21 17:30:55 +08:00
Chinsyo 7bd382042b bump copyright year 2019-03-21 12:39:29 +08:00
Max Lv 3590860a99 Merge pull request #2323 from ideal/master
cmake: change to absolute path to avoid command running every time
2019-03-18 10:54:45 +08:00
ideal e64f9184cd cmake: change to absolute path to avoid command running every time to generate documents 2019-03-14 18:59:42 +08:00
Max Lv 2254851e3f Merge pull request #2318 from ideal/master
fix typo; change installation path of man and doc
2019-03-11 15:32:25 +08:00
ideal 56e805c99b cmake: installing man and doc files compliant to distribution standard 2019-03-11 14:57:00 +08:00
ideal a3265742d1 fix typo in comment 2019-03-11 14:38:44 +08:00
Max Lv 57231ce392 Merge pull request #2316 from ideal/master
cmake: fix for system shared libs building, version string
2019-03-10 19:27:54 +08:00
ideal 5c0b8d2ab4 cmake: let version available in config.h 2019-03-10 19:00:00 +08:00
ideal 55647ce5f2 define USE_SYSTEM_SHARED_LIB in config.h when cmake with -DWITH_EMBEDDED_SRC=OF
set USE_SYSTEM_SHARED_LIB to TRUE to let cmakedefine take effect in cmake/config.h.cmake
2019-03-10 18:50:50 +08:00
ideal 4913978a58 cmake: put pkgconfig file into lib/pkgconfig 2019-03-10 18:43:42 +08:00
Max Lv 3fa9e57248 Refine ipv6only handling 2019-03-10 07:40:07 +08:00
Max Lv 1a77023777 Fix #2314 2019-03-10 07:21:55 +08:00
Max Lv b0c6ba4945 Bump version v3.2.5 2019-03-09 19:07:22 +08:00
Max Lv 831c2c05e9 Merge pull request #2311 from rampageX/master
dont overrides mbedtls's CFLAGS
2019-03-08 06:21:58 +08:00
Punk 0401d0efdb dont overrides mbedtls's CFLAGS
From mbedtls README.md, "Please note that setting CFLAGS overrides its default value of -O2 and...".
Restore the -O2 will save ~100k for any of mbedtls's lib files.
2019-03-08 00:32:33 +08:00
rampageX f5a25c2ac7 Merge pull request #1 from shadowsocks/master
resync
2019-03-08 00:20:41 +08:00
Max Lv 8fa86701ac Merge pull request #2310 from ideal/master
cmake: keep execute permission of files in bin directory
2019-03-06 13:18:16 +08:00
ideal a67e3308ce cmake: keep execute permission of files in bin directory (e.g. ss-local) after cmake install 2019-03-06 11:42:52 +08:00
Max Lv 14dd82045e Refine json config handling. #2308 2019-03-05 09:52:44 +08:00
Max Lv c8ebaeb8ec Merge pull request #2307 from ideal/master
fix cmake build on macOS
2019-03-04 21:06:17 +08:00
ideal b020179bb5 fix cmake build error on macOS: find libsodium header files 2019-03-04 20:35:37 +08:00
ideal 3a641953ca let check_include_files() can find pcre installed by homebrew on macOS 2019-03-04 20:35:37 +08:00
Max Lv 90a99cdb67 Merge pull request #2305 from tdh8316/patch-1
Fix typo in README
2019-03-03 12:19:35 +08:00
Donghyeok Tak 3c1f68c91b Update README.md
Fix typo
2019-03-03 10:27:15 +09:00
Max Lv 2ee1235cc3 Merge pull request #2304 from isjerryxiao/master
Fix a bug introduced in #2230, and some improvements
2019-03-03 07:28:43 +08:00
Jerry 1d5f250032 ss-nat: use ping to lookup dns A records 2019-03-02 20:52:09 +08:00
Jerry 6734e12172 ss-nat: fix hostname lookup bugs introduced in #2230
Fixes: An ipv4 address went through dig and returns nothing, causing the script to print help.
ip address can be handled correctly now.
2019-03-02 20:12:41 +08:00
Max Lv 144138788b Refine ipv6 only handling. #2300 2019-03-01 07:32:25 +08:00
Max Lv 0f55830b1d Remove default IPv6 and fast-open option in the dockerfile 2019-02-26 22:13:48 +08:00
Max Lv c9159fc927 Bump version v3.2.4 2019-02-26 12:33:30 +08:00
Max Lv 404ec62b79 Fix #2285 2019-02-18 09:59:40 +08:00
Max Lv b430124ed8 Refine is_remote_dns defination 2019-02-13 19:32:32 +08:00
Max Lv ed67a1abcb Update README.md 2019-02-13 12:41:08 +08:00
Max Lv 6a2f970817 Update README.md 2019-02-13 12:39:40 +08:00
Max Lv d217209271 Revert "Switch user before starting plugin server" (#2275) 2019-02-04 08:27:02 +08:00
Max Lv c1fe0468f9 Merge pull request #2274 from poplite/fix-su
Switch user before starting plugin server
2019-02-04 07:42:32 +08:00
poplite afeceeaf4d Switch user before starting plugin server 2019-02-03 23:32:52 +08:00
Max Lv 333e98dc86 Redirect standard fd to /dev/null by default 2019-01-28 21:59:30 +08:00
Max Lv 85b190372b Fix the ss_free macros 2019-01-22 16:20:49 +08:00
Max Lv 782311ad2b Refine ss_align interfaces 2019-01-22 12:59:29 +08:00
Max Lv fbb311ed06 Use _aligned_free for MinGW 2019-01-22 12:43:39 +08:00
Max Lv 4fb34de463 Use _aligned_malloc instead 2019-01-22 12:39:29 +08:00
Max Lv ba930dcca7 Fix a compiler warning 2019-01-22 09:17:53 +08:00
Max Lv 250297b94b Add an example ACL for blocking private addresses 2019-01-21 17:59:17 +08:00
Max Lv d7fe31eae7 Refine ss_align for MinGW32 2019-01-21 17:51:37 +08:00
Max Lv d6b21daa9c Refine ACL log 2019-01-21 12:26:27 +08:00
Max Lv c33cf3efc0 Fix #2267 2019-01-21 12:12:42 +08:00
Max Lv 829b38420c Merge pull request #2270 from ffontaine/master
configure.ac: fix static build with netfilter_conntrack
2019-01-19 10:46:44 +08:00