Commit Graph
2110 Commits
Author SHA1 Message Date
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
Fabrice Fontaine 9b4aebc840 configure.ac: fix static build with netfilter_conntrack
Fixes:
 - http://autobuild.buildroot.org/results/22a28e8fd8182e1c908541dbc5b0ee087c3803e6

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2019-01-18 21:10:15 +01:00
Max Lv 7ad2df9615 Remove all connection timeout from local clients 2019-01-17 21:36:49 +08:00
Max Lv 7947e3cf36 Merge pull request #2269 from Mygod/master
Allow long direct TCP connections
2019-01-17 20:00:20 +08:00
Mygod dc298c4f2b Allow long direct TCP connections
Fixes https://github.com/shadowsocks/shadowsocks-android/issues/2078.
2019-01-17 16:41:03 +08:00
Max Lv e7c244a414 Merge pull request #2268 from Mygod/master
Refine passing plugin args
2019-01-17 08:03:51 +08:00
Mygod 641e4ed9c8 Refine passing plugin args
Refine 68f885c271. Somehow I postponed this change for 8 months. Good job me!
2019-01-17 00:48:29 +08:00
Max Lv 6fb8f83f21 Merge pull request #2264 from Mygod/stat-path
Specify stat_path on Android
2019-01-12 19:43:56 +08:00
Mygod 7fc05dcd9d Specify stat_path on Android 2019-01-12 18:23:08 +08:00
Max Lv bbc420611a Merge pull request #2259 from simonsmh/master
[ss-manager] Custom working directory
2019-01-05 14:36:09 +08:00
Simon Shi 0c2bda940c Rename variable 2019-01-05 09:34:52 +08:00
Simon Shi e5d8476afe Update docs 2019-01-04 23:28:52 +08:00
Simon Shi f268b278c0 Test homedir for ss-manager
Fix for user args
2019-01-04 23:11:25 +08:00
Max Lv 91222766e7 Update libcork 2018-12-24 17:33:07 -08:00
Max Lv 396959635c Update libcork 2018-12-24 01:56:00 -08:00
Max Lv 9545ce20a4 Merge pull request #2230 from Ptomerty/patch-1
Use dig builtin to resolve hostnames in ss-nat
2018-12-03 09:22:05 +08:00
Ptomerty d05970fd0c Use existing IP regex 2018-11-29 23:13:06 -05:00
Ptomerty f9cc909efa check if dig exists first 2018-11-29 21:33:17 -05:00
Max Lv 545c04182f Bump version v3.2.3 2018-11-28 00:48:15 -08:00