breakwa11
9df46398d6
Merge branch 'manyuser' of git@breakwa11:breakwa11/shadowsocks.git into manyuser
2015-09-11 21:19:47 +08:00
breakwa11
a723c2f05e
add obfs plugin
2015-09-11 21:19:04 +08:00
falseen
b6961974ba
兼容py3，修正语法错误，加载libcrypto模块失败时显示详细错误。
...
修正语法错误：` except Exception, e: ` 是旧版本的语法，py2.6之后的版本已不再使用此语法。
加载libcrypto模块失败时显示详细错误。
2015-09-11 20:23:27 +08:00
falseen
5a5b897578
兼容py3，显示详细错误。
...
兼容py3，显示详细错误。
2015-09-10 02:00:43 +08:00
breakwa11
55d10ace01
simple reverse proxy
2015-09-02 23:57:51 +08:00
breakwa11
56af51b43c
log TCP header if parse error
2015-09-01 16:58:05 +08:00
breakwa11
5249fd528c
add FORCE_NEW_PROTOCOL switch
2015-08-28 13:35:10 +08:00
breakwa11
61959945c3
revert encrypt.py
...
new obfs header
2015-08-27 16:41:00 +08:00
breakwa11
928c26e4f2
fix some exceptions
2015-08-15 12:47:14 +08:00
breakwa11
9defba2d36
merge master 20150810
2015-08-12 14:37:17 +08:00
breakwa11
e5e3102591
remove debug code
...
add AddressMap for udp
2015-08-10 12:47:37 +08:00
breakwa11
a9ea55c396
new UDP over TCP protocol, merge master
2015-08-05 16:24:14 +08:00
breakwa11
469d9f7bfa
merge master
2015-07-14 19:02:52 +08:00
breakwa11
69d369268a
update run.sh, set working dir
2015-07-09 16:42:46 +08:00
breakwa11
f78f5b56e3
client_key change
2015-07-02 15:21:05 +08:00
breakwa11
3af426b13b
remove tail
2015-06-30 15:34:02 +08:00
breakwa11
543a5903a1
encrypt speed test
2015-06-26 11:33:59 +08:00
breakwa11
ad588af75f
single user script
2015-06-24 12:56:46 +08:00
breakwa11
d4ca0d281c
always UDP on
...
random length TCP/UDP packet
2015-06-23 17:43:20 +08:00
breakwa11
28318b5c1a
double UDP sockets for IPv4 and IPv6
2015-06-20 18:59:20 +08:00
breakwa11
1f530ff8f1
fix udp ipv6
2015-06-20 17:56:33 +08:00
breakwa11
17122c299c
fix udp ipv6
2015-06-16 21:55:36 +08:00
breakwa11
4b52f83376
udp ipv6
2015-06-16 13:10:43 +08:00
breakwa11
07dc98f60d
udp fix sendto argv
2015-06-16 13:00:30 +08:00
breakwa11
565812ae15
elaborate reasons of header parsing failure
2015-06-11 01:07:54 +08:00
breakwa11
1e71fba852
drop UDP message if frag != 0
2015-06-10 14:21:22 +08:00
breakwa11
c27f6283a2
UDP remote DNS resolve
2015-06-09 23:59:49 +08:00
breakwa11
f2efed9608
add manyuser branch
...
support udp over tcp
support chacha20 & salsa20 (base on libsodium)
2015-06-08 20:03:10 +08:00
clowwindy
e74ae193d0
elaborate reasons of header parsing failure
2015-06-08 08:29:01 +08:00
clowwindy
16db66675b
optimize LRUCache
2015-05-19 08:35:28 +08:00
clowwindy
082c8a80f4
fix duplicated close in LRUCache
...
close #324
2015-05-19 08:14:47 +08:00
Kim Wong
e17279e5bf
remove duplicated line (refer line 221)
2015-03-14 07:35:43 +08:00
lazybios
d3831bef8c
remove duplicate code from shell.py
2015-03-01 14:14:35 +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
e71ce6c758
fix server check
2015-02-03 18:45:36 +08:00
clowwindy
e564f17505
fix bytes in utils
2015-02-03 18:23:22 +08:00
clowwindy
6d09cd21ca
fix openssl
2015-02-03 18:13:01 +08:00
clowwindy
318d88ec89
use string more
2015-02-03 18:09:07 +08:00
clowwindy
ce805f0aea
license under Apache License v2.0
2015-02-03 14:10:36 +08:00
clowwindy
0cd261dd10
catch KeyError
2015-02-02 16:22:56 +08:00
clowwindy
1c81465436
fix command line
2015-02-02 15:57:44 +08:00
clowwindy
73f21ffbf6
do not check config for daemon stop
2015-02-02 15:50:41 +08:00
clowwindy
7aa37cad8e
check cipher before daemon start
...
fix #280
2015-02-02 15:46:22 +08:00
clowwindy
ae99698b4e
implement --user
...
fix @278
2015-02-02 15:38:55 +08:00
clowwindy
453a9c61a6
show CIDR error more friendly
2015-02-01 09:09:35 +08:00
Sunny
a0aa9173a8
Fix for Python3 map changed behavior
...
In Python3, map returns an iterator instead of list in Python2,
which cause map "lazier" than before, wrap with list() force it running.
2015-02-01 02:37:30 +08:00
breakwa11
falseen
clowwindy
Kim Wong
lazybios
Felix Yan
Sunny