Commit graph

768 commits

Author SHA1 Message Date
BreakWa11
cb17c7b3b5 let setting & code simple
add "protocol" in config.json
2015-11-02 15:13:54 +08:00
BreakWa11
c02fcbf746 refine
time diff set to 5 min
2015-10-30 10:22:04 +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
e6d7a12afe fix bugs
dns working in both v4 & v6
connecting problem in windows
2015-10-28 22:28:24 +08:00
BreakWa11
011415f710 auth package size not less than head size 2015-10-27 21:10:45 +08:00
BreakWa11
8ee4cd513a a stupid bug 2015-10-27 19:13:38 +08:00
BreakWa11
5137377580 bump 2.6.12 2015-10-27 12:24:11 +08:00
BreakWa11
f5fbf579e2 fix 'http2_simple' & 'tls_simple' 2015-10-27 10:02:53 +08:00
BreakWa11
33d907cc08 fix 'http_simple' & 'random_head' 2015-10-26 23:48:11 +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
6ee8035735 merge pr from mengskysama 2015-10-26 14:48:54 +08:00
BreakWa11
59105f6e64 support auth_simple 2015-10-26 14:43:17 +08:00
BreakWa11
83c8b50ea2 add startup time in auth_simple 2015-10-23 22:23:59 +08:00
BreakWa11
39dffa220f optimize code
add logs
add timestamp
2015-10-23 15:17:30 +08:00
BreakWa11
0ba76b666d not redirect host to chn web
add auth_simple
2015-10-22 15:55:38 +08:00
BreakWa11
126afea524 delete buffer 2015-10-22 10:41:40 +08:00
BreakWa11
3f66ec443f remove FORCE_NEW_PROTOCOL 2015-10-21 22:37:32 +08:00
BreakWa11
041a5c1046 optimize decrypt
first recv size < iv_len will cause decrypt error
2015-10-21 22:02:22 +08:00
BreakWa11
79260ff4ab check duplicate port 2015-10-21 14:53:14 +08:00
breakwa11
eec312cc4c bump 2.6.11 2015-10-20 18:47:31 +08:00
breakwa11
6be40dbf1e Merge branch 'manyuser' of git@breakwa11:breakwa11/shadowsocks.git into manyuser 2015-10-20 17:25:41 +08:00
breakwa11
4551d5c268 shorter code 2015-10-20 17:01:37 +08:00
breakwa11
612c1e2ab3 add obfs_param
catch TCP&UDP exceptions
verify_simple&verify_deflate support sub obfs
2015-10-20 16:25:06 +08:00
BreakWa11
8988926ec7 Merge pull request #20 from falseen/manyuser
添加混淆插件参数"-o"
2015-10-11 23:46:56 +08:00
falseen
6d963cea44 添加混淆插件参数"-o" 2015-10-11 22:38:46 +08:00
breakwa11
c73127d858 insert a reload step
main thread run 'thread_db' directly
insert a 'ulimit' command before run the server
2015-10-10 19:47:50 +08:00
breakwa11
36dc8f9463 add verify_deflate 2015-10-09 13:07:52 +08:00
breakwa11
a597e61093 obfs plugins compatible version 2015-10-04 22:59:45 +08:00
breakwa11
463ce07426 add verify_simple module 2015-10-04 19:56:58 +08:00
BreakWa11
e9f005c926 Merge pull request #17 from falseen/path-1
多端口模式下支持每个端口定义不同的混淆协议
2015-09-30 01:27:29 +08:00
falseen
96a9a25eaa 多端口模式下支持每个端口定义不同的混淆协议
增加:多端口模式下支持每个端口定义不同的混淆协议
2015-09-30 01:01:19 +08:00
breakwa11
74972875ff tiny fix 2015-09-28 17:48:27 +08:00
breakwa11
f9cdf2090f add crc verify 2015-09-26 22:33:11 +08:00
breakwa11
e060fd5b4d tiny bug 2015-09-26 00:04:08 +08:00
breakwa11
93c94fbe3c Merge branch 'manyuser' of git@breakwa11:breakwa11/shadowsocks.git into manyuser 2015-09-25 23:25:58 +08:00
breakwa11
f9e8af6358 add random_head obfs 2015-09-25 23:25:18 +08:00
BreakWa11
bbbb9995d8 Merge pull request #15 from falseen/path-1
优化细节。
2015-09-25 23:24:19 +08:00
falseen
680c128c72 优化细节。
修复:搜索完所有路径之后再判断是否抛出错误,而不是遇到错误就抛出。主要是考虑到系统中同时存在32位和64位dll的情况,原来的代码如果第一个找到的dll文件跟系统不符的话会直接报错。
2015-09-25 23:17:01 +08:00
breakwa11
6f8fc5b77f remove thread module 2015-09-25 22:17:34 +08:00
breakwa11
3e5cbb955e add obfs: 'tls_simple' 2015-09-25 21:29:11 +08:00
breakwa11
71338a7385 fix on python3
http2 obfs
2015-09-25 11:28:09 +08:00
breakwa11
2e3114f40f fix 'ord' bug
replace 'xrange'
support new protocol when run as a client
2015-09-21 14:41:42 +08:00
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
BreakWa11
ac19b91719 Merge pull request #11 from falseen/manyuser
兼容py3,修正语法错误,加载libcrypto模块失败时显示详细错误。
2015-09-11 21:13:38 +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
Falseen
401da7815f Merge pull request #2 from breakwa11/manyuser
fork Manyuser
2015-09-06 19:18:41 +08:00