Compare commits

...

6 Commits

Author SHA1 Message Date
Kirill Sobakin
a64923db5a Merge pull request #403 from itdoginfo/argument-list-too-long
fix: reduce default chunk_size to 1000
2026-07-01 10:28:17 +03:00
Andrey Petelin
0c99dddf11 fix: reduce default chunk_size to 1000 for domain and subnet import functions 2026-07-01 12:00:56 +05:00
Kirill Sobakin
922d6d4638 Merge pull request #395 from itdoginfo/fix/list-update
fix: use service_proxy_address for GitHub proxy connectivity check
2026-06-13 13:33:48 +03:00
Andrey Petelin
34f49c392e fix: use service_proxy_address for GitHub proxy connectivity check 2026-06-13 12:21:59 +05:00
Kirill Sobakin
de7b73af3c Merge pull request #384 from itdoginfo/fix/dnat
fix: skip connections with DNAT status in NFT mangle chain
2026-06-01 12:22:26 +03:00
Andrey Petelin
3c34bd1fd0 fix: skip connections with DNAT status in NFT mangle chain 2026-06-01 14:11:14 +05:00
2 changed files with 4 additions and 3 deletions

View File

@@ -312,6 +312,7 @@ create_nft_rules() {
nft add chain inet "$NFT_TABLE_NAME" mangle_output '{ type route hook output priority -150; policy accept; }'
nft add chain inet "$NFT_TABLE_NAME" proxy '{ type filter hook prerouting priority -100; policy accept; }'
nft add rule inet "$NFT_TABLE_NAME" mangle ct status dnat return
nft add rule inet "$NFT_TABLE_NAME" mangle iifname "@$NFT_INTERFACE_SET_NAME" ip daddr "@$NFT_COMMON_SET_NAME" meta l4proto tcp meta mark set "$NFT_FAKEIP_MARK" counter
nft add rule inet "$NFT_TABLE_NAME" mangle iifname "@$NFT_INTERFACE_SET_NAME" ip daddr "@$NFT_COMMON_SET_NAME" meta l4proto udp meta mark set "$NFT_FAKEIP_MARK" counter
nft add rule inet "$NFT_TABLE_NAME" mangle iifname "@$NFT_INTERFACE_SET_NAME" ip daddr "$SB_FAKEIP_INET4_RANGE" meta l4proto tcp meta mark set "$NFT_FAKEIP_MARK" counter
@@ -509,7 +510,7 @@ list_update() {
local service_proxy_address
service_proxy_address="$(get_service_proxy_address)"
if [ -n "$http_proxy_address" ]; then
if [ -n "$service_proxy_address" ]; then
if curl -s -x "http://$service_proxy_address" -m $curl_timeout https://github.com > /dev/null; then
echolog "✅ GitHub connection check passed (via proxy)"
break

View File

@@ -60,7 +60,7 @@ patch_source_ruleset_rules() {
import_plain_domain_list_to_local_source_ruleset_chunked() {
local plain_list_filepath="$1"
local ruleset_filepath="$2"
local chunk_size="${3:-5000}"
local chunk_size="${3:-1000}"
local array count json_array
count=0
@@ -102,7 +102,7 @@ import_plain_domain_list_to_local_source_ruleset_chunked() {
import_plain_subnet_list_to_local_source_ruleset_chunked() {
local plain_list_filepath="$1"
local ruleset_filepath="$2"
local chunk_size="${3:-5000}"
local chunk_size="${3:-1000}"
local array count json_array
count=0