Commit Graph

56 Commits

Author SHA1 Message Date
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
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
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
0fd2f30911 lint code 2014-10-31 18:43:15 +08:00
2a53b67c65 python 3 support; not stable yet 2014-10-31 18:28:22 +08:00
0814888ba5 use absolute import 2014-10-31 16:29:19 +08:00
380a646f09 handle signal soon; #179 2014-09-12 22:18:08 +08:00
e43520da58 log when closing port 2014-09-12 20:59:47 +08:00
327c70e353 Graceful shutdown; close #179 2014-09-12 00:51:25 +08:00
972bf22e6d fix PEP8 2014-08-27 00:17:26 +08:00
b7bfdb9918 add timeout support in DNS; close #138 2014-07-04 21:58:46 +03:00
cb5481499e fix tcp fastopen 2014-06-20 22:32:02 +08:00
41010d810e support -vv verbose logging 2014-06-20 21:06:15 +08:00
6c6afde2a5 auto fallback when fast open not available 2014-06-20 20:35:33 +08:00
d639a375bc remove fd logging 2014-06-19 10:11:48 +08:00
d949d11b28 larger buffer 2014-06-19 10:01:55 +08:00
35bfa56eaf fix POLL_HUP 2014-06-19 09:41:44 +08:00
46d23bf0d4 more log 2014-06-19 09:20:04 +08:00
743d3cddb5 close #132 2014-06-18 15:50:05 +08:00
a0e1a9f1b0 close #122 2014-06-18 12:59:00 +08:00
08e351a55d add more logs 2014-06-18 12:54:16 +08:00
26fa1ab555 refine comments 2014-06-08 18:28:02 +08:00
bcdc1e9671 add async dns to tcp relay 2014-06-08 17:12:00 +08:00
71c3759c12 add async dns 2014-06-08 15:58:59 +08:00
d7d125082f handle POLL_ERR first 2014-06-06 23:10:00 +08:00
816592b674 add more log 2014-06-06 22:57:57 +08:00
a185e1671b add some status protection 2014-06-06 22:52:02 +08:00
dbaf83eb7b fix a typo 2014-06-05 20:52:29 +08:00
944c422768 fix fast open 2014-06-03 23:37:36 +08:00
a08edd2007 fix fastopen local 2014-06-03 22:29:54 +08:00
8d25047d56 fix fastopen local 2014-06-03 22:26:22 +08:00
adda6d6e29 lint code 2014-06-03 22:15:59 +08:00
0c12ee04cb implement fast open in local 2014-06-03 21:59:34 +08:00
f6a9cad684 add fast open support in server 2014-06-03 21:22:53 +08:00
6c35dfd832 fix typo 2014-06-02 18:24:26 +08:00
5d022e2828 fix None 2014-06-02 18:11:38 +08:00
1966b643fc update log 2014-06-02 18:08:22 +08:00
c5bcb9a050 add timeout support 2014-06-02 17:01:35 +08:00
0e662e04b6 lint 2014-06-02 13:12:15 +08:00
cadf0e11bb fix header parsing 2014-06-02 13:11:20 +08:00
c225b808d6 UDP assoc 2014-06-02 12:53:22 +08:00
e66636867a align 2014-06-02 12:27:59 +08:00
bbad408ace rename things 2014-06-01 19:34:35 +08:00
0c8a8ef23f refine loop 2014-06-01 19:09:52 +08:00
20ba04c4ce fix tests 2014-06-01 17:24:10 +08:00
fd35f1d067 fix server 2014-06-01 17:18:02 +08:00
f49d086d6a add event names 2014-06-01 17:17:50 +08:00
c721a1c02f local works 2014-06-01 15:58:37 +08:00