Max Lv
ac61025066
Merge pull request #2623 from babarosaM33/master
udprelay: exclude udp remote_recv_sendto buff full
4 years ago
babarosaM33
81bbd98d8b
udprelay: exclude udp remote_recv_sendto buff full
before:
udp send buff full would not reset timeout trigger
after:
fix it
4 years ago
Max Lv
f5c140dc1f
Merge pull request #2619 from babarosaM33/master
updrelay: cleanup
4 years ago
babarosaM33
a5111fe32f
updrelay: cleanup
4 years ago
Max Lv
375257954e
Merge pull request #2618 from imba-tjd/patch-1
readme(docker): remove "--fast-open"
4 years ago
谭九鼎
21e3224ff1
readme(docker): remove "--fast-open"
4 years ago
Max Lv
a0ef1a56f7
Merge pull request #2611 from hosiet/patch-1
tests/test.py: Make script compatible with python3
4 years ago
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.
4 years ago
Max Lv
0686909bb0
Merge pull request #2610 from babarosaM33/bloom_reset
ppbloom: save free() and subsequent init() overhead
4 years ago
Max Lv
6f9bd72def
Merge pull request #2609 from babarosaM33/bloom_slots
crypto: lower bloom filter error rate
4 years ago
babarosaM33
a5005664a7
ppbloom: save free() and subsequent init() overhead
init utilizes calloc which malloc and memset.
need cherry-pick commit of libbloom
4 years ago
Max Lv
5cd80951a3
Merge pull request #2608 from babarosaM33/master
Revert "ppbloom:remove unnecessay bloom_check"
4 years ago
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
4 years ago
babarosaM33
30d5b85fe7
Revert "ppbloom:remove unnecessay bloom_check"
ppbloom_add only checks current bloom filter not both PING PONG filters
This reverts commit 9ae59819be
.
4 years ago
Max Lv
b6a83d9497
Merge pull request #2606 from kuangniu/master
Fix sockopt level.
4 years ago
kuangniu
0f87d7cb68
Fix sockopt level.
4 years ago
Max Lv
4214894f5d
Fix a typo
4 years ago
Max Lv
4f577a0d31
Fix #2600
4 years ago
Max Lv
d31fba3deb
Fix #2599
4 years ago
Max Lv
0318168938
Merge pull request #2596 from babarosaM33/master
server: replace memmove with idx
4 years ago
Max Lv
ddd0df53f7
Merge pull request #2598 from babarosaM33/udprelay
udprelay: fix more tos
4 years ago
babarosaM33
8c03d25314
udprelay: fix more tos
4 years ago
babarosaM33
247d53098c
server: replace memmove with idx
4 years ago
Max Lv
6b85c980ee
Fix #2595
4 years ago
Max Lv
bebdcbedd7
Merge pull request #2592 from babarosaM33/master
refine tos setsockopt in redir and udprelay
4 years ago
babarosaM33
4d617adfb0
refine tos setsockopt in redir and udprelay
make tos setup working at ipv4 and ipv6
4 years ago
Max Lv
5eeff4df48
Merge pull request #2590 from babarosaM33/master
server: fix setTosFromConnmark typo
4 years ago
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.
4 years ago
Max Lv
8811ec27af
Merge pull request #2586 from babarosaM33/master
crypto: md5 hash works without hmac mode
4 years ago
babarosaM33
3908f3ac85
crypto: md5 hash works without hmac mode
setup mbedtls_md_context_t with hmac disabled to save some memory.
4 years ago
Max Lv
40ba7c7fde
Merge pull request #2582 from babarosaM33/master
ppbloom:remove unnecessay bloom_check
4 years ago
babarosaM33
9576dcea54
initialize after pass check
if check failes, no need to initialize crypto.
4 years ago
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.
4 years ago
Max Lv
6b5025bf74
Merge pull request #2581 from shadowsocks/stream-warning
Warn users when using stream ciphers
4 years ago
Mygod
80b887d16e
Warn users when using stream ciphers
4 years ago
Max Lv
72d7d9217c
Bump version
4 years ago
Max Lv
f1b185ed3b
Merge pull request #2577 from babarosaM33/master
Remove unnecessary memmove
4 years ago
babarosaM33
7fe555c756
Remove unnecessary memmove
Before patch, after one chunk decoded, we do a memmove.
After patch, after all complete chunk decoded, we do a memmove.
4 years ago
Max Lv
f6bc4cc600
Delete test.json
4 years ago
Max Lv
74daa50e59
Fix #2565 #2566
4 years ago
Max Lv
ffc2ea42fc
Merge pull request #2563 from oszi/master
Set cap_net_bind_service for docker
4 years ago
David Osztertag
4c660f604f
Set cap_net_bind_service for docker
4 years ago
Max Lv
20a6ad6dfc
Merge pull request #2555 from rogers0/PR/fix_hurd_max_path
Fix of PATH_MAX for GNU/Hurd
5 years ago
Roger Shimizu
a7d57ab9d5
Fix of PATH_MAX for GNU/Hurd
PATH_MAX is not defined on each platform, and should be avoided.
Info:
- https://www.gnu.org/software/hurd/community/gsoc/project_ideas/maxpath.html
- https://www.gnu.org/software/hurd/hurd/porting/guidelines.html#PATH_MAX_tt_MAX_PATH_tt_MAXPATHL
5 years ago
Max Lv
4261a3de8e
Merge pull request #2552 from ivq/fix-redir
Fix redir default cipher
5 years ago
igor
0b737a9525
Fix redir default cipher
5 years ago
Max Lv
97ee01326b
Merge pull request #2549 from rogers0/PR/fix_pc_in
shadowsocks-libev.pc.in: Remove crypto library dependency
5 years ago
Max Lv
e95c02b0d6
Merge pull request #2543 from mellow-io/fix-tos
Fix QoS
5 years ago
eric
16bd9af3a4
Fix QoS
5 years ago
Max Lv
6d73201b9a
Fix #2539
5 years ago