Alawn/ShadowsockR
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
719 Commits 5 Branches 13 Tags
master
Commit Graph
67 Commits
Author SHA1 Message Date
BreakWa11 1ee344220a merge manyuser 2.6.13 2015-11-02 20:13:54 +08:00
breakwa11 7df3152608 merge manyuser 2015-10-27 12:19:05 +08:00
breakwa11 8f402277e6 merge manyuser branch 2015-10-04 20:07:58 +08:00
breakwa11 5b6dec5940 merge manyuser branch 2015-08-27 16:42:40 +08:00
breakwa11 d475076cdc listen ipv6 2015-07-14 19:03:50 +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
clowwindy 743d3cddb5 close #132 2014-06-18 15:50:05 +08:00
clowwindy 71c3759c12 add async dns 2014-06-08 15:58:59 +08:00
clowwindy 816592b674 add more log 2014-06-06 22:57:57 +08:00
clowwindy 0c8a8ef23f refine loop 2014-06-01 19:09:52 +08:00
clowwindy 5e19fdc66b refine exiting 2014-06-01 17:56:41 +08:00
clowwindy 7a1647278f fix multiple servers 2014-06-01 17:50:57 +08:00
clowwindy 2672a6378e fix ctrl C 2014-06-01 17:20:51 +08:00
clowwindy fd35f1d067 fix server 2014-06-01 17:18:02 +08:00
clowwindy 5e9a9c9beb almost done 2014-06-01 14:20:40 +08:00
clowwindy 47fd479d6e almost done 2014-06-01 14:10:18 +08:00
clowwindy c2f6bc369c more work 2014-06-01 11:01:11 +08:00
clowwindy 2cdddd4515 update config 2014-05-30 18:17:40 +08:00
clowwindy 4f46400145 add ssloop branch 2014-05-30 16:28:44 +08:00
clowwindy ea451344ff fix workers 2014-05-24 19:16:21 +08:00
clowwindy 6e5a753d41 add timeout in TCP server 2014-05-22 12:01:13 +08:00
clowwindy 428de3cf42 signal children 2014-05-17 14:02:30 +08:00
clowwindy 8f19fe278c fix workers 2014-05-17 13:54:28 +08:00
clowwindy 3f523ee942 fix workers 2014-05-17 13:42:26 +08:00
clowwindy df7614f26c support workers 2014-05-17 12:44:12 +08:00
clowwindy 6caeabd03d fix a potential RST problem 2014-05-10 01:22:26 +08:00
clowwindy e0a27f1df3 lint server 2014-05-02 12:47:56 +08:00
clowwindy 0b9ff0557f fastopen 2014-05-01 13:43:00 +08:00