Commit Graph

244 Commits

Author SHA1 Message Date
5ea8403e56 fix daemon and add fastopen tests 2014-12-22 22:42:39 +08:00
be1d1d5032 add SIGINT in workers 2014-12-22 17:29:58 +08:00
536b7d1ee6 use SIGINT instead in tests
Conflicts:
	tests/test.py
2014-12-22 17:25:39 +08:00
2b4c3619d6 reorder setsid and kill 2014-12-21 14:52:00 +08:00
dae2624b30 add setsid 2014-12-21 14:49:51 +08:00
35c3b0b41c refine documentation 2014-12-21 14:06:28 +08:00
28347b685e add unit test for daemon 2014-12-21 13:46:27 +08:00
134497c24f implement daemon 2014-12-21 12:47:07 +08:00
7274c7ad96 fix comments 2014-12-18 13:34:41 +08:00
706a137b3f fix typo 2014-12-18 13:29:00 +08:00
4b0b252953 improve comments 2014-12-18 13:23:59 +08:00
163992b98b small fix 2014-12-12 00:04:17 +08:00
676bf9617b fix key cache when just method changes 2014-12-11 23:45:39 +08:00
cbbc880f44 try to find the problem 2014-12-11 23:22:48 +08:00
810db996cd disable M2Crypto on Python 3 2014-12-11 22:54:49 +08:00
3e503bf677 log method in encrypt unit test 2014-12-11 22:43:46 +08:00
1459282ae6 only test some ciphers 2014-12-11 18:02:57 +08:00
4d5d6c7c85 add unit tests in encrypt 2014-12-11 17:47:12 +08:00
134bf332a4 remove domain not existed test(causing time out) 2014-12-11 14:13:58 +08:00
e1f2046229 lint code 2014-12-11 14:09:18 +08:00
030cdbcec0 add asyncdns test 2014-12-11 14:08:34 +08:00
d42a32fbc0 master should wait for child to quit 2014-12-11 13:00:08 +08:00
e6416562fc add salsa20 and chacha20 2014-12-10 23:19:11 +08:00
84dcff83c1 add libsodium support 2014-12-10 23:11:22 +08:00
fa31a233b6 add ipv6 tests 2014-11-10 15:04:30 +08:00
f43906006a fix str/byte issue in python 3 2014-11-10 10:37:37 +08:00
70dae91e7c add tests for common.py 2014-11-06 14:04:28 +08:00
b5010df575 fix args on Python 3 2014-11-06 13:08:40 +08:00
6bbf347d0e Merge branch 'master' of https://github.com/jinliu/shadowsocks into jinliu-master 2014-11-05 18:48:49 +08:00
5209860db1 fix cipher name in test 2014-11-05 18:42:01 +08:00
f9ba6f7390 fix table test 2014-11-05 18:40:51 +08:00
710fe14190 rename test_cipher as it will break unit tests 2014-11-05 18:32:01 +08:00
039451bcfb fix encrypt_all 2014-11-05 18:30:18 +08:00
cbf8c6705b refactor table into a single cipher plugin 2014-11-05 18:27:18 +08:00
2519fb9abe Merge pull request #208 from felixonmars/table-py3
encrypt.py: port table to support python 3 (recreated)
2014-11-05 17:15:43 +08:00
aca86f8685 encrypt.py: port table to support python 3 2014-11-05 16:54:51 +08:00
fb27cf52a9 Fix str/byte related TypeError in Python 3.4
Traceback (most recent call last):
File "/usr/bin/sslocal", line 9, in <module>
load_entry_point('shadowsocks==2.4', 'console_scripts', 'sslocal')()
File "/usr/lib/python3.4/site-packages/shadowsocks/local.py", line 68, in main
loop.run()
File "/usr/lib/python3.4/site-packages/shadowsocks/eventloop.py", line 230, in run
handler(events)
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 630, in _handle_events
handler.handle_event(sock, event)
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 458, in handle_event
self._on_local_read()
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 377, in _on_local_read
self._handle_stage_reply(data)
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 212, in _handle_stage_reply
s = remote_sock.sendto(data, MSG_FASTOPEN, self._chosen_server)
TypeError: 'str' does not support the buffer interface
2014-11-05 11:04:40 +08:00
f02e9a3132 fix EVP_CIPHER_CTX_new's arg types 2014-11-02 17:13:56 +08:00
d971cb44a8 tcprelay.py: wrap long line for PEP8 2014-11-02 00:41:29 +08:00
833c98e114 tcprelay.py: decode remote_addr to fix extra b'' in logging on python 3 2014-11-02 00:23:44 +08:00
90dc03c762 prefer ctypes over m2crypto in rc4-md5 2014-11-01 13:52:16 +08:00
4affb56d36 fix test 2014-11-01 13:24:40 +08:00
13c6c393db fix pyflakes 2014-11-01 13:10:19 +08:00
82ddafafa5 skip m2crypto tests on pypy 2014-11-01 13:03:13 +08:00
1205b8c50e skip m2crypto tests on Python 3 2014-11-01 12:52:51 +08:00
812a286f12 lint code 2014-11-01 12:44:22 +08:00
7bff002202 more cipher tests 2014-11-01 12:40:06 +08:00
c69a127772 add some tests 2014-11-01 12:25:44 +08:00
50e5e620a3 fix version detection 2014-10-31 22:27:12 +08:00
aff411a456 seems that dependency requires 3.3+ 2014-10-31 22:16:44 +08:00