zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nikki: sync upstream

Browse Source 
last commit: 089e37ef00
This commit is contained in:
gitea-action 2025-04-12 21:00:24 +08:00
parent 73586f1afa
commit fb58d8ed2a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nikki/files/uci-defaults/migrate.sh
View File

@ -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 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" ] && { proxy_acl_ip=$(uci -q get nikki.proxy.acl_ip); [ -n "$proxy_acl_ip" ] && {
for ip in $proxy_acl_ip; do for ip in $proxy_acl_ip; do
uci add nikki lan_access_control uci add nikki lan_access_control
@ -90,12 +92,13 @@ 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 [ "$proxy_access_control_mode" == "block" ] && uci set nikki.@lan_access_control[-1].proxy=0
done done
} }
[ "$proxy_access_control_mode" == "block" ] && { }
[ "$proxy_access_control_mode" != "allow" ] && {
uci add nikki lan_access_control uci add nikki lan_access_control
uci set nikki.@lan_access_control[-1].enabled=1 uci set nikki.@lan_access_control[-1].enabled=1
uci set nikki.@lan_access_control[-1].proxy=1 uci set nikki.@lan_access_control[-1].proxy=1
} }
}
uci del nikki.proxy.access_control_mode uci del nikki.proxy.access_control_mode
uci del nikki.proxy.acl_ip uci del nikki.proxy.acl_ip

2
nikki/files/ucode/hijack.ut
View File

@ -305,7 +305,7 @@ table inet nikki {
{% for (let access_control in lan_access_control): %} {% for (let access_control in lan_access_control): %}
{% if (access_control['enabled']): %} {% if (access_control['enabled']): %}
{% if (length(access_control['ip']) == 0 && length(access_control['ip6']) == 0 && length(access_control['mac']) == 0): %} {% 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 %} {% else %}
{% if (length(access_control['ip']) > 0): %} {% if (length(access_control['ip']) > 0): %}