Commit graph

1057 commits

Author SHA1 Message Date
破娃酱
31aaea603a add "glzjinmod" interface 2017-02-02 19:50:55 +08:00
破娃酱
390be3bf8d random ticket size for client only 2017-02-02 19:05:18 +08:00
破娃酱
e7a61a934f ignore SIGPIPE 2017-01-25 01:08:00 +08:00
破娃酱
96760ed438 not display RST error 2017-01-23 16:30:35 +08:00
破娃酱
00a31285ed encode protocol param to URL with -i 2017-01-22 13:54:56 +08:00
破娃酱
68693d5ec7 fix bug under py3 2017-01-21 12:46:31 +08:00
Esdeath
7cfbe49806 refine traffic log when redirect enable (#163) 2017-01-18 21:05:15 +08:00
破娃酱
9c794624e0 fix auth_aes128_* client side 2017-01-18 17:00:09 +08:00
破娃酱
ccacef1556 fix bug & update usage 2017-01-17 20:53:54 +08:00
破娃酱
75643635d4 change default setting 2017-01-15 10:05:29 +08:00
破娃酱
4048abaeff refine user transfer 2017-01-13 21:52:17 +08:00
破娃酱
d4b7483ef0 modify mgr fast command 2017-01-12 22:06:20 +08:00
破娃酱
ad892e1223 let 'transfer_enable' be an integer 2017-01-11 18:34:28 +08:00
破娃酱
2de2a553d7 multi-user for mudbjson mode 2017-01-11 14:45:37 +08:00
破娃酱
588d8ad8b3 fix auth_aes128_* client side 2017-01-11 14:43:24 +08:00
破娃酱
278ce30c66 update mu online client manager 2017-01-09 17:48:19 +08:00
破娃酱
25c66dab14 bump 2017-01-08 17:06:08 +08:00
破娃酱
de67c11207 typo 2017-01-08 00:47:44 +08:00
破娃酱
4f52dffcc1 parse protocol_param in py3 2017-01-08 00:26:49 +08:00
破娃酱
cd825c9c2c typo 2017-01-07 22:07:13 +08:00
noisyfox
e6410c067b Don't clear file first when saving config file 2017-01-07 21:10:49 +11:00
noisyfox
f0b0a31baf Revert commit fd9214b334 2017-01-07 20:32:22 +11:00
noisyfox
6d53546f6e Use super() call 2017-01-07 20:03:20 +11:00
noisyfox
8777152ec9 Run db thread as daemon
so that all sub-thread will inherite this and be killed automatically if main thread crash
2017-01-07 19:58:32 +11:00
noisyfox
f05bea4e10 Fix crash on windows 2017-01-07 19:34:39 +11:00
noisyfox
0bf1e46ace Update .gitignore 2017-01-07 19:23:30 +11:00
noisyfox
0f8dd36297 Add initcfg.bat for windows 2017-01-07 19:23:09 +11:00
noisyfox
498f71a21b Save json config as utf8 2017-01-07 19:22:36 +11:00
noisyfox
490ae12128 Fix mujson_mgr.py crash when MUDB_FILE doesn't exist 2017-01-07 19:14:58 +11:00
noisyfox
84fd119f26 Fix mujson_mgr.py crash on windows 2017-01-07 19:14:02 +11:00
noisyfox
fd9214b334 Use space instead of tab for indent
see PEP8
2017-01-07 18:50:12 +11:00
破娃酱
b367ad0560 using '#' to split multi-user setting 2017-01-07 01:23:42 +08:00
破娃酱
0ca45be89d update MU auth_aes128_* protocol 2017-01-06 21:02:52 +08:00
破娃酱
959aad3f41 multiuser in single port protocol 2017-01-04 22:46:39 +08:00
破娃酱
22ce739a45 update readme 2017-01-04 19:40:47 +08:00
破娃酱
7c6d059f0c change default protocol to auth_aes128_md5 2017-01-04 01:25:23 +08:00
破娃酱
77155a5ee4 bump 2017-01-03 11:44:07 +08:00
破娃酱
5ae0c67965 add auth_sha1_v4_compatible 2017-01-02 00:50:51 +08:00
破娃酱
33862fa8d3 remove auth_sha1_v3 2016-12-31 23:16:29 +08:00
破娃酱
e63d1eafad auth_sha1 & auth_sha1_v2 keep compatible, remove auth_sha1_v3 2016-12-31 21:50:42 +08:00
破娃酱
486c007928 change default protocol settings, refine auth_aes128_* for redir method 2016-12-30 11:23:43 +08:00
orvice
19d0034ba9 update README 2016-12-30 00:52:06 +08:00
破娃酱
9dfcfe0f7e remove all compatible 2016-12-30 00:18:16 +08:00
破娃酱
349821221d force pack some data in url 2016-12-29 14:17:49 +08:00
glzjin
5bd61e1bfb refine redirect (#147)
refine redirect, forbidden list will not work when redirect rule work
2016-12-27 16:20:38 +08:00
glzjin
c7815a0ee8 Support redirect rule (#145)
Syntax:

match_hostname_regex:port(* means match all port)#redirect_dist_host:redirect_port

and in the config.json(user-config.json) redirect param should be a list,

for example

```
"redirect": ["*:8080#zhaoj.in:80","zhaojin97.cn:80#127.0.0.1:80","*#pku.edu.cn:80"]
```

This example means abnormal connection which connect to port 8080 will be redirected to zhaoj.in:80,and if there a http request with hostname zhaojin97.cn(you can set hosts file to test it) will be redirected to 127.0.0.1:80,and the rest of abnormal connection will be redirect to pku.edu.cn:80
2016-12-24 21:25:53 +08:00
破娃酱
403ce5da58 bump 2016-12-23 21:40:38 +08:00
破娃酱
b513210778 fix tls 2016-12-23 21:14:23 +08:00
破娃酱
e0b4bdf551 refine obfs, support comment in config.json 2016-12-23 20:58:43 +08:00
shoaly
bdee67b856 create a Dockerfile for ssr (#143)
by this dockerfile, make it easy to run ssr-server on docker server
2016-12-18 20:20:41 +08:00