mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
Merge branch 'develop' of https://github.com/Ysurac/openmptcprouter-feeds into test
This commit is contained in:
suyuan
commit
4982808d02
23 changed files with 72 additions and 2522 deletions
|
|
@ -1,5 +1,6 @@
|
|||
#
|
||||
# Copyright (C) 2014 OpenWrt.org
|
||||
# Copyright (C) 2023 Yannick Chabanois (Ycarus) for OpenMPTCProuter
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
|
|
@ -10,18 +11,17 @@ include $(TOPDIR)/rules.mk
|
|||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=cryptodev-linux
|
||||
PKG_VERSION:=1.12
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_HASH:=f51c2254749233b1b1d7ec9445158bd709f124f88e1c650fe2faac83c3a81938
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME).git
|
||||
PKG_SOURCE_VERSION:=bb8bc7cf60d2c0b097c8b3b0e807f805b577a53f
|
||||
PKG_VERSION:=1.13-$(PKG_SOURCE_VERSION)
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com>
|
||||
PKG_MAINTAINER:=Yannick Chabanois <contact@openmptcprouter.com>
|
||||
|
||||
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ PKG_SOURCE_VERSION:=4333aa705efd9c86c76809614d20dc5ebf43da7f
|
|||
PKG_NAME:=dsvpn
|
||||
PKG_VERSION:=0.1.5-$(PKG_SOURCE_VERSION)
|
||||
PKG_RELEASE:=1
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ PKG_SOURCE_VERSION:=32267e86a6da05b285bb3bf2b136c105dc0af4bb
|
|||
PKG_NAME:=glorytun-udp
|
||||
PKG_VERSION:=0.3.4-$(PKG_SOURCE_VERSION)
|
||||
PKG_RELEASE:=23
|
||||
PKG_LICENSE:=BSD-2-Clause
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
PKG_FIXUP:=autoreconf
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@ PKG_SOURCE_VERSION:=0c3b03cf0215e0896fd8e7e91be92efa77f6a2d1
|
|||
PKG_SOURCE:=glorytun-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/Ysurac/glorytun.git
|
||||
PKG_VERSION:=0.0.35-$(PKG_SOURCE_VERSION)
|
||||
|
||||
PKG_LICENSE:=BSD-2-Clause
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
PKG_FIXUP:=autoreconf
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (C) 2018-2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
|
||||
# Copyright (C) 2018-2023 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
|
|
@ -10,11 +10,12 @@ include $(TOPDIR)/rules.mk
|
|||
PKG_NAME:=ipcalc
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_URL:=https://github.com/nmav/ipcalc.git
|
||||
PKG_SOURCE_URL:=https://gitlab.com/ipcalc/ipcalc.git
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_VERSION:=e9f88461f2585575d12fc95f5eeb9996b863f5af
|
||||
PKG_SOURCE_VERSION:=d8a2fe29a89f0f9f0d44a7b15e260c74f0e8388b
|
||||
PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
PKG_LICENSE_FILE:=COPYING
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -378,6 +378,7 @@ function wizard_add()
|
|||
end
|
||||
ucic:set("network",intf,"defaultroute",0)
|
||||
ucic:set("network",intf,"peerdns",0)
|
||||
ucic:set("network",intf,"delegate",0)
|
||||
if ipaddr ~= "" then
|
||||
ucic:set("network",intf,"ipaddr",ipaddr:gsub("%s+", ""))
|
||||
ucic:set("network",intf,"netmask",netmask:gsub("%s+", ""))
|
||||
|
|
|
|||
|
|
@ -478,6 +478,7 @@
|
|||
<label class="cbi-value-title"><%:Label%></label>
|
||||
<div class="cbi-value-field">
|
||||
<input type="hidden" id="cbid.network.<%=ifname%>.lan" name="cbid.network.<%=ifname%>.lan" value="1">
|
||||
<input type="hidden" id="cbid.network.<%=ifname%>.gateway" name="cbid.network.<%=ifname%>.gateway" value="<%=uci:get("network",ifname,"gateway")%>">
|
||||
<input type="text" id="cbid.network.<%=ifname%>.label" name="cbid.network.<%=ifname%>.label" class="cbi-input-text" value="<%=uci:get("network",ifname,"label")%>">
|
||||
<br />
|
||||
<div class="cbi-value-description">
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ if ([ -f /etc/init.d/shadowsocks-libev ] && [ "$(uci -q get shadowsocks-libev.ss
|
|||
fi
|
||||
|
||||
restart_omrtracker() {
|
||||
[ -n "$(pgrep -f "omr-tracker $1)" ] && return
|
||||
[ -n "$(pgrep -f $1)" ] && return
|
||||
config_get multipath "$1" multipath
|
||||
config_get ifenabled "$1" auto
|
||||
[ -z "$multipath" ] || [ "$multipath" = "off" ] && return
|
||||
|
|
@ -135,12 +135,12 @@ config_load network
|
|||
config_foreach restart_omrtracker interface
|
||||
|
||||
if [ -f /etc/init.d/shadowsocks-libev ] && [ "$(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 -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then
|
||||
_log "Can't find omr-tracker-ss, restart omr-tracker..."
|
||||
_log "Can't find omr-tracker-ss for Shadowsocks libev, restart omr-tracker..."
|
||||
/etc/init.d/omr-tracker restart 2>&1 >/dev/null
|
||||
fi
|
||||
|
||||
if [ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.rust.server)" != "192.18.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then
|
||||
_log "Can't find omr-tracker-ss, restart omr-tracker..."
|
||||
_log "Can't find omr-tracker-ss for Shadowsocks Rust, restart omr-tracker..."
|
||||
/etc/init.d/omr-tracker restart 2>&1 >/dev/null
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@ PKG_VERSION:=0.12-$(PKG_SOURCE_VERSION)
|
|||
PKG_RELEASE:=1
|
||||
PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
|
||||
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
PKG_FORTIFY_SOURCE:=2
|
||||
PKG_INSTALL:=1
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
|
@ -25,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk
|
|||
define Package/$(PKG_NAME)
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
DEPENDS:=+libell @(LINUX_5_15||LINUX_6_1)
|
||||
DEPENDS:=+libell @(LINUX_5_15||LINUX_6_1||LINUX_6_6)
|
||||
TITLE:=mptcpd
|
||||
URL:=https://github.com/intel/mptcpd
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -20,6 +20,9 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
|||
PKG_SOURCE_URL:=https://github.com/vel21ripn/nDPI.git
|
||||
PKG_SOURCE_VERSION:=$(PKG_REV)
|
||||
|
||||
PKG_LICENSE:=GPL-2.0-or-later
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
PKG_BUILD_PARALLEL:=0
|
||||
PKG_FORTIFY_SOURCE:=0
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ trap : HUP INT TERM
|
|||
if [ -z "$INTERFACE" ]; then
|
||||
curl -4 -o /dev/null $HOST || echo
|
||||
else
|
||||
/etc/init.d/sqm stop $INTERFACE
|
||||
[ -n "$(tc qdisc show dev $INTERFACE | grep ingress)" ] && /etc/init.d/sqm stop $INTERFACE
|
||||
domain=$(echo $HOST | awk -F/ '{print $3}')
|
||||
hostip=$(dig +nocmd +noall +answer A $domain | grep -v CNAME | awk '{print $5}' | tr '\n' ' ')
|
||||
if [ -n "$(ipset list 2>/dev/null | grep ss_rules)" ]; then
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ if [ -n "$HOST" ] && [ -n "$PORT" ] && [ -n "$USERNAME" ] && [ -n "$PASSWORD" ];
|
|||
[ -z "$FASTTEST" ] && echo "Disable SQM bandwidth limit on $INTERFACE"
|
||||
[ -z "$FASTTEST" ] && echo "Download test via server ${SERVER}:"
|
||||
if [ -n "$INTERFACE" ]; then
|
||||
[ -n "$(tc qdisc | grep $INTERFACE | grep bandwidth)" ] && {
|
||||
[ -n "$(tc qdisc show dev $INTERFACE | grep bandwidth)" ] && {
|
||||
export SQM_VERBOSITY_MIN=10
|
||||
export SQM_VERBOSITY_MAX=0
|
||||
export SQM_SYSLOG=1
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ _setup_wan_interface() {
|
|||
set network.$1.ip4table=wan
|
||||
set network.$1.multipath=$3
|
||||
set network.$1.defaultroute=0
|
||||
set network.$1.delegate=0
|
||||
set network.$1.addlatency=0
|
||||
set network.${1}_dev=device
|
||||
set network.${1}_dev.name=$2
|
||||
|
|
@ -380,6 +381,7 @@ if ([ "$board" = "teltonika,rutx" ] || [ "$board" = "teltonika,rutx12" ] || [ "$
|
|||
set network.modem1.peerdns='0'
|
||||
set network.modem1.multipath='on'
|
||||
set network.modem1.defaultroute='0'
|
||||
set network.modem1.delegate='0'
|
||||
commit network
|
||||
add_list firewall.@zone[1].network='modem1'
|
||||
commit firewall
|
||||
|
|
@ -395,6 +397,7 @@ if ([ "$board" = "teltonika,rutx" ] || [ "$board" = "teltonika,rutx12" ] || [ "$
|
|||
set network.modem2.force_link='1'
|
||||
set network.modem2.device='/sys/devices/platform/soc/8af8800.usb3/8a00000.dwc3/xhci-hcd.0.auto/usb1/1-1/1-1.2'
|
||||
set network.modem2.peerdns='0'
|
||||
set network.modem2.delegate='0'
|
||||
set network.modem2.multipath='on'
|
||||
set network.modem2.defaultroute='0'
|
||||
set network.modem2.ip4table=wan
|
||||
|
|
@ -438,7 +441,8 @@ if [ "$board" = "z8102ax" ]; then
|
|||
set network.modem1.force_link='1'
|
||||
set network.modem1.device='/sys/devices/platform/11200000.usb/usb1/1-1/1-1.1'
|
||||
set network.modem1.peerdns='0'
|
||||
set network.modem1.multipath='oncd'
|
||||
set network.modem1.delegate='0'
|
||||
set network.modem1.multipath='on'
|
||||
set network.modem1.defaultroute='0'
|
||||
set network.modem2=interface
|
||||
set network.modem2.proto='modemmanager'
|
||||
|
|
@ -449,6 +453,7 @@ if [ "$board" = "z8102ax" ]; then
|
|||
set network.modem2.force_link='1'
|
||||
set network.modem2.device='/sys/devices/platform/11200000.usb/usb1/1-1/1-1.2'
|
||||
set network.modem2.peerdns='0'
|
||||
set network.modem2.delegate='0'
|
||||
set network.modem2.multipath='on'
|
||||
set network.modem2.defaultroute='0'
|
||||
commit network
|
||||
|
|
@ -456,7 +461,6 @@ if [ "$board" = "z8102ax" ]; then
|
|||
add_list firewall.@zone[1].network='modem2'
|
||||
commit firewall
|
||||
EOF
|
||||
# /sys/bus/devices/1-1.1
|
||||
fi
|
||||
# set network.lan.ipaddr='192.168.5.10'
|
||||
# set network.lan.gateway='192.168.5.1'
|
||||
|
|
|
|||
|
|
@ -7,14 +7,16 @@ include $(TOPDIR)/rules.mk
|
|||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=r8125
|
||||
PKG_VERSION:=9.010.01-1
|
||||
PKG_VERSION:=9.012.03-1
|
||||
PKG_RELEASE:=$(AUTORELEASE)
|
||||
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8125-dkms/tar.gz/$(PKG_VERSION)?
|
||||
PKG_HASH:=81fb9a100e6cefb421557639b476fd03af61a99c55bc8fb03c6e396532bd0944
|
||||
PKG_HASH:=7964aacf4a2873cbe4133aeca830bd0725f819ea286bab162026ff283510144f
|
||||
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-dkms-$(PKG_VERSION)
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
--- a/src/r8125.h
|
||||
+++ b/src/r8125.h
|
||||
@@ -633,7 +633,11 @@
|
||||
typedef struct napi_struct *napi_ptr;
|
||||
typedef int napi_budget;
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
|
||||
+#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add_weight(ndev, &priv->napi, function, weight)
|
||||
+#else
|
||||
#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight)
|
||||
+#endif
|
||||
#define RTL_NAPI_QUOTA(budget, ndev) min(budget, budget)
|
||||
#define RTL_GET_PRIV(stuct_ptr, priv_struct) container_of(stuct_ptr, priv_struct, stuct_ptr)
|
||||
#define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev;
|
||||
|
|
@ -7,12 +7,14 @@ include $(TOPDIR)/rules.mk
|
|||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=r8152
|
||||
PKG_VERSION:=2.16.3.20220914
|
||||
PKG_VERSION:=2.17.1.20230903
|
||||
PKG_RELEASE:=3
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/wget/realtek-r8152-linux/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=61ed7af34c8882c6028ddd1a27bb78fb5bfba41211f84dd7a06e4dc84dbe9a9a
|
||||
PKG_HASH:=be19d9a984459762283f1ddc77f58746133a79051c01bb73f0b35fa843d47622
|
||||
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
|
||||
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-linux-$(PKG_VERSION)
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,14 @@ include $(TOPDIR)/rules.mk
|
|||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=r8168
|
||||
PKG_VERSION:=8.051.02
|
||||
PKG_VERSION:=8.052.01
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/BROBIRD/openwrt-r8168.git
|
||||
PKG_SOURCE_VERSION:=4f6cfe1ca12fb772deed57f1d2d1062af041ad07
|
||||
PKG_MIRROR_HASH:=6b149f5eb3b9e1dc50867a694984d253aa58d97dd5fbab30eb405d2d7b2be587
|
||||
PKG_SOURCE_VERSION:=a1d4d30ce44c6d1d5de559d8dfdda7a65b1918a3
|
||||
|
||||
PKG_LICENSE:=GPPL-2.0-only
|
||||
|
||||
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
|
||||
|
|
|
|||
13
r8168/patches/900-6.6-support.patch
Normal file
13
r8168/patches/900-6.6-support.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
--- a/src/r8168_n.c 2023-10-20 17:46:41.593467802 +0200
|
||||
+++ b/src/r8168_n.c 2023-10-20 17:47:59.460123974 +0200
|
||||
@@ -82,6 +82,10 @@
|
||||
#include <linux/mdio.h>
|
||||
#endif
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,5,0)
|
||||
+#include <net/gso.h>
|
||||
+#endif
|
||||
+
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,209 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# cake-autorate automatically adjusts bandwidth for CAKE in dependence on detected load and RTT
|
||||
|
||||
# cake-autorate_config.sh is a script that sets up defaults for cake-autorate
|
||||
|
||||
# Author: @Lynx (OpenWrt forum)
|
||||
# Inspiration taken from: @moeller0 (OpenWrt forum)
|
||||
|
||||
INTERFACE=""
|
||||
|
||||
# *** OUTPUT AND LOGGING OPTIONS ***
|
||||
|
||||
output_processing_stats=1 # enable (1) or disable (0) output monitoring lines showing processing stats
|
||||
output_load_stats=1 # enable (1) or disable (0) output monitoring lines showing achieved loads
|
||||
output_reflector_stats=1 # enable (1) or disable (0) output monitoring lines showing reflector stats
|
||||
output_cake_changes=0 # enable (1) or disable (0) output monitoring lines showing cake bandwidth changes
|
||||
debug=1 # enable (1) or disable (0) out of debug lines
|
||||
|
||||
# This can generate a LOT of records so be careful:
|
||||
log_DEBUG_messages_to_syslog=0 # enable (1) or disable (0) logging of all DEBUG records into the system log.
|
||||
|
||||
# ** Take care with these settings to ensure you won't run into OOM issues on your router ***
|
||||
# every write the cumulative write time and bytes associated with each log line are checked
|
||||
# and if either exceeds the configured values below, the log log file is rotated
|
||||
log_to_file=1 # enable (1) or disable (0) output logging to file (/tmp/cake-autorate.log)
|
||||
log_file_max_time_mins=10 # maximum time between log file rotations
|
||||
log_file_max_size_KB=2000 # maximum KB (i.e. bytes/1024) worth of log lines between log file rotations
|
||||
|
||||
# log file path defaults to /var/log/
|
||||
# or, if set below, then ${log_file_path_override}
|
||||
log_file_path_override=""
|
||||
|
||||
# *** STANDARD CONFIGURATION OPTIONS ***
|
||||
|
||||
### For multihomed setups, it is the responsibility of the user to ensure that the probes
|
||||
### sent by this instance of cake-autorate actually travel through these interfaces.
|
||||
### See ping_extra_args and ping_prefix_string
|
||||
|
||||
dl_if=ifb-wan # download interface
|
||||
ul_if=wan # upload interface
|
||||
|
||||
# pinger selection can be any of:
|
||||
# fping - round robin pinging (rtts)
|
||||
# ping - (iputils-ping) individual pinging (rtts)
|
||||
# hping3 - individidual pinging (owds)
|
||||
pinger_binary=fping
|
||||
|
||||
# list of reflectors to use and number of pingers to initiate
|
||||
# pingers will be initiated with reflectors in the order specified in the list
|
||||
# additional reflectors will be used to replace any reflectors that go stale
|
||||
# so e.g. if 6 reflectors are specified and the number of pingers is set to 4, the first 4 reflectors will be used initially
|
||||
# and the remaining 2 reflectors in the list will be used in the event any of the first 4 go bad
|
||||
# a bad reflector will go to the back of the queue on reflector rotation
|
||||
reflectors=(
|
||||
"1.1.1.1" "1.0.0.1" # Cloudflare
|
||||
"8.8.8.8" "8.8.4.4" # Google
|
||||
"9.9.9.9" "9.9.9.10" "9.9.9.11" # Quad9
|
||||
"94.140.14.15" "94.140.14.140" "94.140.14.141" "94.140.15.15" "94.140.15.16" # AdGuard
|
||||
"64.6.65.6" "156.154.70.1" "156.154.70.2" "156.154.70.3" "156.154.70.4" "156.154.70.5" "156.154.71.1" "156.154.71.2" "156.154.71.3" "156.154.71.4" "156.154.71.5" # Neustar
|
||||
"208.67.220.2" "208.67.220.123" "208.67.220.220" "208.67.222.2" "208.67.222.123" # OpenDNS
|
||||
"185.228.168.9" "185.228.168.10" # CleanBrowsing
|
||||
)
|
||||
|
||||
randomize_reflectors=1 # enable (1) or disable (0) randomization of reflectors on startup
|
||||
|
||||
# Think carefully about the following settings
|
||||
# to avoid excessive CPU use (proportional with ping interval / number of pingers)
|
||||
# and to avoid abusive network activity (excessive ICMP frequency to one reflector)
|
||||
# The author has found an ICMP rate of 1/(0.2/4) = 20 Hz to give satisfactory performance on 4G
|
||||
no_pingers=6 # number of pingers to maintain
|
||||
reflector_ping_interval_s=0.3 # (seconds, e.g. 0.2s or 2s)
|
||||
|
||||
# delay threshold in ms is the extent of OWD increase to classify as a delay
|
||||
# these are automatically adjusted based on maximum on the wire packet size
|
||||
# (adjustment significant at sub 12Mbit/s rates, else negligible)
|
||||
dl_delay_thr_ms=30 # (milliseconds)
|
||||
ul_delay_thr_ms=30 # (milliseconds)
|
||||
|
||||
# Set either of the below to 0 to adjust one direction only
|
||||
# or alternatively set both to 0 to simply use cake-autorate to monitor a connection
|
||||
adjust_dl_shaper_rate=1 # enable (1) or disable (0) actually changing the dl shaper rate
|
||||
adjust_ul_shaper_rate=1 # enable (1) or disable (0) actually changing the ul shaper rate
|
||||
|
||||
min_dl_shaper_rate_kbps=5000 # minimum bandwidth for download (Kbit/s)
|
||||
base_dl_shaper_rate_kbps=20000 # steady state bandwidth for download (Kbit/s)
|
||||
max_dl_shaper_rate_kbps=80000 # maximum bandwidth for download (Kbit/s)
|
||||
|
||||
min_ul_shaper_rate_kbps=5000 # minimum bandwidth for upload (Kbit/s)
|
||||
base_ul_shaper_rate_kbps=20000 # steady state bandwidth for upload (KBit/s)
|
||||
max_ul_shaper_rate_kbps=35000 # maximum bandwidth for upload (Kbit/s)
|
||||
|
||||
# sleep functionality saves unecessary pings and CPU cycles by
|
||||
# pausing all active pingers when connection is not in active use
|
||||
enable_sleep_function=1 # enable (1) or disable (0) sleep functonality
|
||||
connection_active_thr_kbps=1000 # threshold in Kbit/s below which dl/ul is considered idle
|
||||
sustained_idle_sleep_thr_s=60.0 # time threshold to put pingers to sleep on sustained dl/ul achieved rate < idle_thr (seconds)
|
||||
|
||||
min_shaper_rates_enforcement=0 # enable (1) or disable (0) dropping down to minimum shaper rates on connection idle or stall
|
||||
|
||||
startup_wait_s=0.0 # number of seconds to wait on startup (e.g. to wait for things to settle on router reboot)
|
||||
|
||||
# *** ADVANCED CONFIGURATION OPTIONS ***
|
||||
|
||||
log_file_export_compress=1 # compress log file exports using gzip and append .gz to export filename
|
||||
|
||||
### In multi-homed setups, it is mandatory to use either ping_extra_args
|
||||
### or ping_prefix_string to direct the pings through $dl_if and $ul_if.
|
||||
### No universal recommendation exists, because there are multiple
|
||||
### policy-routing packages available (e.g. vpn-policy-routing and mwan3).
|
||||
### Typically they either react to a firewall mark set on the pings, or
|
||||
### provide a convenient wrapper.
|
||||
###
|
||||
### In a traditional single-homed setup, there is usually no need for these parameters.
|
||||
###
|
||||
### These arguments can also be used for any other purpose - e.g. for setting a
|
||||
### particular QoS mark.
|
||||
|
||||
# extra arguments for ping or fping
|
||||
# e.g., here is how you can set the correct outgoing interface and
|
||||
# the firewall mark for ping:
|
||||
# ping_extra_args="-I wwan0 -m $((0x300))"
|
||||
# Unfortunately, fping does not offer a command line switch to set
|
||||
# the firewall mark.
|
||||
# WARNING: no error checking so use at own risk!
|
||||
ping_extra_args=""
|
||||
|
||||
# a wrapper for ping binary - used as a prefix for the real command
|
||||
# e.g., when using mwan3, it is recommended to set it like this:
|
||||
# ping_prefix_string="mwan3 use gpon exec"
|
||||
# WARNING: the wrapper must exec ping as the final step, not run it as a subprocess.
|
||||
# Running ping or fping as a subprocess will lead to problems stopping it.
|
||||
# WARNING: no error checking - so use at own risk!
|
||||
ping_prefix_string=""
|
||||
|
||||
# interval in ms for monitoring achieved rx/tx rates
|
||||
# this is automatically adjusted based on maximum on the wire packet size
|
||||
# (adjustment significant at sub 12Mbit/s rates, else negligible)
|
||||
monitor_achieved_rates_interval_ms=200 # (milliseconds)
|
||||
|
||||
# bufferbloat is detected when (bufferbloat_detection_thr) samples
|
||||
# out of the last (bufferbloat detection window) samples are delayed
|
||||
bufferbloat_detection_window=6 # number of samples to retain in detection window
|
||||
bufferbloat_detection_thr=3 # number of delayed samples for bufferbloat detection
|
||||
|
||||
# OWD baseline against which to measure delays
|
||||
# the idea is that the baseline is allowed to increase slowly to allow for path changes
|
||||
# and slowly enough such that bufferbloat will be corrected well before the baseline increases,
|
||||
# but it will decrease very rapidly to ensure delays are measured against the shortest path
|
||||
alpha_baseline_increase=0.001 # how rapidly baseline RTT is allowed to increase
|
||||
alpha_baseline_decrease=0.9 # how rapidly baseline RTT is allowed to decrease
|
||||
|
||||
# OWD delta from baseline is tracked using ewma with alpha set below
|
||||
alpha_delta_ewma=0.095
|
||||
|
||||
# rate adjustment parameters
|
||||
# bufferbloat adjustment works with the lower of the adjusted achieved rate and adjusted shaper rate
|
||||
# to exploit that transfer rates during bufferbloat provide an indication of line capacity
|
||||
# otherwise shaper rate is adjusted up on load high, and down on load idle or low
|
||||
achieved_rate_adjust_down_bufferbloat=0.9 # how rapidly to reduce achieved rate upon detection of bufferbloat
|
||||
shaper_rate_adjust_down_bufferbloat=0.9 # how rapidly to reduce shaper rate upon detection of bufferbloat
|
||||
shaper_rate_adjust_up_load_high=1.01 # how rapidly to increase shaper rate upon high load detected
|
||||
shaper_rate_adjust_down_load_low=0.99 # how rapidly to return down to base shaper rate upon idle or low load detected
|
||||
shaper_rate_adjust_up_load_low=1.01 # how rapidly to return up to base shaper rate upon idle or low load detected
|
||||
|
||||
# the load is categoried as low if < high_load_thr and high if > high_load_thr relative to the current shaper rate
|
||||
high_load_thr=0.75 # % of currently set bandwidth for detecting high load
|
||||
|
||||
# refractory periods between successive bufferbloat/decay rate changes
|
||||
# the bufferbloat refractory period should be greater than the
|
||||
# average time it would take to replace the bufferbloat
|
||||
# detection window with new samples upon a bufferbloat event
|
||||
bufferbloat_refractory_period_ms=300 # (milliseconds)
|
||||
decay_refractory_period_ms=1000 # (milliseconds)
|
||||
|
||||
# interval for checking reflector health
|
||||
reflector_health_check_interval_s=1.0 # (seconds)
|
||||
# deadline for reflector response not to be classified as an offence against reflector
|
||||
reflector_response_deadline_s=1.0 # (seconds)
|
||||
|
||||
# reflector misbehaving is detected when $reflector_misbehaving_detection_thr samples
|
||||
# out of the last (reflector misbehaving detection window) samples are offences
|
||||
# thus with a 1s interval, window 60 and detection_thr 3, this is tantamount to
|
||||
# 3 offences within the last 60s
|
||||
reflector_misbehaving_detection_window=60
|
||||
reflector_misbehaving_detection_thr=3
|
||||
|
||||
reflector_replacement_interval_mins=60 # how often to replace a random reflector from the present list
|
||||
|
||||
reflector_comparison_interval_mins=1 # how often to compare reflectors
|
||||
reflector_sum_owd_baselines_delta_thr_ms=20 # max increase from min sum owd baselines before reflector rotated
|
||||
reflector_owd_delta_ewma_delta_thr_ms=10 # max increase from min delta ewma before reflector rotated
|
||||
|
||||
# stall is detected when the following two conditions are met:
|
||||
# 1) no reflector responses within $stall_detection_thr*$ping_response_interval_us; and
|
||||
# 2) either $rx_achieved_rate or $tx_achieved_rate < $connection_stall_thr
|
||||
stall_detection_thr=5
|
||||
connection_stall_thr_kbps=10
|
||||
|
||||
global_ping_response_timeout_s=10 # timeout to set shaper rates to min on no ping response whatsoever (seconds)
|
||||
|
||||
if_up_check_interval_s=10.0 # time to wait before re-checking if rx/tx bytes files exist (e.g. from boot state or sleep recovery)
|
||||
|
||||
# Starlink satellite switch (sss) compensation options
|
||||
sss_compensation=0 # enable (1) or disable (0) Starlink handling
|
||||
# satellite switch compensation start times in seconds of each minute
|
||||
sss_times_s=("12.0" "27.0" "42.0" "57.0")
|
||||
sss_compensation_pre_duration_ms=300
|
||||
sss_compensation_post_duration_ms=200
|
||||
|
|
@ -10,16 +10,18 @@ include $(INCLUDE_DIR)/kernel.mk
|
|||
|
||||
PKG_NAME:=systemtap
|
||||
PKG_RELEASE:=1
|
||||
PKG_VERSION:=4.9
|
||||
PKG_VERSION:=5.0
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://sourceware.org/systemtap/ftp/releases/
|
||||
PKG_HASH:=d01033baea9d0af52a65e70167816931f4b856427a53ff2ab30e4b45f6ad3a98
|
||||
PKG_HASH:=a8b43408895fee2b0023483b02f861700b0139629050666dfe4dfa1e49d59939
|
||||
|
||||
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_BUILD_DEPENDS:=systemtap/host
|
||||
PKG_INSTALL:=1
|
||||
|
||||
PKG_LICENSE:=GPL-2.0-or-later
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@ PKG_SOURCE_PROTO:=git
|
|||
PKG_SOURCE_VERSION:=4ad40ea43354038a04ad90aedae5874801c223e8
|
||||
#v0.4.4
|
||||
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
PKG_FIXUP:=autoreconf
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
|
@ -43,7 +46,7 @@ CONFIGURE_VARS += \
|
|||
ac_cv_header_lua_h=no \
|
||||
ax_header_version_match=yes
|
||||
|
||||
CONFIGURE_ARGS += --enable-sniffer --enable-curl --with-libpcap="$(STAGING_DIR)/usr/include/"
|
||||
CONFIGURE_ARGS += --enable-sniffer --enable-curl --with-libpcap="$(STAGING_DIR)/usr/include/" --disable-tests
|
||||
|
||||
EXTRA_CPPFLAGS += -fpermissive -Wno-variadic-macros -std=c++14
|
||||
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ if [ -z "$(uci -q get v2ray.main)" ]; then
|
|||
set v2ray.omrout.s_socks_user_encryption='none'
|
||||
set v2ray.omrout.s_socks_user_alter_id='0'
|
||||
set v2ray.omrout.ss_network='tcp'
|
||||
set v2ray.omrout.ss_sockopt_mptcp='1'
|
||||
set v2ray.omrout.ss_security='tls'
|
||||
set v2ray.omrout.ss_tls_allow_insecure='1'
|
||||
set v2ray.omrout.ss_tls_disable_system_root='1'
|
||||
|
|
@ -199,7 +200,8 @@ if [ "$(uci -q get v2ray.omrout.s_socks_port)" = "" ]; then
|
|||
fi
|
||||
if [ "$(uci -q get v2ray.omrout.ss_sockopt_mptcp)" = "" ]; then
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
set v2ray.omr.ss_sockopt_mptcp='1'
|
||||
set v2ray.omrout.ss_sockopt_mptcp='1'
|
||||
commit v2ray
|
||||
EOF
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue