From ad5bf18f710c3afef1a7453266c8da492627503d Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 28 Oct 2020 14:55:54 +0000
Subject: [PATCH 1/4] Use cubic and bbr by default

---
 shadowsocks.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shadowsocks.conf b/shadowsocks.conf
index 8de0b56..302bbe0 100644
--- a/shadowsocks.conf
+++ b/shadowsocks.conf
@@ -45,7 +45,7 @@ net.ipv4.tcp_wmem = 4096 65536 33554432
 net.ipv4.tcp_mtu_probing = 0
 
 # for low-latency network, use cubic instead
-net.ipv4.tcp_congestion_control = bbr
+net.ipv4.tcp_congestion_control = cubic
 net.core.default_qdisc = fq
 # Default conntrack is too small
 net.netfilter.nf_conntrack_max = 131072
@@ -56,4 +56,5 @@ net.ipv4.conf.default.log_martians = 0
 # MPTCP settings
 net.mptcp.mptcp_checksum = 0
 net.mptcp.mptcp_syn_retries = 2
+net.mptcp.mptcp_scheduler = blest
 net.ipv4.tcp_ecn=1

From 0b650ad217a5c0c5ead46a5c5fc0b6ae330d8b9b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 28 Oct 2020 14:56:11 +0000
Subject: [PATCH 2/4] Use cake for glorytun udp

---
 glorytun-udp-post.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/glorytun-udp-post.sh b/glorytun-udp-post.sh
index a62144c..2c1dc40 100644
--- a/glorytun-udp-post.sh
+++ b/glorytun-udp-post.sh
@@ -12,4 +12,5 @@ done
 	ip link set dev ${INTF} up 2>&1 >/dev/null
 	ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} 2>&1 >/dev/null
 }
+tc qdisc replace dev $INTF root cake
 ip link set $INTF txqlen 100
\ No newline at end of file

From b792232e720bcde3f01fffdddf7bddb5339992d9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 28 Oct 2020 14:56:25 +0000
Subject: [PATCH 3/4] Update API

---
 debian9-x86_64.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index 82cca13..80b23dc 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -40,7 +40,7 @@ GLORYTUN_UDP_VERSION="97607fdf5c6c33df512ed85190a1fd93b5f45e77"
 MLVPN_VERSION="f45cec350a6879b8b020143a78134a022b5df2a7"
 UBOND_VERSION="672100fb57913ffd29caad63517e145a5974b078"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"
-OMR_ADMIN_VERSION="de656bffbc30b37d82afc4eb0ec2ea0322d0be40"
+OMR_ADMIN_VERSION="6392c3eb25fa44d0d77b615240a7b17c6b5eec66"
 DSVPN_VERSION="3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a"
 #V2RAY_VERSION="v1.1.0"
 V2RAY_PLUGIN_VERSION="v1.4.3"

From 956245a52366cc7ea66559f07372284cd999ce14 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 29 Oct 2020 07:47:31 +0000
Subject: [PATCH 4/4] Update API

---
 debian9-x86_64.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index 80b23dc..8e83633 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -40,7 +40,7 @@ GLORYTUN_UDP_VERSION="97607fdf5c6c33df512ed85190a1fd93b5f45e77"
 MLVPN_VERSION="f45cec350a6879b8b020143a78134a022b5df2a7"
 UBOND_VERSION="672100fb57913ffd29caad63517e145a5974b078"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"
-OMR_ADMIN_VERSION="6392c3eb25fa44d0d77b615240a7b17c6b5eec66"
+OMR_ADMIN_VERSION="8d0706e8c234f9a0eaa88ace6d58c2d0f45156cf"
 DSVPN_VERSION="3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a"
 #V2RAY_VERSION="v1.1.0"
 V2RAY_PLUGIN_VERSION="v1.4.3"