From 08882fb0a77392949bb17077c8607679876b6c1b Mon Sep 17 00:00:00 2001 From: clowwindy Date: Fri, 2 May 2014 14:06:13 +0800 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6cdb3bc..8b47e2d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Current version: 1.4.0 [![Build Status](https://travis-ci.org/clowwindy/shadowso shadowsocks is a lightweight tunnel proxy which can help you get through firewalls. -Other ports and clients can be found [here](https://github.com/clowwindy/shadowsocks/wiki/Ports-and-Clients). +Both TCP CONNECT and UDP ASSOCIATE are implemented. [中文说明](https://github.com/clowwindy/shadowsocks/wiki/Shadowsocks-%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E) From c242e1f5df89c1df72134a75840c29ed5f9b65ce Mon Sep 17 00:00:00 2001 From: clowwindy Date: Fri, 2 May 2014 14:22:37 +0800 Subject: [PATCH 2/5] Update README.md --- README.md | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 8b47e2d..5dbb204 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ shadowsocks =========== -Current version: 1.4.0 [![Build Status](https://travis-ci.org/clowwindy/shadowsocks.png?branch=master)](https://travis-ci.org/clowwindy/shadowsocks) +Current version: 1.4.0 [![Build Status][1]][0] shadowsocks is a lightweight tunnel proxy which can help you get through firewalls. Both TCP CONNECT and UDP ASSOCIATE are implemented. -[中文说明](https://github.com/clowwindy/shadowsocks/wiki/Shadowsocks-%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E) +[中文说明][3] Usage ----------- @@ -34,13 +34,15 @@ Create a file named `config.json`, with the following content. Explanation of the fields: - server your server IP (IPv4/IPv6), notice that your server will listen to this IP - server_port server port - local_port local port - password a password used to encrypt transfer - timeout in seconds - method encryption method, "bf-cfb", "aes-256-cfb", "des-cfb", "rc4", etc. Default is table, which is not secure. "aes-256-cfb" is recommended - fast_open use TCP_FASTOPEN, true/false +| Name | Explanation | +| ----------- | ----------------------------------------------- | +| server | the your server listens | +| server_port | server port | +| local_port | local port | +| password | password used for encryption | +| timeout | in seconds | +| method | encryption method, "aes-256-cfb" is recommended | +| fast_open | use [TCP_FASTOPEN][2], true / false | `cd` into the directory of `config.json`. Run `ssserver` on your server. To run it in the background, run `nohup ssserver > log &`. @@ -88,7 +90,7 @@ List of all encryption methods: - seed-cfb - table -**If you want to use encryption method other than "table", please install [M2Crypto](http://chandlerproject.org/Projects/MeTooCrypto).** +**If you want to use encryption method other than "table", please install [M2Crypto][4].** Ubuntu: @@ -113,19 +115,22 @@ Or: $ sudo apt-get install libevent-dev python-pip $ sudo pip install gevent -If both of your server and client are deployed on Linux 3.7+, you can turn on -fast_open for lower latency. - - echo 3 > /proc/sys/net/ipv4/tcp_fastopen - License ------- MIT Bugs and Issues ---------------- -Please visit [issue tracker](https://github.com/clowwindy/shadowsocks/issues?state=open) +Please visit [issue tracker][5] Mailing list: http://groups.google.com/group/shadowsocks -Also see [troubleshooting](https://github.com/clowwindy/shadowsocks/wiki/Troubleshooting) +Also see [troubleshooting][6] + +[0]: https://travis-ci.org/clowwindy/shadowsocks +[1]: https://travis-ci.org/clowwindy/shadowsocks.png?branch=master +[2]: https://github.com/clowwindy/shadowsocks/wiki/TCP-Fast-Open +[3]: https://github.com/clowwindy/shadowsocks/wiki/Shadowsocks-%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E +[4]: http://chandlerproject.org/Projects/MeTooCrypto +[5]: https://github.com/clowwindy/shadowsocks/issues?state=open +[6]: https://github.com/clowwindy/shadowsocks/wiki/Troubleshooting From ec1f39bb459a6fecdbba4dd1d23c702a7eba8460 Mon Sep 17 00:00:00 2001 From: clowwindy Date: Fri, 2 May 2014 14:23:33 +0800 Subject: [PATCH 3/5] Update CHANGES --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 055f918..3ecb6a0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,6 @@ 1.4.0 2014-05-02 - Adds UDP relay -- TCP fast open supports on Linux 3.7+ +- TCP fast open support on Linux 3.7+ 1.3.7 2014-04-10 - Fix a typo in help From 4a84a47943a0c4ff8cb09211787bdb2c40f088da Mon Sep 17 00:00:00 2001 From: clowwindy Date: Sat, 3 May 2014 08:19:05 +0800 Subject: [PATCH 4/5] Update README.md --- README.md | 88 +++++++++++++++++++++---------------------------------- 1 file changed, 33 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 5dbb204..19e4760 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ Both TCP CONNECT and UDP ASSOCIATE are implemented. [中文说明][3] -Usage ------------ +Install +------- First, make sure you have Python 2.6 or 2.7. @@ -19,17 +19,36 @@ First, make sure you have Python 2.6 or 2.7. Install Shadowsocks. +#### Debian / Ubuntu: + + apt-get install python-gevent python-m2crypto + pip install shadowsocks + +#### CentOS: + + yum install m2crypto python-setuptools + easy_install pip pip install shadowsocks - -Create a file named `config.json`, with the following content. + +#### Windows / OS X: + +Choose a [GUI client][7] + +Usage +----- + +Create a config file `/etc/shadowsocks.json` (or put it in other path). +Example: { "server":"my_server_ip", "server_port":8388, + "local_address": "127.0.0.1", "local_port":1080, - "password":"barfoo!", - "timeout":600, - "method":"table" + "password":"mypassword", + "timeout":300, + "method":"aes-256-cfb", + "fast_open": false } Explanation of the fields: @@ -44,10 +63,9 @@ Explanation of the fields: | method | encryption method, "aes-256-cfb" is recommended | | fast_open | use [TCP_FASTOPEN][2], true / false | -`cd` into the directory of `config.json`. Run `ssserver` on your server. To run it in the background, run -`nohup ssserver > log &`. +Run `ssserver -c /etc/shadowsocks.json` on your server. To run it in the background, [use supervisor][8]. -On your client machine, run `sslocal`. +On your client machine, run `sslocal -c /etc/shadowsocks.json`. Change the proxy settings in your browser to @@ -68,52 +86,10 @@ You can use args to override settings from `config.json`. ssserver -p server_port -k password -m bf-cfb ssserver -c /etc/shadowsocks/config.json -Encryption ------------- - -Default encryption method table, which is not secure, is not recommended. Please use "aes-256-cfb" or "bf-cfb". "rc4" is not secure, either, please don't use it. - -List of all encryption methods: - -- aes-128-cfb -- aes-192-cfb -- aes-256-cfb -- bf-cfb -- camellia-128-cfb -- camellia-192-cfb -- camellia-256-cfb -- cast5-cfb -- des-cfb -- idea-cfb -- rc2-cfb -- rc4 -- seed-cfb -- table - -**If you want to use encryption method other than "table", please install [M2Crypto][4].** - -Ubuntu: - - apt-get install python-m2crypto - -Others: - - apt-get install openssl-dev swig - pip install M2Crypto - -Please notice that some encryption methods are not available on some environments. - -Performance ------------- - -You may want to install gevent for better performance. - - $ sudo apt-get install python-gevent - -Or: +Wiki +---- - $ sudo apt-get install libevent-dev python-pip - $ sudo pip install gevent +https://github.com/clowwindy/shadowsocks/wiki License ------- @@ -134,3 +110,5 @@ Also see [troubleshooting][6] [4]: http://chandlerproject.org/Projects/MeTooCrypto [5]: https://github.com/clowwindy/shadowsocks/issues?state=open [6]: https://github.com/clowwindy/shadowsocks/wiki/Troubleshooting +[7]: https://github.com/clowwindy/shadowsocks/wiki/Ports-and-Clients +[8]: https://github.com/clowwindy/shadowsocks/wiki/Configure-Shadowsocks-with-Supervisor From f7c6f6b25194094263a98b1d0d64885fcb0e7dac Mon Sep 17 00:00:00 2001 From: clowwindy Date: Sat, 3 May 2014 08:23:47 +0800 Subject: [PATCH 5/5] Update README.md --- README.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 19e4760..e737d3e 100644 --- a/README.md +++ b/README.md @@ -53,15 +53,16 @@ Example: Explanation of the fields: -| Name | Explanation | -| ----------- | ----------------------------------------------- | -| server | the your server listens | -| server_port | server port | -| local_port | local port | -| password | password used for encryption | -| timeout | in seconds | -| method | encryption method, "aes-256-cfb" is recommended | -| fast_open | use [TCP_FASTOPEN][2], true / false | +| Name | Explanation | +| ------------- | ----------------------------------------------- | +| server | the address your server listens | +| server_port | server port | +| local_address | the address your local listens | +| local_port | local port | +| password | password used for encryption | +| timeout | in seconds | +| method | encryption method, "aes-256-cfb" is recommended | +| fast_open | use [TCP_FASTOPEN][2], true / false | Run `ssserver -c /etc/shadowsocks.json` on your server. To run it in the background, [use supervisor][8].