Commit graph

694 commits

Author SHA1 Message Date
clowwindy
d95e5ce680 Merge pull request #388 from cicku/patch-1
PEP8 indent
2015-07-27 15:03:50 +08:00
Christopher Meng
2555aa8e2b PEP8 indent
A tiny change to perfect the indent.
2015-07-27 00:38:23 -04:00
clowwindy
1bb0e51e8e refine tests 2015-07-11 13:05:37 +08:00
clowwindy
f7d69db6d1 bump 2015-07-10 18:01:34 +08:00
clowwindy
f55bd0302f update CHANGES 2015-07-10 17:59:52 +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
clowwindy
1a62694a3b add udp source port test 2015-07-10 15:56:27 +08:00
clowwindy
a2edd6a46d Merge pull request #361 from jackyyf/master
Add fail2ban filter.
2015-06-21 11:24:38 +08:00
Yifu Yu
0edae7069f Add fail2ban filter.
Please put the shadowsocks.conf into your filter.d directory, and
using `filter = shadowsocks` to use the filter.
2015-06-21 00:56:55 +08:00
clowwindy
e001f1818c bump 2015-06-08 08:36:17 +08:00
clowwindy
56c289ba21 update CHANGES 2015-06-08 08:35:30 +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
c46234af41 update CHANGES 2015-05-19 08:20:56 +08:00
clowwindy
405120c59f bump 2015-05-19 08:19:25 +08:00
clowwindy
082c8a80f4 fix duplicated close in LRUCache
close #324
2015-05-19 08:14:47 +08:00
clowwindy
893d21da76 Merge pull request #332 from sky-chen/master
flush autoban output
2015-05-03 15:25:14 +08:00
sky
ea7a3e1b58 flush autoban output 2015-05-03 14:34:54 +08:00
clowwindy
e898f92191 Merge pull request #295 from jlund/no-rc4
Use AES in the Usage example instead of RC4.
2015-03-29 12:19:22 +08:00
clowwindy
5c0391d146 Merge pull request #312 from kimw/patch-1
remove duplicated line (refer line 221)
2015-03-14 13:38:19 +08:00
Kim Wong
e17279e5bf remove duplicated line (refer line 221) 2015-03-14 07:35:43 +08:00
clowwindy
f17da943b3 Merge pull request #305 from lazybios/patch
remove duplicate code from shell.py
2015-03-01 16:17:06 +08:00
lazybios
d3831bef8c remove duplicate code from shell.py 2015-03-01 14:14:35 +08:00
Joshua Lund
b6e6e14b8a Use AES in the Usage example instead of RC4. 2015-02-14 21:33:40 -07:00
clowwindy
4172639d48 Update README.md 2015-02-12 14:18:18 +08:00
clowwindy
e8488895f0 Merge pull request #291 from felixonmars/py3-remote-address
convert remote_address to str so it will be printed more correctly on python 3
2015-02-11 15:53:24 +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
294556f8bc bump 2.6.9 2015-02-10 18:26:06 +08:00
clowwindy
1b7ab23f78 release 2.6.8 2015-02-10 18:25:36 +08:00
clowwindy
0e14f3bbef fix travis 2015-02-10 18:01:53 +08:00
clowwindy
42ce2569c4 also test with real website
Now that localhost is used in tests, DNS code is uncovered.
Use clients1.google.com/generate_204 to test if a real website works.
2015-02-10 17:43:06 +08:00
clowwindy
581d6e687f use localhost in test.py
Since now the unit tests is huge, using third party website
is not polite. So use localhost instead.
2015-02-10 17:38:01 +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
48ddc1714b move jenkins.sh 2015-02-10 17:02:31 +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
96a86c028d update CHANGES 2015-02-02 17:29:57 +08:00
clowwindy
2c59ffb952 update rst 2015-02-02 16:42:37 +08:00
clowwindy
27a0c7754d bump 2015-02-02 16:23:17 +08:00
clowwindy
0cd261dd10 catch KeyError 2015-02-02 16:22:56 +08:00
clowwindy
fbf15cb942 update command tests 2015-02-02 15:59:44 +08:00
clowwindy
1c81465436 fix command line 2015-02-02 15:57:44 +08:00