Commit Graph
1896 Commits
Author SHA1 Message Date
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
Terry Chan ed508ac142 Fix no parse --fast-open in manager mode 2018-01-20 15:34:40 +08:00
Max Lv 85a64ae836 Bump version v3.1.3 2018-01-15 17:25:03 -08:00
Max Lv 6040be9d0a Merge pull request #1888 from rogers0/PR/fix_cmake
Make cmake to build under Debian
2018-01-15 09:02:26 +08:00
Max Lv 29ff5d3f89 Avoid overwriting dst_addr 2018-01-13 09:17:18 +08:00
Max Lv b95495e71d Remove the log of sockaddr_cmp 2018-01-12 22:55:26 +08:00
Max Lv 569b27a73f Clean up 2018-01-12 22:37:41 +08:00
Max Lv 9ca33a64c7 Refine the UDP response header 2018-01-12 22:15:33 +08:00
Max Lv c11e70aa8a Reconstruct src addr for P2P usage 2018-01-12 22:00:43 +08:00
Max Lv 2bf7ecc787 Log the mismatched header as an error 2018-01-12 21:18:21 +08:00
Max Lv 68abd2a274 Fix a header mismatch issue in udp relay 2018-01-12 21:39:09 +08:00
Max Lv 56498cb548 Refine log output 2018-01-12 20:39:52 +08:00
Max Lv 1d94442546 Refine udp header checking 2018-01-12 10:15:24 +08:00
Max Lv 87e4bece84 Enlarge the timeout of protecting socket 2018-01-11 22:10:46 +08:00
Max Lv 512891c66f Refine SNI parser in ss-local 2018-01-07 20:20:15 -08:00
Max Lv 539bf6e66d Avoid reconstructing requests with SNI/HTTP parser 2018-01-07 18:17:21 -08:00
Roger Shimizu d41508292f Make cmake to build under Debian
Add a new option, WITH_EMBEDDED_SRC, which default is ON and same as
current setting.
When set to OFF, it can use system's libcork, libcorkipset, and libbloom.

It can be built in debian by:
$ cmake -DUSE_SYSTEM_SHARED_LIB=1 -DWITH_STATIC=OFF -DWITH_EMBEDDED_SRC=OFF
$ make
2018-01-07 23:36:24 +09:00
Max Lv afce1b3f42 Refine #1872 2018-01-05 01:09:41 -08:00
Max Lv cba94db423 Bump version v3.1.2 2017-12-28 21:09:40 -08:00
Max Lv be795e1985 Refine query interface 2017-12-27 22:18:55 -08:00
Max Lv 10ce3ed5d3 Refine query handling 2017-12-27 21:52:17 -08:00
Max Lv 57ab828ba1 Fix a potential null pointer acceess issue. #1854
It's possible that c-ares calls the callback function immediately in ares_gethostbyname, which may free the server
structure in that callback function.
2017-12-27 21:47:28 -08:00
Max Lv a18b2e5eb0 Refine ACL rules 2017-12-27 01:06:22 -08:00
Max Lv 5072be7a02 Disable SNI on Android 2017-12-27 09:58:50 +08:00
Max Lv 65e9d2355d Avoid reconstructing all the connections 2017-12-26 17:43:48 -08:00