xuemingqiang/shadowsocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
795 Commits 1 Branch 0 Tags
8ac72b0b25920b72042e8ea7a769c5150c463765
Commit Graph

367 Commits

Author SHA1 Message Date
clowwindy
b5010df575 fix args on Python 3 2014-11-06 13:08:40 +08:00
clowwindy
6bbf347d0e Merge branch 'master' of https://github.com/jinliu/shadowsocks into jinliu-master 2014-11-05 18:48:49 +08:00
clowwindy
5209860db1 fix cipher name in test 2014-11-05 18:42:01 +08:00
clowwindy
f9ba6f7390 fix table test 2014-11-05 18:40:51 +08:00
clowwindy
710fe14190 rename test_cipher as it will break unit tests 2014-11-05 18:32:01 +08:00
clowwindy
039451bcfb fix encrypt_all 2014-11-05 18:30:18 +08:00
clowwindy
cbf8c6705b refactor table into a single cipher plugin 2014-11-05 18:27:18 +08:00
clowwindy
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
Felix Yan
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
clowwindy
f02e9a3132 fix EVP_CIPHER_CTX_new's arg types 2014-11-02 17:13:56 +08:00
Felix Yan
d971cb44a8 tcprelay.py: wrap long line for PEP8 2014-11-02 00:41:29 +08:00
Felix Yan
833c98e114 tcprelay.py: decode remote_addr to fix extra b'' in logging on python 3 2014-11-02 00:23:44 +08:00
clowwindy
90dc03c762 prefer ctypes over m2crypto in rc4-md5 2014-11-01 13:52:16 +08:00
clowwindy
4affb56d36 fix test 2014-11-01 13:24:40 +08:00
clowwindy
13c6c393db fix pyflakes 2014-11-01 13:10:19 +08:00
clowwindy
82ddafafa5 skip m2crypto tests on pypy 2014-11-01 13:03:13 +08:00
clowwindy
1205b8c50e skip m2crypto tests on Python 3 2014-11-01 12:52:51 +08:00
clowwindy
812a286f12 lint code 2014-11-01 12:44:22 +08:00
clowwindy
7bff002202 more cipher tests 2014-11-01 12:40:06 +08:00
clowwindy
c69a127772 add some tests 2014-11-01 12:25:44 +08:00
clowwindy
50e5e620a3 fix version detection 2014-10-31 22:27:12 +08:00
clowwindy
aff411a456 seems that dependency requires 3.3+ 2014-10-31 22:16:44 +08:00
clowwindy
0719e80fbd fix python 3.* 2014-10-31 22:08:51 +08:00
clowwindy
efd45ddfc6 fix UDP server 2014-10-31 21:59:22 +08:00
clowwindy
4699de1dd9 fix python 3.2 2014-10-31 21:53:53 +08:00
clowwindy
a502dd32fc fix UDP 2014-10-31 21:49:22 +08:00
clowwindy
5024b300f1 fix rc4-md5 2014-10-31 19:21:13 +08:00
clowwindy
be045f1687 fix import 2014-10-31 19:10:29 +08:00
clowwindy
497524b313 drop table on Python 3 2014-10-31 19:08:00 +08:00
clowwindy
05ba3cc5aa lint code 2014-10-31 18:57:06 +08:00
clowwindy
ede2b1b120 fix salsa20 on python 3 2014-10-31 18:56:24 +08:00
clowwindy
f0b0c1edfa update python requirement 2014-10-31 18:45:21 +08:00
clowwindy
0fd2f30911 lint code 2014-10-31 18:43:15 +08:00
clowwindy
2a53b67c65 python 3 support; not stable yet 2014-10-31 18:28:22 +08:00
clowwindy
0814888ba5 use absolute import 2014-10-31 16:29:19 +08:00
clowwindy
89dc6031e8 lint code 2014-10-31 16:14:28 +08:00
clowwindy
c553e7a725 lint code 2014-10-31 16:10:41 +08:00
clowwindy
ac94104ac0 use deque instead of heapq 2014-10-31 15:49:24 +08:00
clowwindy
da11d02706 fix memory leak 2014-10-31 15:14:28 +08:00
clowwindy
2461f623dd change lru behaviour; #202 2014-10-31 14:33:43 +08:00
clowwindy
9e8aa1c56a fix libcrypto on Windows 2014-10-11 00:38:19 +08:00
clowwindy
eb9b6f0a9b does not require M2Crypto anymore 2014-10-08 21:03:01 +08:00
sybblow
dfd4cdd758 avoid memory leak 
Although fd is always the smallest number which haven't been allocated, which means memory leak is quite small. but the worst situation may consume lots of memory.
 2014-09-25 20:18:02 +08:00
clowwindy
dda8f31bd3 fix PEP8 2014-09-20 20:21:09 +08:00
clowwindy
c668ddbc1b fix multiple ports 2014-09-20 19:57:55 +08:00
clowwindy
f677c8152d close #185 2014-09-20 19:11:33 +08:00
clowwindy
ab74c010fd close #183 2014-09-20 19:01:52 +08:00
clowwindy
81223902d0 fix a potential BOF 2014-09-19 01:07:10 +08:00
clowwindy
4be2731293 fix PEP8 2014-09-17 14:15:24 +08:00