vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bump version

Browse source
This commit is contained in:
clowwindy 2013-05-21 16:52:22 +08:00
parent faf49fc3ac
commit 0aa252e2b0
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -2,7 +2,7 @@ shadowsocks
=========== ===========
[![Build Status](https://travis-ci.org/clowwindy/shadowsocks.png)](https://travis-ci.org/clowwindy/shadowsocks) [![Build Status](https://travis-ci.org/clowwindy/shadowsocks.png)](https://travis-ci.org/clowwindy/shadowsocks)
Current version: 1.1 Current version: 1.1.1
shadowsocks is a lightweight tunnel proxy which can help you get through firewalls shadowsocks is a lightweight tunnel proxy which can help you get through firewalls
@ -23,23 +23,25 @@ Then edit `config.json`, change the following values:
server_port server port server_port server port
local_port local port local_port local port
password a password used to encrypt transfer password a password used to encrypt transfer
method encryption method, "bf-cfb", "aes-256-cfb", "des-cfb", "rc4", etc. Default is table
Put all the files on your server. Run `python server.py` on your server. To run it in the background, run `nohup python server.py > log &`. Put all the files on your server. Run `python server.py` on your server. To run it in the background, run `nohup python server.py > log &`.
Put all the files on your client machine. Run `python local.py` on your client machine. Put all the files on your client machine. Run `python local.py` on your client machine.
Change proxy settings of your browser into Change the proxy setting in your browser into
SOCKS5 127.0.0.1:local_port
protocol: socks5
hostname: 127.0.0.1
port: your local_port
advanced advanced
------------ ------------
You can use args to override settings from `config.json`. You can use args to override settings from `config.json`.
python local.py -s server_name -p server_port -l local_port -k password python local.py -s server_name -p server_port -l local_port -k password -m bf-cfb
python server.py -p server_port -k password python server.py -p server_port -k password -m bf-cfb
You may want to install gevent for better performance. You may want to install gevent for better performance.

2
local.py
View file

@ -152,7 +152,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
if __name__ == '__main__': if __name__ == '__main__':
os.chdir(os.path.dirname(__file__) or '.') os.chdir(os.path.dirname(__file__) or '.')
print 'shadowsocks v1.1' print 'shadowsocks v1.1.1'
with open('config.json', 'rb') as f: with open('config.json', 'rb') as f:
config = json.load(f) config = json.load(f)

2
server.py
View file

@ -122,7 +122,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
if __name__ == '__main__': if __name__ == '__main__':
os.chdir(os.path.dirname(__file__) or '.') os.chdir(os.path.dirname(__file__) or '.')
print 'shadowsocks v1.1' print 'shadowsocks v1.1.1'
with open('config.json', 'rb') as f: with open('config.json', 'rb') as f:
config = json.load(f) config = json.load(f)