Skip to content

Commit 2c63372

Browse files
ziggearziggear
committed
first commit
0 parents  commit 2c63372

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+8429
-0
lines changed

‎.gitignore

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
*.py[co]
2+
3+
# Packages
4+
*.egg
5+
*.egg-info
6+
dist
7+
build
8+
eggs
9+
parts
10+
bin
11+
var
12+
sdist
13+
develop-eggs
14+
.installed.cfg
15+
16+
# Installer logs
17+
pip-log.txt
18+
19+
# Unit test / coverage reports
20+
htmlcov
21+
.coverage*
22+
.tox
23+
24+
#Translations
25+
*.mo
26+
27+
#Mr Developer
28+
.mr.developer.cfg
29+
30+
.DS_Store
31+
.idea

‎.travis.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
language: python
2+
python:
3+
- 2.6
4+
- 2.7
5+
- 3.3
6+
- 3.4
7+
cache:
8+
directories:
9+
- dante-1.4.0
10+
before_install:
11+
- sudo apt-get update -qq
12+
- sudo apt-get install -qq build-essential dnsutils iproute nginx bc
13+
- sudo dd if=/dev/urandom of=/usr/share/nginx/www/file bs=1M count=10
14+
- sudo sh -c "echo '127.0.0.1 localhost' > /etc/hosts"
15+
- sudo service nginx restart
16+
- pip install pep8 pyflakes nose coverage PySocks
17+
- sudo tests/socksify/install.sh
18+
- sudo tests/libsodium/install.sh
19+
- sudo tests/setup_tc.sh
20+
script:
21+
- tests/jenkins.sh

‎CHANGES

+256
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,256 @@
1+
2.8.2 2015-08-10
2+
- Fix a encoding problem in manager
3+
4+
2.8.1 2015-08-06
5+
- Respond ok to add and remove commands
6+
7+
2.8 2015-08-06
8+
- Add Shadowsocks manager
9+
10+
2.7 2015-08-02
11+
- Optimize speed for multiple ports
12+
13+
2.6.11 2015-07-10
14+
- Fix a compatibility issue in UDP Relay
15+
16+
2.6.10 2015-06-08
17+
- Optimize LRU cache
18+
- Refine logging
19+
20+
2.6.9 2015-05-19
21+
- Fix a stability issue on Windows
22+
23+
2.6.8 2015-02-10
24+
- Support multiple server ip on client side
25+
- Support --version
26+
- Minor fixes
27+
28+
2.6.7 2015-02-02
29+
- Support --user
30+
- Support CIDR format in --forbidden-ip
31+
- Minor fixes
32+
33+
2.6.6 2015-01-23
34+
- Fix a crash in forbidden list
35+
36+
2.6.5 2015-01-18
37+
- Try both 32 bit and 64 bit dll on Windows
38+
39+
2.6.4 2015-01-14
40+
- Also search lib* when searching libraries
41+
42+
2.6.3 2015-01-12
43+
- Support --forbidden-ip to ban some IP, i.e. localhost
44+
- Search OpenSSL and libsodium harder
45+
- Now works on OpenWRT
46+
47+
2.6.2 2015-01-03
48+
- Log client IP
49+
50+
2.6.1 2014-12-26
51+
- Fix a problem with TCP Fast Open on local side
52+
- Fix sometimes daemon_start returns wrong exit status
53+
54+
2.6 2014-12-21
55+
- Add daemon support
56+
57+
2.5 2014-12-11
58+
- Add salsa20 and chacha20
59+
60+
2.4.3 2014-11-10
61+
- Fix an issue on Python 3
62+
- Fix an issue with IPv6
63+
64+
2.4.2 2014-11-06
65+
- Fix command line arguments on Python 3
66+
- Support table on Python 3
67+
- Fix TCP Fast Open on Python 3
68+
69+
2.4.1 2014-11-01
70+
- Fix setup.py for non-utf8 locales on Python 3
71+
72+
2.4 2014-11-01
73+
- Python 3 support
74+
- Performance improvement
75+
- Fix LRU cache behavior
76+
77+
2.3.2 2014-10-11
78+
- Fix OpenSSL on Windows
79+
80+
2.3.1 2014-10-09
81+
- Does not require M2Crypto any more
82+
83+
2.3 2014-09-23
84+
- Support CFB1, CFB8 and CTR mode of AES
85+
- Do not require password config when using port_password
86+
- Use SIGTERM instead of SIGQUIT on Windows
87+
88+
2.2.2 2014-09-14
89+
- Fix when multiple DNS set, IPv6 only sites are broken
90+
91+
2.2.1 2014-09-10
92+
- Support graceful shutdown
93+
- Fix some bugs
94+
95+
2.2.0 2014-09-09
96+
- Add RC4-MD5 encryption
97+
98+
2.1.0 2014-08-10
99+
- Use only IPv4 DNS server
100+
- Does not ship config.json
101+
- Better error message
102+
103+
2.0.12 2014-07-26
104+
- Support -q quiet mode
105+
- Exit 0 when showing help with -h
106+
107+
2.0.11 2014-07-12
108+
- Prefers IP addresses over hostnames, more friendly with socksify and openvpn
109+
110+
2.0.10 2014-07-11
111+
- Fix UDP on local
112+
113+
2.0.9 2014-07-06
114+
- Fix EWOULDBLOCK on Windows
115+
- Fix Unicode config problem on some platforms
116+
117+
2.0.8 2014-06-23
118+
- Use multiple DNS to query hostnames
119+
120+
2.0.7 2014-06-21
121+
- Fix fastopen on local
122+
- Fallback when fastopen is not available
123+
- Add verbose logging mode -vv
124+
- Verify if hostname is valid
125+
126+
2.0.6 2014-06-19
127+
- Fix CPU 100% on POLL_HUP
128+
- More friendly logging
129+
130+
2.0.5 2014-06-18
131+
- Support a simple config format for multiple ports
132+
133+
2.0.4 2014-06-12
134+
- Fix worker master
135+
136+
2.0.3 2014-06-11
137+
- Fix table encryption with UDP
138+
139+
2.0.2 2014-06-11
140+
- Add asynchronous DNS in TCP relay
141+
142+
2.0.1 2014-06-05
143+
- Better logging
144+
- Maybe fix bad file descriptor
145+
146+
2.0 2014-06-05
147+
- Use a new event model
148+
- Remove gevent
149+
- Refuse to use default password
150+
- Fix a problem when using multiple passwords with table encryption
151+
152+
1.4.5 2014-05-24
153+
- Add timeout in TCP server
154+
- Close sockets in master process
155+
156+
1.4.4 2014-05-17
157+
- Support multiple workers
158+
159+
1.4.3 2014-05-13
160+
- Fix Windows
161+
162+
1.4.2 2014-05-10
163+
- Add salsa20-ctr cipher
164+
165+
1.4.1 2014-05-03
166+
- Fix error log
167+
- Fix EINPROGESS with some version of gevent
168+
169+
1.4.0 2014-05-02
170+
- Adds UDP relay
171+
- TCP fast open support on Linux 3.7+
172+
173+
1.3.7 2014-04-10
174+
- Fix a typo in help
175+
176+
1.3.6 2014-04-10
177+
- Fix a typo in help
178+
179+
1.3.5 2014-04-07
180+
- Add help
181+
- Change default local binding address into 127.0.0.1
182+
183+
1.3.4 2014-02-17
184+
- Fix a bug when no config file exists
185+
- Client now support multiple server ports and multiple server/port pairs
186+
- Better error message with bad config.json format and wrong password
187+
188+
1.3.3 2013-07-09
189+
- Fix default key length of rc2
190+
191+
1.3.2 2013-07-04
192+
- Server will listen at server IP specified in config
193+
- Check config file and show some warning messages
194+
195+
1.3.1 2013-06-29
196+
- Fix -c arg
197+
198+
1.3.0 2013-06-22
199+
- Move to pypi
200+
201+
1.2.3 2013-06-14
202+
- add bind address
203+
204+
1.2.2 2013-05-31
205+
- local can listen at ::0 with -6 arg; bump 1.2.2
206+
207+
1.2.1 2013-05-23
208+
- Fix an OpenSSL crash
209+
210+
1.2 2013-05-22
211+
- Use random iv, we finally have strong encryption
212+
213+
1.1.1 2013-05-21
214+
- Add encryption, AES, blowfish, etc.
215+
216+
1.1 2013-05-16
217+
- Support IPv6 addresses (type 4)
218+
- Drop Python 2.5 support
219+
220+
1.0 2013-04-03
221+
- Fix -6 IPv6
222+
223+
0.9.4 2013-03-04
224+
- Support Python 2.5
225+
226+
0.9.3 2013-01-14
227+
- Fix conn termination null data
228+
229+
0.9.2 2013-01-05
230+
- Change default timeout
231+
232+
0.9.1 2013-01-05
233+
- Add Travis-CI test
234+
235+
0.9 2012-12-30
236+
- Replace send with sendall, fix FreeBSD
237+
238+
0.6 2012-12-06
239+
- Support args
240+
241+
0.5 2012-11-08
242+
- Fix encryption with negative md5sum
243+
244+
0.4 2012-11-02
245+
- Move config into a JSON file
246+
- Auto-detect config path
247+
248+
0.3 2012-06-06
249+
- Move socks5 negotiation to local
250+
251+
0.2 2012-05-11
252+
- Add -6 arg for IPv6
253+
- Fix socket.error
254+
255+
0.1 2012-04-20
256+
- Initial version

‎CONTRIBUTING.md

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
How to Contribute
2+
=================
3+
4+
Notice this is the repository for Shadowsocks Python version. If you have problems with Android / iOS / Windows etc clients, please post your questions in their issue trackers.
5+
6+
Pull Requests
7+
-------------
8+
9+
1. Pull requests are welcome. If you would like to add a large feature
10+
or make a significant change, make sure to open an issue to discuss with
11+
people first.
12+
2. Follow PEP8.
13+
3. Make sure to pass the unit tests. Write unit tests for new modules if
14+
needed.
15+
16+
Issues
17+
------
18+
19+
1. Only bugs and feature requests are accepted here.
20+
2. We'll only work on important features. If the feature you're asking only
21+
benefits a few people, you'd better implement the feature yourself and send us
22+
a pull request, or ask some of your friends to do so.
23+
3. We don't answer questions of any other types here. Since very few people
24+
are watching the issue tracker here, you'll probably get no help from here.
25+
Read [Troubleshooting] and get help from forums or [mailing lists].
26+
4. Issues in languages other than English will be Google translated into English
27+
later.
28+
29+
30+
[Troubleshooting]: https://github.com/clowwindy/shadowsocks/wiki/Troubleshooting
31+
[mailing lists]: https://groups.google.com/forum/#!forum/shadowsocks

0 commit comments

Comments
 (0)