Commit Graph
2428 Commits
Author SHA1 Message Date
Max Lv b9ce095ee7 Merge pull request #2666 from imMMX/add-dockerfile-timezone
Add Dockerfile timezone, Update readme.
2020-03-20 17:01:25 +08:00
mmx 57e0c9f924 Update Dockerfile set default timezone to UTC. 2020-03-20 16:28:48 +08:00
mmx b6ddbbe0b0 Add Dockerfile timezone, Update readme. 2020-03-20 14:20:28 +08:00
Max Lv f34b362af0 Merge pull request #2659 from ideal/master
Fix a tiny memory leak
2020-03-15 06:52:25 +08:00
ideal af722a4b92 Fix a tiny memory leak 2020-03-15 01:21:51 +08:00
Max Lv cafdd77b3d Update README.md 2020-03-01 17:13:58 +08:00
Max Lv 6f7a6fd7e3 Merge pull request #2628 from Mygod/kill-sniparser
Remove sniparser
2020-02-20 17:50:49 +08:00
Max Lv 64d3235c67 Fix #2620 2020-02-15 11:06:42 +08:00
Max Lv 69b79e5b24 Merge pull request #2631 from shadowsocks/revert-2626-snapd-classic
Revert "Use classic mode to install shadowsocks-libev"
2020-02-14 09:02:27 +08:00
Max Lv 33976557d6 Revert "Use classic mode to install shadowsocks-libev" 2020-02-14 09:02:00 +08:00
Max Lv 8c251b2bc5 Fix build 2020-02-12 15:48:22 +08:00
Mygod 1c818ebca7 Fix build 2020-02-11 23:55:58 -05:00
Mygod 355adddff1 Remove unused is_remote_dns option 2020-02-11 23:52:48 -05:00
Mygod 301fea635b Remove sniparser 2020-02-11 23:48:30 -05:00
Max Lv bb12209941 Merge pull request #2626 from shadowsocks/snapd-classic
Use classic mode to install shadowsocks-libev
2020-02-12 08:21:37 +08:00
Mygod 5c16299c1a Use classic mode to install shadowsocks-libev
This can prevent `Too many open files` error from happening due to sandboxing.
2020-02-11 18:34:57 -05:00
Max Lv ac61025066 Merge pull request #2623 from babarosaM33/master
udprelay: exclude udp remote_recv_sendto buff full
2020-02-09 12:40:10 +08:00
babarosaM33 81bbd98d8b udprelay: exclude udp remote_recv_sendto buff full
before:
udp send buff full would not reset timeout trigger
after:
fix it
2020-02-08 17:55:07 +08:00
Max Lv f5c140dc1f Merge pull request #2619 from babarosaM33/master
updrelay: cleanup
2020-02-07 17:50:33 +08:00
babarosaM33 a5111fe32f updrelay: cleanup 2020-02-07 15:11:14 +08:00
Max Lv 375257954e Merge pull request #2618 from imba-tjd/patch-1
readme(docker): remove "--fast-open"
2020-02-06 21:01:53 +08:00
谭九鼎 21e3224ff1 readme(docker): remove "--fast-open" 2020-02-06 20:38:58 +08:00
Max Lv a0ef1a56f7 Merge pull request #2611 from hosiet/patch-1
tests/test.py: Make script compatible with python3
2020-02-01 07:39:34 +08:00
Boyuan Yang defa4f8dcf tests/test.py: Make script compatible with python3
Currently the test script assumes the returned web page is always encoded in UTF-8, which might not be the case. It is likely that the real encoding is `ISO-8859-1` and that running the script under python3 will raise error:

```
< 
{ [11931 bytes data]
100 11923    0 11923    0     0   184k      0 --:--:-- --:--:-- --:--:--  187k
Traceback (most recent call last):
  File "tests/test.py", line 106, in <module>
    line = str(line, 'utf8')
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xa0 in position 1105: invalid start byte
```
This pull request makes no assumption on the returned data and send the raw output to stderr as `bytes`. This should allow the test script to finish successfully when `tests/test.py` is run by python3.
2020-01-31 16:11:21 -05:00
Max Lv 0686909bb0 Merge pull request #2610 from babarosaM33/bloom_reset
ppbloom: save free() and subsequent init() overhead
2020-01-29 19:54:02 +08:00
Max Lv 6f9bd72def Merge pull request #2609 from babarosaM33/bloom_slots
crypto: lower bloom filter error rate
2020-01-29 19:40:20 +08:00
babarosaM33 a5005664a7 ppbloom: save free() and subsequent init() overhead
init utilizes calloc which malloc and memset.

need cherry-pick commit of libbloom
2020-01-29 18:57:19 +08:00
Max Lv 5cd80951a3 Merge pull request #2608 from babarosaM33/master
Revert "ppbloom:remove unnecessay bloom_check"
2020-01-29 17:57:37 +08:00
babarosaM33 88c4d2aaab crypto: lower bloom filter error rate
before patch:
full bloom filter error rate before reset 1-(1-1e-6)^5e5=1-0.606=0.394

after patch:
1-(1-1e-10)^5e5=1-0.99995=5e-5
2020-01-29 16:31:14 +08:00
babarosaM33 30d5b85fe7 Revert "ppbloom:remove unnecessay bloom_check"
ppbloom_add only checks current bloom filter not both PING PONG filters

This reverts commit 9ae59819be.
2020-01-29 16:09:10 +08:00
Max Lv b6a83d9497 Merge pull request #2606 from kuangniu/master
Fix sockopt level.
2020-01-24 15:05:33 +08:00
kuangniu 0f87d7cb68 Fix sockopt level. 2020-01-24 14:06:45 +09:00
Max Lv 4214894f5d Fix a typo 2020-01-20 16:43:25 +08:00
Max Lv 4f577a0d31 Fix #2600 2020-01-19 18:13:18 +08:00
Max Lv d31fba3deb Fix #2599 2020-01-19 18:04:18 +08:00
Max Lv 0318168938 Merge pull request #2596 from babarosaM33/master
server: replace memmove with idx
2020-01-19 13:12:58 +08:00
Max Lv ddd0df53f7 Merge pull request #2598 from babarosaM33/udprelay
udprelay: fix more tos
2020-01-19 13:03:36 +08:00
babarosaM33 8c03d25314 udprelay: fix more tos 2020-01-19 12:07:50 +08:00
babarosaM33 247d53098c server: replace memmove with idx 2020-01-19 09:46:18 +08:00
Max Lv 6b85c980ee Fix #2595 2020-01-18 08:44:26 +08:00
Max Lv bebdcbedd7 Merge pull request #2592 from babarosaM33/master
refine tos setsockopt in redir and udprelay
2020-01-18 07:31:38 +08:00
babarosaM33 4d617adfb0 refine tos setsockopt in redir and udprelay
make tos setup working at ipv4 and ipv6
2020-01-17 19:16:02 +08:00
Max Lv 5eeff4df48 Merge pull request #2590 from babarosaM33/master
server: fix setTosFromConnmark typo
2020-01-17 14:19:06 +08:00
babarosaM33 b48dcddc6c server: fix setTosFromConnmark typo
Server made a connection to remote, remote replied with that connection.

nf_conntrack module would not check reply-dst and reply-src by default.

more information please refer to https://www.spinics.net/lists/netfilter/msg57842.html

As a result, src and dst should be swapped to make nf_conntrack find the connection.
2020-01-17 13:10:47 +08:00
Max Lv 8811ec27af Merge pull request #2586 from babarosaM33/master
crypto: md5 hash works without hmac mode
2020-01-15 17:18:48 +08:00
babarosaM33 3908f3ac85 crypto: md5 hash works without hmac mode
setup mbedtls_md_context_t with hmac disabled to save some memory.
2020-01-15 12:20:18 +08:00
Max Lv 40ba7c7fde Merge pull request #2582 from babarosaM33/master
ppbloom:remove unnecessay bloom_check
2020-01-13 14:51:22 +08:00
babarosaM33 9576dcea54 initialize after pass check
if check failes, no need to initialize crypto.
2020-01-13 13:39:02 +08:00
babarosaM33 9ae59819be ppbloom:remove unnecessay bloom_check
bbloom_add and bbloom_check are in fact the same function.
let's make bbloom_add return collision information.
2020-01-13 13:24:52 +08:00
Max Lv 6b5025bf74 Merge pull request #2581 from shadowsocks/stream-warning
Warn users when using stream ciphers
2020-01-13 08:01:33 +08:00