BreakWa11
1ee344220a
merge manyuser 2.6.13
2015-11-02 20:13:54 +08:00
breakwa11
7df3152608
merge manyuser
2015-10-27 12:19:05 +08:00
breakwa11
1bc0e60cfd
merge manyuser branch
2015-10-20 18:41:35 +08:00
breakwa11
3200b7d4fe
merge manyuser branch
2015-10-04 23:05:20 +08:00
breakwa11
8f402277e6
merge manyuser branch
2015-10-04 20:07:58 +08:00
breakwa11
a37623b0b7
log TCP header if parse error
2015-09-02 12:54:37 +08:00
breakwa11
5b6dec5940
merge manyuser branch
2015-08-27 16:42:40 +08:00
breakwa11
a38db829f2
new UDP over TCP protocol, merge master
2015-08-05 16:26:21 +08:00
breakwa11
1b0504ade2
merge manyuser branch
2015-06-26 15:18:14 +08:00
breakwa11
e5b4a804e9
double UDP sockets for IPv4 and IPv6
2015-06-20 18:59:59 +08:00
breakwa11
3d1563ecac
fix udp ipv6
2015-06-20 17:58:03 +08:00
breakwa11
c549929dfb
fix udp ipv6
2015-06-16 21:57:01 +08:00
breakwa11
d065dba34f
merge manyuser
...
udp ipv6 bug fix
2015-06-16 13:13:19 +08:00
breakwa11
f16749962a
drop UDP message if frag != 0
2015-06-10 14:22:27 +08:00
breakwa11
62dca9d3cd
udp over tcp
2015-06-09 23:59:03 +08:00
Felix Yan
edb7822a7b
convert remote_address to str so it will be printed more correctly on python 3
2015-02-11 10:40:20 +08:00
clowwindy
d774286dc0
rename utils module into shell
...
Since utils is ambiguous, we want to give the module a more
clear role.
2015-02-10 17:26:10 +08:00
clowwindy
cb7062e1c1
implement utils.print_exception()
...
Previously we used logging.error(e) and traceback.print_exc()
to output error stack trace. The problem is, we want to
output the stack trace only when verbose > 0. The if statement
scattered around the code. So we replaced them with the new
utils.print_exception() call.
2015-02-10 17:21:29 +08:00
clowwindy
dfd81af844
support --version
2015-02-09 14:43:11 +08:00
clowwindy
783a6ef7f2
support multiple server ip on client side
2015-02-09 13:50:46 +08:00
clowwindy
ce805f0aea
license under Apache License v2.0
2015-02-03 14:10:36 +08:00
clowwindy
ada97ab6d9
improve comments
2015-01-31 02:58:40 +08:00
clowwindy
1f8819f790
fix #270
2015-01-23 17:33:48 +08:00
clowwindy
4312eb9e58
add forbidden support for UDP and add tests
2015-01-12 23:02:59 +08:00
clowwindy
eb94bd1cc3
support forbidden iplist
2015-01-12 22:30:03 +08:00
clowwindy
bac675d7f6
2015
2015-01-03 13:24:40 +08:00
clowwindy
291adf8b85
log client address
2015-01-03 12:48:03 +08:00
clowwindy
e8501da271
fix vim
2014-12-25 16:23:43 +08:00
clowwindy
99c8bbafe7
fix fastopen and add a new test
2014-12-25 16:20:15 +08:00
clowwindy
7274c7ad96
fix comments
2014-12-18 13:34:41 +08:00
clowwindy
706a137b3f
fix typo
2014-12-18 13:29:00 +08:00
clowwindy
4b0b252953
improve comments
2014-12-18 13:23:59 +08:00
clowwindy
fa31a233b6
add ipv6 tests
2014-11-10 15:04:30 +08:00
Bin Wang
f43906006a
fix str/byte issue in python 3
2014-11-10 10:37:37 +08:00
clowwindy
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
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
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
380a646f09
handle signal soon; #179
2014-09-12 22:18:08 +08:00
clowwindy
e43520da58
log when closing port
2014-09-12 20:59:47 +08:00
clowwindy
327c70e353
Graceful shutdown; close #179
2014-09-12 00:51:25 +08:00
clowwindy
972bf22e6d
fix PEP8
2014-08-27 00:17:26 +08:00
clowwindy
b7bfdb9918
add timeout support in DNS; close #138
2014-07-04 21:58:46 +03:00
clowwindy
cb5481499e
fix tcp fastopen
2014-06-20 22:32:02 +08:00
clowwindy
41010d810e
support -vv verbose logging
2014-06-20 21:06:15 +08:00
clowwindy
6c6afde2a5
auto fallback when fast open not available
2014-06-20 20:35:33 +08:00
clowwindy
d639a375bc
remove fd logging
2014-06-19 10:11:48 +08:00