From fb58d8ed2af344748e4194d2282cc5ca8f0b5b8e Mon Sep 17 00:00:00 2001 From: gitea-action Date: Sat, 12 Apr 2025 21:00:24 +0800 Subject: [PATCH] nikki: sync upstream last commit: https://github.com/nikkinikki-org/OpenWrt-nikki/commit/089e37ef00d95253b1dbad20f19f07cc24b229cb --- nikki/files/uci-defaults/migrate.sh | 15 +++++++++------ nikki/files/ucode/hijack.ut | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/nikki/files/uci-defaults/migrate.sh b/nikki/files/uci-defaults/migrate.sh index 1326cb9f2..5f084913d 100644 --- a/nikki/files/uci-defaults/migrate.sh +++ b/nikki/files/uci-defaults/migrate.sh @@ -62,7 +62,9 @@ proxy_transparent_proxy=$(uci -q get nikki.proxy.transparent_proxy); [ -n "$prox uci add_list nikki.proxy.lan_inbound_interface=lan - proxy_access_control_mode=$(uci -q get nikki.proxy.access_control_mode); [ "$proxy_access_control_mode" != "all" ] && { + proxy_access_control_mode=$(uci -q get nikki.proxy.access_control_mode) + + [ "$proxy_access_control_mode" != "all" ] && { proxy_acl_ip=$(uci -q get nikki.proxy.acl_ip); [ -n "$proxy_acl_ip" ] && { for ip in $proxy_acl_ip; do uci add nikki lan_access_control @@ -90,11 +92,12 @@ proxy_transparent_proxy=$(uci -q get nikki.proxy.transparent_proxy); [ -n "$prox [ "$proxy_access_control_mode" == "block" ] && uci set nikki.@lan_access_control[-1].proxy=0 done } - [ "$proxy_access_control_mode" == "block" ] && { - uci add nikki lan_access_control - uci set nikki.@lan_access_control[-1].enabled=1 - uci set nikki.@lan_access_control[-1].proxy=1 - } + } + + [ "$proxy_access_control_mode" != "allow" ] && { + uci add nikki lan_access_control + uci set nikki.@lan_access_control[-1].enabled=1 + uci set nikki.@lan_access_control[-1].proxy=1 } uci del nikki.proxy.access_control_mode diff --git a/nikki/files/ucode/hijack.ut b/nikki/files/ucode/hijack.ut index e69faac1f..83554b304 100644 --- a/nikki/files/ucode/hijack.ut +++ b/nikki/files/ucode/hijack.ut @@ -305,7 +305,7 @@ table inet nikki { {% for (let access_control in lan_access_control): %} {% if (access_control['enabled']): %} {% if (length(access_control['ip']) == 0 && length(access_control['ip6']) == 0 && length(access_control['mac']) == 0): %} - meta l4proto tcp tcp counter {% if (access_control.proxy == '1'): %} redirect to :{{ redir_port }} {% else %} counter return {% endif %} + meta l4proto tcp counter {% if (access_control.proxy == '1'): %} redirect to :{{ redir_port }} {% else %} counter return {% endif %} {% else %} {% if (length(access_control['ip']) > 0): %}