Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2026-01-27 04:40:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/rc/7.x.x' into rc/7.x.x

Browse Source
This commit is contained in:
divocat
2025-10-14 20:17:23 +03:00
parent dbf7e39599 fa152c3abf
commit a9fdf286e0
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
podkop/files/usr/bin/podkop
View File

@@ -812,13 +812,13 @@ configure_routing_for_section_lists() {
local community_lists user_domain_list_type user_subnet_list_type local_domain_lists local_subnet_lists \ local community_lists user_domain_list_type user_subnet_list_type local_domain_lists local_subnet_lists \
remote_domain_lists remote_subnet_lists section_connection_type route_rule_tag remote_domain_lists remote_subnet_lists section_connection_type route_rule_tag
config_get_bool community_lists "$section" "community_lists" config_get community_lists "$section" "community_lists"
config_get user_domain_list_type "$section" "user_domain_list_type" "disabled" config_get user_domain_list_type "$section" "user_domain_list_type" "disabled"
config_get user_subnet_list_type "$section" "user_subnet_list_type" "disabled" config_get user_subnet_list_type "$section" "user_subnet_list_type" "disabled"
config_get_bool local_domain_lists "$section" "local_domain_lists" config_get local_domain_lists "$section" "local_domain_lists"
config_get_bool local_subnet_lists "$section" "local_subnet_lists" config_get local_subnet_lists "$section" "local_subnet_lists"
config_get_bool remote_domain_lists "$section" "remote_domain_lists" config_get remote_domain_lists "$section" "remote_domain_lists"
config_get_bool remote_subnet_lists "$section" "remote_subnet_lists" config_get remote_subnet_lists "$section" "remote_subnet_lists"
config_get section_connection_type "$section" "connection_type" config_get section_connection_type "$section" "connection_type"
if [ "$section_connection_type" = "block" ]; then if [ "$section_connection_type" = "block" ]; then
@@ -1066,14 +1066,21 @@ sing_box_configure_experimental() {
sing_box_additional_inbounds() { sing_box_additional_inbounds() {
log "Configure the additional inbounds of a sing-box JSON configuration" log "Configure the additional inbounds of a sing-box JSON configuration"
config=$( local download_lists_via_proxy
sing_box_cf_add_mixed_inbound_and_route_rule \ config_get_bool download_lists_via_proxy "settings" "download_lists_via_proxy" 0
"$config" \ if [ "$download_lists_via_proxy" -eq 1 ]; then
"$SB_SERVICE_MIXED_INBOUND_TAG" \ local download_lists_via_proxy_section section_outbound_tag
"$SB_SERVICE_MIXED_INBOUND_ADDRESS" \ config_get download_lists_via_proxy_section "settings" "download_lists_via_proxy_section"
"$SB_SERVICE_MIXED_INBOUND_PORT" \ section_outbound_tag="$(get_outbound_tag_by_section "$download_lists_via_proxy_section")"
"$SB_MAIN_OUTBOUND_TAG" config=$(
) sing_box_cf_add_mixed_inbound_and_route_rule \
"$config" \
"$SB_SERVICE_MIXED_INBOUND_TAG" \
"$SB_SERVICE_MIXED_INBOUND_ADDRESS" \
"$SB_SERVICE_MIXED_INBOUND_PORT" \
"$section_outbound_tag"
)
fi
config_foreach configure_section_mixed_proxy "section" config_foreach configure_section_mixed_proxy "section"
} }
@@ -1357,7 +1364,10 @@ get_service_proxy_address() {
get_download_detour_tag() { get_download_detour_tag() {
config_get_bool download_lists_via_proxy "settings" "download_lists_via_proxy" 0 config_get_bool download_lists_via_proxy "settings" "download_lists_via_proxy" 0
if [ "$download_lists_via_proxy" -eq 1 ]; then if [ "$download_lists_via_proxy" -eq 1 ]; then
echo "$SB_MAIN_OUTBOUND_TAG" local download_lists_via_proxy_section section_outbound_tag
config_get download_lists_via_proxy_section "settings" "download_lists_via_proxy_section"
section_outbound_tag="$(get_outbound_tag_by_section "$download_lists_via_proxy_section")"
echo "$section_outbound_tag"
else else
echo "" echo ""
fi fi
@@ -1380,13 +1390,13 @@ section_has_enabled_lists() {
local community_lists user_domain_list_type user_subnet_list_type local_domain_lists local_subnet_lists \ local community_lists user_domain_list_type user_subnet_list_type local_domain_lists local_subnet_lists \
remote_domain_lists remote_subnet_lists remote_domain_lists remote_subnet_lists
config_get_bool community_lists "$section" "community_lists" config_get community_lists "$section" "community_lists"
config_get user_domain_list_type "$section" "user_domain_list_type" "disabled" config_get user_domain_list_type "$section" "user_domain_list_type" "disabled"
config_get user_subnet_list_type "$section" "user_subnet_list_type" "disabled" config_get user_subnet_list_type "$section" "user_subnet_list_type" "disabled"
config_get_bool local_domain_lists "$section" "local_domain_lists" config_get local_domain_lists "$section" "local_domain_lists"
config_get_bool local_subnet_lists "$section" "local_subnet_lists" config_get local_subnet_lists "$section" "local_subnet_lists"
config_get_bool remote_domain_lists "$section" "remote_domain_lists" config_get remote_domain_lists "$section" "remote_domain_lists"
config_get_bool remote_subnet_lists "$section" "remote_subnet_lists" config_get remote_subnet_lists "$section" "remote_subnet_lists"
if [ -n "$community_lists" ] || if [ -n "$community_lists" ] ||
[ "$user_domain_list_type" != "disabled" ] || [ "$user_domain_list_type" != "disabled" ] ||