chore: Move and rename _get_download_detour_tag to get_download_detour_tag

This commit is contained in:
Andrey Petelin
2025-09-08 22:55:42 +05:00
parent fe30cf9e55
commit a187192a88

View File

@@ -970,7 +970,7 @@ configure_community_list_handler() {
ruleset_tag="$(get_ruleset_tag "$section" "$tag" "community")" ruleset_tag="$(get_ruleset_tag "$section" "$tag" "community")"
format="binary" format="binary"
url="$SRS_MAIN_URL/$tag.srs" url="$SRS_MAIN_URL/$tag.srs"
detour="$(_get_download_detour_tag)" detour="$(get_download_detour_tag)"
config_get update_interval "main" "update_interval" "1d" config_get update_interval "main" "update_interval" "1d"
config=$(sing_box_cm_add_remote_ruleset "$config" "$ruleset_tag" "$format" "$url" "$detour" "$update_interval") config=$(sing_box_cm_add_remote_ruleset "$config" "$ruleset_tag" "$format" "$url" "$detour" "$update_interval")
@@ -1053,7 +1053,7 @@ configure_remote_domain_or_subnet_list_handler() {
basename=$(url_get_basename "$url") basename=$(url_get_basename "$url")
ruleset_tag=$(get_ruleset_tag "$section" "$basename" "remote-$type") ruleset_tag=$(get_ruleset_tag "$section" "$basename" "remote-$type")
format="$(get_ruleset_format_by_file_extension "$file_extension")" format="$(get_ruleset_format_by_file_extension "$file_extension")"
detour="$(_get_download_detour_tag)" detour="$(get_download_detour_tag)"
config_get update_interval "main" "update_interval" "1d" config_get update_interval "main" "update_interval" "1d"
config=$(sing_box_cm_add_remote_ruleset "$config" "$ruleset_tag" "$format" "$url" "$detour" "$update_interval") config=$(sing_box_cm_add_remote_ruleset "$config" "$ruleset_tag" "$format" "$url" "$detour" "$update_interval")
@@ -1076,15 +1076,6 @@ configure_user_subnet_list_handler() {
# TODO(ampetelin): it is necessary to implement # TODO(ampetelin): it is necessary to implement
} }
_get_download_detour_tag() {
config_get_bool detour "main" "detour" 0
if [ "${detour:-0}" -eq 1 ]; then
echo "$SB_MAIN_OUTBOUND_TAG"
else
echo ""
fi
}
_add_ruleset_to_dns_rules() { _add_ruleset_to_dns_rules() {
local ruleset_tag="$1" local ruleset_tag="$1"
@@ -1394,6 +1385,15 @@ get_service_proxy_address() {
fi fi
} }
get_download_detour_tag() {
config_get_bool detour "main" "detour" 0
if [ "${detour:-0}" -eq 1 ]; then
echo "$SB_MAIN_OUTBOUND_TAG"
else
echo ""
fi
}
## nftables ## nftables
nft_list_all_traffic_from_ip() { nft_list_all_traffic_from_ip() {
local ip="$1" local ip="$1"