BreakWa11
d47b0d47ea
add config "udp_timeout"
drop TCP over UDP query
9 years ago
BreakWa11
68a77ddc70
load 'user-config.json' first
set default obfs plugin 'tls1.0_session_auth_compatible'
9 years ago
BreakWa11
b5da4bc86a
add MYSQL_TRANSFER_MUL
add protocol_param (for auth_simple)
9 years ago
BreakWa11
cb17c7b3b5
let setting & code simple
add "protocol" in config.json
9 years ago
breakwa11
612c1e2ab3
add obfs_param
catch TCP&UDP exceptions
verify_simple&verify_deflate support sub obfs
9 years ago
falseen
6d963cea44
添加混淆插件参数"-o"
9 years ago
breakwa11
71338a7385
fix on python3
http2 obfs
9 years ago
breakwa11
9defba2d36
merge master 20150810
9 years ago
Kim Wong
e17279e5bf
remove duplicated line (refer line 221)
10 years ago
lazybios
d3831bef8c
remove duplicate code from shell.py
10 years ago
clowwindy
d774286dc0
rename utils module into shell
Since utils is ambiguous, we want to give the module a more
clear role.
10 years ago
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.
10 years ago
clowwindy
dfd81af844
support --version
10 years ago
clowwindy
e71ce6c758
fix server check
10 years ago
clowwindy
e564f17505
fix bytes in utils
10 years ago
clowwindy
318d88ec89
use string more
10 years ago
clowwindy
ce805f0aea
license under Apache License v2.0
10 years ago
clowwindy
1c81465436
fix command line
10 years ago
clowwindy
73f21ffbf6
do not check config for daemon stop
10 years ago
clowwindy
7aa37cad8e
check cipher before daemon start
fix #280
10 years ago
clowwindy
ae99698b4e
implement --user
fix @278
10 years ago
clowwindy
453a9c61a6
show CIDR error more friendly
10 years ago
Sunny
070108f78b
Disable forbidden ip feature for local shadowsocks
Since forbidden ip is server-side only, disable it for local-side.
This commit also supress warning about IPv6 loopback because I can
confirm ::1/128 is the only loopback address, not like IPv4.
10 years ago
Sunny
8af359ae05
Use IPNetwork supporting forbidden ip feature in config utils
This commit also make "forbidden_ip" field available in config file.
If no forbidden ip specified in command line and config file,
default to "127.0.0.0/8,::1".
10 years ago
clowwindy
eb94bd1cc3
support forbidden iplist
10 years ago
peter
8b2deb01d8
Set default method as bytes.
Default method as string may cause false error report.
10 years ago
clowwindy
0bc0117cd7
update help url
10 years ago
clowwindy
30f4f78557
fix travis
10 years ago
clowwindy
134497c24f
implement daemon
10 years ago
clowwindy
b5010df575
fix args on Python 3
10 years ago
clowwindy
cbf8c6705b
refactor table into a single cipher plugin
10 years ago
clowwindy
50e5e620a3
fix version detection
10 years ago
clowwindy
aff411a456
seems that dependency requires 3.3+
10 years ago
clowwindy
0719e80fbd
fix python 3.*
10 years ago
clowwindy
4699de1dd9
fix python 3.2
10 years ago
clowwindy
f0b0c1edfa
update python requirement
10 years ago
clowwindy
2a53b67c65
python 3 support; not stable yet
10 years ago
clowwindy
c668ddbc1b
fix multiple ports
10 years ago
clowwindy
ab74c010fd
close #183
10 years ago
clowwindy
327c70e353
Graceful shutdown; close #179
10 years ago
clowwindy
972bf22e6d
fix PEP8
10 years ago
clowwindy
ca6f72e22b
better error msg
10 years ago
clowwindy
72fe18212e
add quiet mode; close #164
10 years ago
clowwindy
da842918bd
close #158
10 years ago
clowwindy
b0c8e50492
fix #145
10 years ago
clowwindy
61d9e17cae
remove print
11 years ago
clowwindy
41010d810e
support -vv verbose logging
11 years ago
clowwindy
d3f294217c
close #121
11 years ago
clowwindy
8aae1f07ca
warn table encryption
11 years ago
clowwindy
c5bcb9a050
add timeout support
11 years ago