Skip to content

refactor: BBR configuration to use sysctl.d file #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsynik merged 2 commits into from
Dec 8, 2025
Merged

refactor: BBR configuration to use sysctl.d file #591

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffe51e8
refactor: BBR configuration to use sysctl.d file
pavelpikta Dec 1, 2025
0afe306
Merge branch 'master' into refactor/bbr-configuration
pavelpikta Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 19 additions & 25 deletions installTorrServerLinux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ readonly VERSION_PREFIX="MatriX"
readonly BINARY_NAME_PREFIX="TorrServer-linux"
readonly MIN_GLIBC_VERSION="2.32"
readonly MIN_VERSION_REQUIRING_GLIBC=136
readonly SYSCTL_BBR_FILE="/etc/sysctl.d/90-torrserver.conf"

# Color support
declare -A colors=([black]=0 [red]=1 [green]=2 [yellow]=3 [blue]=4 [magenta]=5 [cyan]=6 [white]=7)
Expand Down Expand Up @@ -1037,23 +1038,20 @@ ensureBBRModuleAtBoot() {
return 0
}

# Check if BBR is configured in sysctl.conf
# Check if BBR is configured in sysctl.d file
isBBRConfiguredInFile() {
local sysctl_file="${1:-/etc/sysctl.conf}"
[[ -f "$sysctl_file" ]] && \
grep -q "^net.core.default_qdisc=fq" "$sysctl_file" 2>/dev/null && \
grep -q "^net.ipv4.tcp_congestion_control=bbr" "$sysctl_file" 2>/dev/null
[[ -f "$SYSCTL_BBR_FILE" ]] && \
grep -q "^net.core.default_qdisc=fq" "$SYSCTL_BBR_FILE" 2>/dev/null && \
grep -q "^net.ipv4.tcp_congestion_control=bbr" "$SYSCTL_BBR_FILE" 2>/dev/null
}

# Add BBR settings to sysctl.conf
# Add BBR settings to sysctl.d file
addBBRToSysctl() {
local sysctl_file="${1:-/etc/sysctl.conf}"

if ! grep -q "^net.core.default_qdisc=fq" "$sysctl_file" 2>/dev/null; then
echo "net.core.default_qdisc=fq" >> "$sysctl_file" 2>/dev/null || return 1
if ! grep -q "^net.core.default_qdisc=fq" "$SYSCTL_BBR_FILE" 2>/dev/null; then
echo "net.core.default_qdisc=fq" >> "$SYSCTL_BBR_FILE" 2>/dev/null || return 1
fi
if ! grep -q "^net.ipv4.tcp_congestion_control=bbr" "$sysctl_file" 2>/dev/null; then
echo "net.ipv4.tcp_congestion_control=bbr" >> "$sysctl_file" 2>/dev/null || return 1
if ! grep -q "^net.ipv4.tcp_congestion_control=bbr" "$SYSCTL_BBR_FILE" 2>/dev/null; then
echo "net.ipv4.tcp_congestion_control=bbr" >> "$SYSCTL_BBR_FILE" 2>/dev/null || return 1
fi
return 0
}
Expand All @@ -1077,9 +1075,7 @@ applyBBRSettings() {

# Ensure BBR is active (non-critical - always returns success)
ensureBBRActive() {
local sysctl_file="/etc/sysctl.conf"

! isBBRConfiguredInFile "$sysctl_file" && return 0
! isBBRConfiguredInFile && return 0
isBBRActive && return 0

if ! isBBRAvailable && ! loadBBRModule; then
Expand All @@ -1098,7 +1094,7 @@ ensureBBRActive() {
[[ $SILENT_MODE -eq 0 ]] && {
echo " - $(colorize yellow "$(msg bbr_activate_failed_cc "$current_cc")")"
echo " $(colorize yellow "$(msg bbr_no_optimization)")"
echo " $(colorize yellow "$(msg bbr_settings_will_apply "$sysctl_file")")"
echo " $(colorize yellow "$(msg bbr_settings_will_apply "$SYSCTL_BBR_FILE")")"
}
fi
return 0
Expand All @@ -1107,38 +1103,36 @@ ensureBBRActive() {
configureBBR() {
[[ $isBbr -ne 1 ]] && return 0

local sysctl_file="/etc/sysctl.conf"

# Check if BBR is available or can be loaded first
if ! isBBRAvailable && ! loadBBRModule; then
# BBR not available - check if it's already in config
if isBBRConfiguredInFile "$sysctl_file"; then
if isBBRConfiguredInFile; then
[[ $SILENT_MODE -eq 0 ]] && {
echo " - $(colorize yellow "$(msg bbr_configured_not_available)")"
echo " $(colorize yellow "$(msg bbr_requires_kernel)")"
echo " $(colorize yellow "$(msg bbr_settings_will_apply "$sysctl_file")")"
echo " $(colorize yellow "$(msg bbr_settings_will_apply "$SYSCTL_BBR_FILE")")"
echo " $(colorize yellow "$(msg bbr_no_optimization)")"
}
else
# Not in config and not available - don't add it
[[ $SILENT_MODE -eq 0 ]] && {
echo " - $(colorize yellow "$(msg bbr_not_available)")"
echo " $(colorize yellow "$(msg bbr_requires_kernel)")"
echo " $(colorize yellow "$(msg bbr_settings_not_added "$sysctl_file")")"
echo " $(colorize yellow "$(msg bbr_settings_not_added "$SYSCTL_BBR_FILE")")"
echo " $(colorize yellow "$(msg bbr_no_optimization)")"
}
fi
return 0
fi

# BBR is available - now configure it
if isBBRConfiguredInFile "$sysctl_file"; then
if isBBRConfiguredInFile; then
[[ $SILENT_MODE -eq 0 ]] && echo " - $(msg bbr_already_configured)"
else
! addBBRToSysctl "$sysctl_file" && {
! addBBRToSysctl && {
[[ $SILENT_MODE -eq 0 ]] && {
echo " - $(colorize yellow "$(msg bbr_config_failed)")"
echo " $(colorize yellow "$(msg bbr_write_failed "$sysctl_file")")"
echo " $(colorize yellow "$(msg bbr_write_failed "$SYSCTL_BBR_FILE")")"
echo " $(colorize yellow "$(msg bbr_no_optimization)")"
}
return 0
Expand All @@ -1158,7 +1152,7 @@ configureBBR() {
[[ $SILENT_MODE -eq 0 ]] && {
echo " - $(colorize yellow "$(msg bbr_config_failed)")"
echo " $(colorize yellow "$(msg bbr_current_values "$current_qdisc" "$current_cc")")"
echo " $(colorize yellow "$(msg bbr_settings_will_apply "$sysctl_file")")"
echo " $(colorize yellow "$(msg bbr_settings_will_apply "$SYSCTL_BBR_FILE")")"
echo " $(colorize yellow "$(msg bbr_no_optimization)")"
}
return 0
Expand Down