Commit Graph

367 Commits

Author SHA1 Message Date
e08845d6f3 fix manager 2015-08-05 18:31:55 +08:00
956199efcd add control manager 2015-08-05 18:12:38 +08:00
58df1d82d0 close poll object after loop stopped 2015-08-03 23:54:30 +08:00
4211184886 remove unnecessary overwrite 2015-08-03 01:40:18 +08:00
177c639b19 fix graceful restart test 2015-08-02 15:53:00 +08:00
02120e3402 optimize eventloop 2015-08-02 14:45:15 +08:00
111acf66c1 fix graceful restart and add unit test 2015-08-02 14:37:44 +08:00
e8b2946999 fix workers 2015-08-01 19:09:29 +08:00
d319fab5ca fix asyncdns unit test 2015-08-01 18:58:57 +08:00
80102f3899 fix pyflakes 2015-08-01 18:57:44 +08:00
4a8d0774b4 optimize performance for multiple ports
UDPRelay is broken now
2015-08-01 18:53:18 +08:00
2555aa8e2b PEP8 indent
A tiny change to perfect the indent.
2015-07-27 00:38:23 -04:00
13a6bb007c cache DNS results in UDPRelay 2015-07-10 17:39:24 +08:00
99b4121fd9 fix problem when UDP client requesting both IPv4 and IPv6 2015-07-10 17:32:31 +08:00
c34c99450f fix UDP source port issue 2015-07-10 16:58:04 +08:00
e74ae193d0 elaborate reasons of header parsing failure 2015-06-08 08:29:01 +08:00
16db66675b optimize LRUCache 2015-05-19 08:35:28 +08:00
082c8a80f4 fix duplicated close in LRUCache
close #324
2015-05-19 08:14:47 +08:00
e17279e5bf remove duplicated line (refer line 221) 2015-03-14 07:35:43 +08:00
d3831bef8c remove duplicate code from shell.py 2015-03-01 14:14:35 +08:00
edb7822a7b convert remote_address to str so it will be printed more correctly on python 3 2015-02-11 10:40:20 +08:00
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
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
dfd81af844 support --version 2015-02-09 14:43:11 +08:00
783a6ef7f2 support multiple server ip on client side 2015-02-09 13:50:46 +08:00
e71ce6c758 fix server check 2015-02-03 18:45:36 +08:00
e564f17505 fix bytes in utils 2015-02-03 18:23:22 +08:00
6d09cd21ca fix openssl 2015-02-03 18:13:01 +08:00
318d88ec89 use string more 2015-02-03 18:09:07 +08:00
ce805f0aea license under Apache License v2.0 2015-02-03 14:10:36 +08:00
0cd261dd10 catch KeyError 2015-02-02 16:22:56 +08:00
1c81465436 fix command line 2015-02-02 15:57:44 +08:00
73f21ffbf6 do not check config for daemon stop 2015-02-02 15:50:41 +08:00
7aa37cad8e check cipher before daemon start
fix #280
2015-02-02 15:46:22 +08:00
ae99698b4e implement --user
fix @278
2015-02-02 15:38:55 +08:00
453a9c61a6 show CIDR error more friendly 2015-02-01 09:09:35 +08:00
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
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
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
b11d848986 Fix for Python3 lambda behavior change
In Python3, lambda no longer support use tuple as syntax.
So, ugly changes is inevitable.
2015-02-01 01:34:18 +08:00
aa28796524 Make common fit PEP8 2015-02-01 01:34:13 +08:00
8af359ae05 Use IPNetwork supporting forbidden ip feature in config utils
This commit also make "forbidden_ip" field available in config file.
If no forbidden ip specified in command line and config file,
default to "127.0.0.0/8,::1".
2015-01-31 22:56:23 +08:00
100ebcf064 Add IPNetwork class to support CIDR calculation
Usage:
Use IPNetwork(str|list<str>) to create an IPNetwork object.
Use operator 'in' to determine whether the specified
IP address is in the IP network or not, like:
>>> '192.168.1.1' in IPNetwork('192.168.1.0/24')
True

Both IPv4 and IPv6 address are supported.
Note: When using string to initialize the IPNetwork,
a comma seperated IP network list should be provided.

Currently, IPNetwork just support standard CIDR like:
x.x.x.x/y eg. 192.168.1.0/24
::x/y     eg. ::1/10
If pure IP address was provided,
it will be treated as implicit IP network,
like 192.168.0.0 will be treated as 192.168.0.0/16
and  192.168.1.1 will be treated as 192.168.1.1/32
This implicit translate may cause some unexpected behavior,
like user provide 192.168.2.0 and expect it will be treated as
192.168.2.0/24 but actually it will be translated to
192.168.2.0/23 because there are 9 continuous 0 from right.
In order to avoid confusion, a warning message
will be displayed when pure IP address was provided.

Other variants of CIDR are not supported yet.
2015-01-31 22:56:16 +08:00
8783e0e9ae Move is_ip from asyncdns to common
Since implement CIDR forbidden need this function,
move it to common file seems to be a better choice.
2015-01-31 22:56:09 +08:00
ada97ab6d9 improve comments 2015-01-31 02:58:40 +08:00
1f8819f790 fix #270 2015-01-23 17:33:48 +08:00
6efb3d00e4 fix #264 2015-01-16 18:52:40 +08:00
bd22e3ef75 try every dll that matches by name in PATH 2015-01-16 16:50:18 +08:00
af6c6f3f23 also search lib* for library names 2015-01-14 12:59:43 +08:00
5c05a74727 fix a potential name conflict 2015-01-13 00:42:27 +08:00