Alawn/ShadowsockR
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
719 Commits 5 Branches 13 Tags
master
Commit Graph
328 Commits
Author SHA1 Message Date
BreakWa11 1ee344220a merge manyuser 2.6.13 2015-11-02 20:13:54 +08:00
BreakWa11 a681a72b16 a stupid bug 2015-10-27 19:14:23 +08:00
breakwa11 7df3152608 merge manyuser 2015-10-27 12:19:05 +08:00
mengskysama 3db5a4918f 发现好多坑 
233
 2015-10-26 16:50:33 +08:00
BreakWa11 1e41de7d0b Merge pull request #24 from mengskysama/patch-2 
Update lru_cache.py
 2015-10-26 14:30:13 +08:00
mengskysama b059b9ad85 memory leak 2015-10-26 11:05:38 +08:00
mengskysama 418cadb945 Update lru_cache.py 2015-10-26 10:57:22 +08:00
breakwa11 1bc0e60cfd merge manyuser branch 2015-10-20 18:41:35 +08:00
breakwa11 3200b7d4fe merge manyuser branch 2015-10-04 23:05:20 +08:00
breakwa11 8f402277e6 merge manyuser branch 2015-10-04 20:07:58 +08:00
breakwa11 a37623b0b7 log TCP header if parse error 2015-09-02 12:54:37 +08:00
breakwa11 5b6dec5940 merge manyuser branch 2015-08-27 16:42:40 +08:00
breakwa11 a38db829f2 new UDP over TCP protocol, merge master 2015-08-05 16:26:21 +08:00
breakwa11 d475076cdc listen ipv6 2015-07-14 19:03:50 +08:00
breakwa11 e751534234 Merge branch 'master' of shadowsocks/shadowsocks 2015-07-12 12:52:06 +08:00
clowwindy 13a6bb007c cache DNS results in UDPRelay 2015-07-10 17:39:24 +08:00
clowwindy 99b4121fd9 fix problem when UDP client requesting both IPv4 and IPv6 2015-07-10 17:32:31 +08:00
clowwindy c34c99450f fix UDP source port issue 2015-07-10 16:58:04 +08:00
breakwa11 7c3e047449 merge manyuser branch 2015-07-04 13:37:41 +08:00
breakwa11 1b0504ade2 merge manyuser branch 2015-06-26 15:18:14 +08:00
breakwa11 e5b4a804e9 double UDP sockets for IPv4 and IPv6 2015-06-20 18:59:59 +08:00
breakwa11 3d1563ecac fix udp ipv6 2015-06-20 17:58:03 +08:00
breakwa11 c549929dfb fix udp ipv6 2015-06-16 21:57:01 +08:00
breakwa11 d065dba34f merge manyuser 
udp ipv6 bug fix
 2015-06-16 13:13:19 +08:00
breakwa11 f16749962a drop UDP message if frag != 0 2015-06-10 14:22:27 +08:00
breakwa11 62dca9d3cd udp over tcp 2015-06-09 23:59:03 +08:00
clowwindy e74ae193d0 elaborate reasons of header parsing failure 2015-06-08 08:29:01 +08:00
clowwindy 16db66675b optimize LRUCache 2015-05-19 08:35:28 +08:00
clowwindy 082c8a80f4 fix duplicated close in LRUCache 
close #324
 2015-05-19 08:14:47 +08:00
Kim Wong e17279e5bf remove duplicated line (refer line 221) 2015-03-14 07:35:43 +08:00
lazybios d3831bef8c remove duplicate code from shell.py 2015-03-01 14:14:35 +08:00
Felix Yan edb7822a7b convert remote_address to str so it will be printed more correctly on python 3 2015-02-11 10:40:20 +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 783a6ef7f2 support multiple server ip on client side 2015-02-09 13:50:46 +08:00
clowwindy e71ce6c758 fix server check 2015-02-03 18:45:36 +08:00
clowwindy e564f17505 fix bytes in utils 2015-02-03 18:23:22 +08:00
clowwindy 6d09cd21ca fix openssl 2015-02-03 18:13:01 +08:00
clowwindy 318d88ec89 use string more 2015-02-03 18:09:07 +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 1c81465436 fix command line 2015-02-02 15:57:44 +08:00
clowwindy 73f21ffbf6 do not check config for daemon stop 2015-02-02 15:50:41 +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 453a9c61a6 show CIDR error more friendly 2015-02-01 09:09:35 +08:00
Sunny a0aa9173a8 Fix for Python3 map changed behavior 
In Python3, map returns an iterator instead of list in Python2,
which cause map "lazier" than before, wrap with list() force it running.
 2015-02-01 02:37:30 +08:00
Sunny 79b9b53dbe Never process empty string and prevent infinite loop 
If user provide an empty string as network range, inet_pton will
treate it as an IPv6 unspecified address, it seems a bug but I
can't confirm. Then empty string will be converted to 0, 0 & 1
always be zero, so it caused dead loop.
 2015-02-01 01:57:17 +08:00
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.
 2015-02-01 01:34:23 +08:00