Commit Graph
2520 Commits
Author SHA1 Message Date
Linus Yang 3f00e533bf Minor format fix 2018-03-12 13:16:37 +08:00
Linus Yang ca51c60ee7 Only define TCP_FASTOPEN if not exists 2018-03-12 12:57:52 +08:00
Linus Yang 0a11c87aa5 Do not override error code of setsockopt 2018-03-12 12:41:51 +08:00
Linus Yang b4c5021c65 Missing macro for MinGW 2018-03-10 23:44:27 +08:00
Max Lv e305b0715f Merge pull request #1969 from linusyang92/mingw-doc
Simplify Docker build on Windows
2018-03-10 18:08:13 +08:00
Linus Yang 735aeb41b8 Simplify Docker build on Windows 2018-03-10 17:03:38 +08:00
Linus Yang 87b7dd85a9 Correct header inclusion 2018-03-10 16:34:28 +08:00
Max Lv a093c5f66f Merge pull request #1968 from linusyang92/mingw-doc
Add instruction of building MinGW port in Readme
2018-03-09 23:09:01 +08:00
Linus Yang a3f3010bff Add MinGW section in readme 2018-03-09 21:37:17 +08:00
Linus Yang f4c612f832 Support TCP fast open on Windows 2018-03-09 17:46:38 +08:00
Max Lv 8adfc5cf24 Merge pull request #1963 from linusyang92/mingw-docker
Fix MinGW build using Docker
2018-03-09 13:24:26 +08:00
Linus Yang 2603dcbb4e Fix MinGW build using Docker 2018-03-08 22:54:10 +08:00
Max Lv 864c2f1582 Merge pull request #1962 from linusyang92/master
Re-add MinGW compilation support
2018-03-08 21:58:13 +08:00
Linus Yang fd55773972 Use docker to build MinGW port 2018-03-08 18:10:28 +08:00
Linus Yang 2ed8791dab Re-add support for MinGW 2018-03-08 17:26:11 +08:00
Max Lv fc91bac349 Merge pull request #1959 from pexcn/mtu-debug
udprelay: display mtu at least size
2018-03-06 10:20:32 +08:00
Max Witten e7ad7fc73e udprelay: display mtu at least size 2018-03-05 21:37:12 +08:00
Max Lv 26e06a7a1d Fix #1948 2018-02-27 21:14:16 +08:00
Max Lv ea975cac47 Merge pull request #1947 from wongsyrone/patch-1
mbedtls: simplify new MD5 API
2018-02-27 14:38:57 +08:00
Syrone Wong abba447f13 mbedtls: simplify new MD5 API 2018-02-27 14:19:30 +08:00
Max Lv 6e1e005221 Fix #1908 2018-02-27 11:01:36 +08:00
Max Lv af1c78e36c Merge pull request #1946 from chenhw2/patch-1
Fix https://github.com/shadowsocks/shadowsocks-libev/issues/1945
2018-02-27 10:02:29 +08:00
hwchan fb22adcb92 Fix https://github.com/shadowsocks/shadowsocks-libev/issues/1945
Refer: https://github.com/dlundquist/sniproxy/commit/4af9a1b62b7987f2e9f3c561f589c10092d4e150
2018-02-27 05:14:50 +08:00
Max Lv de504c9aa9 Merge pull request #1940 from DDoSolitary/patch-update-libcork
Update libcork for shadowsocks/libcork#2.
2018-02-25 09:46:49 +08:00
DDoSolitary 91c469610a Update libcork for shadowsocks/libcork#2. 2018-02-22 22:30:30 +08:00
Max Lv 6ea4455b84 Merge pull request #1930 from leesah/master
Document improvments
2018-02-15 19:11:44 +08:00
Sah 9778ce2e19 Documentation improvements
* Remove prompt 'root@Wrt:~#' from code example for better consistency
 * Fix line indentation of usage
 * Remove unnecessary note about ss-redir
2018-02-15 10:27:34 +01:00
Sah 6e489fe360 Add information on Docker image to /README.md 2018-02-15 09:45:23 +01:00
Max Lv 60858a6ab7 Merge pull request #1929 from DDoSolitary/patch-1
Invoke plugins direct instead of using "sh".
2018-02-15 16:11:39 +08:00
DDoSolitary 7b643dce7e Invoke plugins direct instead of using "sh".
See #1928 for details.
2018-02-15 16:05:46 +08:00
Max Lv f8b18cc793 Refine the bind_to_address 2018-02-11 08:50:29 +08:00
Max Lv 8acbe68e66 Fix #1915 2018-02-11 08:42:07 +08:00
Max Lv 70daa77c90 Merge pull request #1922 from ksqsf/master
Search XDG_CONFIG_HOME for user-specific config
2018-02-11 08:17:59 +08:00
Max Lv b27ab1a706 Merge pull request #1920 from leesah/master
Follow-ups of the migration to Docker Cloud
2018-02-11 08:16:57 +08:00
ksqsf eb501b70c7 Oops.. Remove useless code. 2018-02-11 00:53:33 +08:00
ksqsf 2a3d3bc13c Remove pointless optimization in get_default_conf() 2018-02-11 00:35:59 +08:00
ksqsf 3c3c50b4f8 Search XDG_CONFIG_HOME for user-specific config 2018-02-11 00:30:09 +08:00
Sah 2a250d2e0a Update documents regarding dockerization
* Update README.md in docker/alpine
  - Replace contents with the usage of the image auto-built by Docker Cloud
  - Add descriptions on the customizable environment variables
* Update Dockerfile maintainer list

Refer to #1914
2018-02-10 12:46:10 +01:00
Sah a9a7d434ca Optimize Dockerfile
* Install rng-tools as runtime dependency
* Remove unnecessary 'git submodule update', as Docker Cloud runs 'git submodule update' after cloning the repository
* Replace variable SERVER_PORT with fixed port 8388, as it can't be customized with -e anyway
2018-02-10 12:45:54 +01:00
Max Lv 23a258147d Merge pull request #1916 from leesah/master
Update Dockerfile to utilize Docker Cloud auto build
2018-02-09 10:17:05 +08:00
Sah ea571c3f41 Update Dockerfile to utilize Docker Cloud auto build
* Use the repository as context, instead of released .tar.gz
* Remove version information from Dockerfile, and let Docker Cloud handle it
* Add .dockerignore

Next steps:

1. Connect repository in Docker Cloud
2. Setup automated builds:
   - A push on `master` branch triggers build for `unstable` tag
   - A tag matching /^v[0-9]+(\.[0-9]+){2}$/ triggers build for a same-named tag

Refer to #1914
2018-02-08 18:31:18 +01:00
Max Lv b4d5490f0a Merge pull request #1913 from leesah/master
Deprecate ubuntu-based docker image
2018-02-07 09:42:09 +08:00
Sah (esaalii) 430839fbf0 Deprecate ubuntu-based docker image 2018-02-06 15:29:25 +01:00
Max Lv 5fa98a6693 Fix #1911 2018-02-06 10:18:03 +08:00
Max Lv 1a21989566 Remove the return value in traffic IPC 2018-02-04 23:02:38 -08:00
Max Lv b361f75f31 Remove unused return value 2018-02-05 13:33:14 +08:00
Max Lv 5b06f83f13 Merge pull request #1899 from asmca/patch-1
update  shadowsocks-libev.service
2018-01-24 14:25:10 +08:00
asmca b370bc06f0 update shadowsocks-libev.service
ss-server waits for local ip ready, add network-online.target here.

my env.
CentOS Linux release 7.2.1511 (Core)
2018-01-24 11:08:59 +08:00
Max Lv 5782a2b5f1 Merge pull request #1893 from bazingaterry/master
fix an issue and support tcp no-delay in manager mode
2018-01-20 19:17:56 +08:00
Terry Chan b6faadf857 Support TCP_NODELAY in manager mode 2018-01-20 15:44:17 +08:00