Alawn/ShadowsockR
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,183 Commits 5 Branches 13 Tags
dev
Commit Graph
89 Commits
Author SHA1 Message Date
破娃酱 24623b896d fix str type 2017-05-20 14:50:27 +08:00
破娃酱 63a6de5d26 fix host type in http_simple 2017-03-23 13:16:58 +08:00
破娃酱 e0b4bdf551 refine obfs, support comment in config.json 2016-12-23 20:58:43 +08:00
V.E.O 2a6fbc87d4 fix import error of resource on windows 2016-11-10 11:25:12 +08:00
破娃酱 ac58020595 print RLIMIT_NOFILE 
always close cymysql objects
 2016-11-02 19:06:54 +08:00
破娃酱 45e27f9142 display version 2016-10-11 15:41:02 +08:00
BreakWa11 82ffa15a56 add connection stat log 2016-06-01 15:40:28 +08:00
BreakWa11 6906c7db04 rename bind -> out_bind 2016-05-18 22:10:30 +08:00
BreakWa11 f91e04b0bd TCP: bind the IP which connecting in, or set the IP by config file 
allow setting method/bind/bindv6 for each port
 2016-05-18 21:55:11 +08:00
BreakWa11 876bbbe5d8 allow default settings 2015-12-28 02:12:33 +08:00
BreakWa11 e56c5e4b90 fix index 2015-12-25 11:45:19 +08:00
BreakWa11 519c84719f add "protocol_param" 2015-12-23 18:19:57 +08:00
BreakWa11 7f480248f8 Merge pull request #27 from falseen/manyuser-travis 
fix travis
 2015-12-04 21:24:08 +08:00
BreakWa11 b5da4bc86a add MYSQL_TRANSFER_MUL 
add protocol_param (for auth_simple)
 2015-12-03 16:48:08 +08:00
BreakWa11 b606e19c0b fix default protocol setting 2015-11-02 19:42:45 +08:00
BreakWa11 b713690521 multiple-port setting 2015-11-02 16:48:24 +08:00
Falseen fcc7a4cf9b remove os.chdir(file_path) 
os.chdir(file_path) 会导致测试代码无法找到引用的包，暂时先移除。
 2015-11-01 20:35:01 +08:00
BreakWa11 d9dc3ae0b5 rename to "dns_ipv6" 
log wrong UDP header package
 2015-10-30 01:38:51 +08:00
BreakWa11 c0d1d666a4 add ipv6 config 2015-10-29 11:00:01 +08:00
BreakWa11 b31a8ea3f3 auto get realpath 2015-10-26 16:53:16 +08:00
BreakWa11 c8423e360d DNS request ipv6 first 2015-10-26 16:37:27 +08:00
BreakWa11 39dffa220f optimize code 
add logs
add timestamp
 2015-10-23 15:17:30 +08:00
falseen 96a9a25eaa 多端口模式下支持每个端口定义不同的混淆协议 
增加：多端口模式下支持每个端口定义不同的混淆协议
 2015-09-30 01:01:19 +08:00
breakwa11 6f8fc5b77f remove thread module 2015-09-25 22:17:34 +08:00
breakwa11 9defba2d36 merge master 20150810 2015-08-12 14:37:17 +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
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 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 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 be1d1d5032 add SIGINT in workers 2014-12-22 17:29:58 +08:00
clowwindy 536b7d1ee6 use SIGINT instead in tests 
Conflicts:
	tests/test.py
 2014-12-22 17:25:39 +08:00
clowwindy 134497c24f implement daemon 2014-12-21 12:47:07 +08:00
clowwindy d42a32fbc0 master should wait for child to quit 2014-12-11 13:00:08 +08:00
clowwindy 710fe14190 rename test_cipher as it will break unit tests 2014-11-05 18:32:01 +08:00
clowwindy cbf8c6705b refactor table into a single cipher plugin 2014-11-05 18:27:18 +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 dda8f31bd3 fix PEP8 2014-09-20 20:21:09 +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 2a61e80071 only output exception in verbose mode 2014-09-12 23:06:18 +08:00
clowwindy ea70a5bd79 exit 1 on error; #179 2014-09-12 22:20:33 +08:00
clowwindy fdb3a36170 implement graceful shutdown in sslocal; close #179 2014-09-12 20:47:04 +08:00
clowwindy 327c70e353 Graceful shutdown; close #179 2014-09-12 00:51:25 +08:00