From ded0ac376dd08ab3fbc648d1cb4d48898e258d1b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 12 Oct 2020 11:31:03 +0200 Subject: [PATCH 1/4] Add some firmwares by defaut on x86_64 --- openmptcprouter-full/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index c679058b0..55325a354 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -79,7 +79,7 @@ MY_DEPENDS := \ kmod-rt2800-usb kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su \ !TARGET_mvebu:luci-proto-qmi wpad-basic kmod-mt7601u kmod-rtl8187 \ luci-app-mlvpn mlvpn 464xlat !TARGET_mvebu:kmod-usb-net-smsc75xx kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang iptables-mod-ipopt igmpproxy ss iptraf-ng \ - luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard + luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware (TARGET_x86||TARGET_x86_64):r8169-firmware (TARGET_x86||TARGET_x86_64):rtl8188eu-firmware (TARGET_x86||TARGET_x86_64):rtl8192ce-firmware (TARGET_x86||TARGET_x86_64):rtl8192cu-firmware kmod-usb2 # luci-theme-bootstrap luci-theme-openwrt-2020 luci-theme-openwrt luci-app-status # luci-proto-bonding luci-app-statistics luci-proto-gre # softethervpn5-client softethervpn5-server luci-app-nginx-ha From 04af5efe0a203cc4495192799d7e2dec8b9709e1 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 12 Oct 2020 16:06:35 +0200 Subject: [PATCH 2/4] Add OpenVPN UDP port to DSCP --- luci-app-omr-dscp/root/etc/config/dscp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-app-omr-dscp/root/etc/config/dscp b/luci-app-omr-dscp/root/etc/config/dscp index a2c7719b7..a48c32232 100644 --- a/luci-app-omr-dscp/root/etc/config/dscp +++ b/luci-app-omr-dscp/root/etc/config/dscp @@ -29,7 +29,7 @@ config classify option direction 'both' option proto 'udp' option class 'cs6' - option dest_port '65001' + option dest_port '65001,65301' option comment 'OMR vpn' config domains From a9f4a2c44e0add95a530fc73d1a0f1dc144563ce Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 12 Oct 2020 16:07:32 +0200 Subject: [PATCH 3/4] Set Cubic as default instead of BBR --- mptcp/files/etc/uci-defaults/mptcp-defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mptcp/files/etc/uci-defaults/mptcp-defaults b/mptcp/files/etc/uci-defaults/mptcp-defaults index ba9d2e812..9dddade8f 100755 --- a/mptcp/files/etc/uci-defaults/mptcp-defaults +++ b/mptcp/files/etc/uci-defaults/mptcp-defaults @@ -4,7 +4,7 @@ if [ "$(uci -q get network.globals.mptcp_path_manager)" = "" ]; then set network.globals.multipath='enable' set network.globals.mptcp_path_manager='fullmesh' set network.globals.mptcp_scheduler='blest' - set network.globals.congestion='bbr' + set network.globals.congestion='cubic' set network.globals.mptcp_checksum=0 set network.globals.mptcp_debug=0 set network.globals.mptcp_syn_retries=2 From 420949980f5ddfc98e2307def3a8c39a6fdb02f3 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 12 Oct 2020 16:08:25 +0200 Subject: [PATCH 4/4] Check if ss-tracker or v2ray-tracker are enabled when proxy are enabled --- mptcp/files/usr/share/omr/post-tracking.d/post-tracking | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking index 8552da7bc..495bdf279 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking @@ -808,6 +808,9 @@ if [ "$(pgrep v2ray)" = "" ] && [ "$(uci -q get v2ray.main.enabled)" = "1" ] && sleep 5 fi +if [ "$(uci -q get v2ray.main.enabled)" = "1" ] && [ -f /etc/init.d/v2ray ] && [ "$(pgrep omr-tracker-v2ray)" = "" ]; then + /etc/init.d/omr-tracker restart +fi set_get_config() { local server=$1 @@ -819,6 +822,11 @@ if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get config_foreach set_get_config server uci -q commit openmptcprouter fi + +if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ] && [ "$(pgrep omr-tracker-ss)" = "" ]; then + /etc/init.d/omr-tracker restart +fi + if [ "$(uci -q get glorytun.vpn.enable)" = "1" ] && [ "$(uci -q get glorytun.vpn.key)" = "" ]; then config_load openmptcprouter config_foreach set_get_config server