diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e248c6ac5..17fa6e5b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: build: strategy: matrix: - OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx12, rutx50, r5s, qnap-301w, rpi5, z8102ax_128m, z8102ax_64m] + OMR_TARGET: [bpi-r1, bpi-r2, bpi-r4, bpi-r4-poe, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx12, rutx50, r5s, qnap-301w, rpi5, z8102ax_128m, z8102ax_64m] OMR_KERNEL: [5.4, 6.6] runs-on: ubuntu-latest continue-on-error: true diff --git a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter index f8c681624..7d05eda2f 100755 --- a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter @@ -86,9 +86,9 @@ if [ "$(uci -q get openmptcprouter.settings.check_ipv6_website)" = "" ]; then commit openmptcprouter EOF fi -if [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "" ] || [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "1" ]; then +if [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "" ] || [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "1" ] || [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "3" ]; then uci -q batch <<-EOF >/dev/null - set openmptcprouter.settings.status_vps_timeout=3 + set openmptcprouter.settings.status_vps_timeout=10 commit openmptcprouter EOF fi diff --git a/mptcp/files/etc/uci-defaults/mptcp-defaults b/mptcp/files/etc/uci-defaults/mptcp-defaults index cba0bc87a..86a07b0e3 100755 --- a/mptcp/files/etc/uci-defaults/mptcp-defaults +++ b/mptcp/files/etc/uci-defaults/mptcp-defaults @@ -64,11 +64,17 @@ fi if [ "$(uci -q get network.globals.mptcp_subflows)" = "" ]; then uci -q batch <<-EOF >/dev/null set network.globals.mptcp_subflows=8 - set network.globals.mptcp_add_addr_accepted=1 + set network.globals.mptcp_add_addr_accepted=8 set network.globals.mptcp_add_addr_timeout=120 commit network EOF fi +if [ "$(uci -q get network.globals.mptcp_add_addr_accepted)" = "1" ]; then + uci -q batch <<-EOF >/dev/null + set network.globals.mptcp_add_addr_accepted=8 + commit network + EOF +fi uci -q batch <<-EOF >/dev/null delete ucitrack.@mptcp[-1] diff --git a/omr-bypass/files/usr/share/omr-bypass/omr-bypass-proto.lst b/omr-bypass/files/usr/share/omr-bypass/omr-bypass-proto.lst index 5229d7c7b..402943103 100644 --- a/omr-bypass/files/usr/share/omr-bypass/omr-bypass-proto.lst +++ b/omr-bypass/files/usr/share/omr-bypass/omr-bypass-proto.lst @@ -1,6 +1,7 @@ 1kxun accuweather activision +adobeconnect ads_analytic_track adultcontent alibaba @@ -22,58 +23,73 @@ azure badoo bittorrent bloomberg +bluesky cachefly +cactusvpn +clickhouse cloudflare +cloudflare_warp cloudflarewarp cnn +cod_mobile crashlytics cybersec dailymotion datasaver dazn deezer +dingtalk directv discord disneyplus dnscrypt doh_dot +dota2 dropbox eaq ebay edgecast +electronicarts epicgames ethereum facebook +facebookmessenger fbookreelstory fuze +gaijinentertainment geforcenow github gitlab gmail google +googlechat googleclassroom google_cloud googlecloud googledocs googledrive -googlehangout googlemaps +googlemeet googleservices goto hbo hotspotshield +huawei +huaweicloud hulu icloudprivaterelay iflix iheartradio instagram +iqiyi +irc kakaotalk lastfm likee line linkedin livestream -messenger +mastodon microsoft microsoft_365 microsoft365 @@ -82,8 +98,11 @@ ms_one_drive ms_onedrive ms_outlook mullvad +mumble +neteasegames netflix nintendo +nordvpn ntop nvidia ocs @@ -94,11 +113,12 @@ operavpn outlook pandora pastebin +pathofexile pinterest playstation playstore pluralsight -ppstream +privateinternetaccess protonvpn psiphon qq @@ -115,10 +135,12 @@ skype_teams slack snapchat softether +sonos soundcloud spotify starcraft steam +surfshark syncthing tailscale teams @@ -127,20 +149,19 @@ telegram tencent tencentvideo teslaservices +tes_online +threads threema tidal tiktok tor -tuenti tumblr tunein tunnelbear twitch twitter ubuntuone -vevo viber -vidto vimeo vk vudu @@ -151,6 +172,7 @@ whatsapp whatsappfiles wikipedia windowsupdate +windscribe worldofwarcraft xbox xiaomi diff --git a/omr-bypass/files/usr/share/omr-bypass/omr-bypass.db b/omr-bypass/files/usr/share/omr-bypass/omr-bypass.db index f9cec43f4..19f7140f2 100644 Binary files a/omr-bypass/files/usr/share/omr-bypass/omr-bypass.db and b/omr-bypass/files/usr/share/omr-bypass/omr-bypass.db differ diff --git a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn index ef15c5a1e..789e47d21 100755 --- a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn +++ b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn @@ -61,7 +61,12 @@ if [ -z "$(uci -q get openvpn.omr.ping_restart)" ]; then set openvpn.omr.ping_restart=60 commit openvpn EOF - +fi +if [ -z "$(uci -q get openvpn.omr.tun_mtu)" ]; then + uci -q batch <<-EOF >/dev/null + set openvpn.omr.tun_mtu=1420 + commit openvpn + EOF fi diff --git a/shadowsocks-rust/Makefile b/shadowsocks-rust/Makefile index e92f65fa4..f4c803098 100644 --- a/shadowsocks-rust/Makefile +++ b/shadowsocks-rust/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=shadowsocks-rust -PKG_VERSION:=1.21.0 -PKG_HASH:=4891475a2389676e4fd3250bb579ffa7d1ad0bc9e3987c3e293c8f3a8a37bded +PKG_VERSION:=1.21.2 +PKG_HASH:=a2269e896a27a183dfd6d757d130978b46e1ac19f936c4229188d017b7ecf867 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/xray-core/Makefile b/xray-core/Makefile index 0323e4680..3a34c2cb9 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray #PKG_VERSION:=1.8.24 -PKG_VERSION:=24.9.30 +PKG_VERSION:=24.11.5 PKG_RELEASE:=1 PKG_LICENSE:=MPLv2 @@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Yannick Chabanois PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/XTLS/Xray-core.git -PKG_SOURCE_VERSION:=e733148c0bf78f6298cf08045297e783568b80c9 +PKG_SOURCE_VERSION:=afc7ec55062c14ae69fc67b148155faae1c31548 #PKG_SOURCE_VERSION:=6baad79f9881ee2cf75bdc825b3e2e92b289477a PKG_BUILD_DEPENDS:=golang/host