From a33dcef5be93eb04da0533e1195550c8bf9ad8d5 Mon Sep 17 00:00:00 2001 From: actions Date: Tue, 9 Apr 2024 16:00:06 +0800 Subject: [PATCH] luci-app-passwall2: sync upstream --- .../luasrc/model/cbi/passwall2/client/type/hysteria2.lua | 4 ++-- luci-app-passwall2/root/usr/share/passwall2/nftables.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/hysteria2.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/hysteria2.lua index cc31ecf77..c612af3c6 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/hysteria2.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/hysteria2.lua @@ -56,10 +56,10 @@ o.rewrite_option = o.option o = s:option(Value, option_name("hop_interval"), translate("Hop Interval")) o.rewrite_option = o.option -o = s:option(Value, option_name("recv_window_conn"), translate("QUIC stream receive window")) +o = s:option(Value, option_name("recv_window"), translate("QUIC stream receive window")) o.rewrite_option = o.option -o = s:option(Value, option_name("recv_window"), translate("QUIC connection receive window")) +o = s:option(Value, option_name("recv_window_conn"), translate("QUIC connection receive window")) o.rewrite_option = o.option o = s:option(Value, option_name("idle_timeout"), translate("Idle Timeout")) diff --git a/luci-app-passwall2/root/usr/share/passwall2/nftables.sh b/luci-app-passwall2/root/usr/share/passwall2/nftables.sh index e502ed866..9455d4a86 100755 --- a/luci-app-passwall2/root/usr/share/passwall2/nftables.sh +++ b/luci-app-passwall2/root/usr/share/passwall2/nftables.sh @@ -818,7 +818,7 @@ add_firewall_rule() { [ "$accept_icmpv6" = "1" ] && { nft "add rule inet fw4 PSW2_ICMP_REDIRECT oif lo meta l4proto icmpv6 ip6 daddr $FAKE_IP_6 counter redirect" - nft "add rule inet fw4 PSW2_ICMP_REDIRECT oif lo meta l4proto counter redirect" + nft "add rule inet fw4 PSW2_ICMP_REDIRECT oif lo meta l4proto icmpv6 counter redirect" nft "add rule inet fw4 PSW2_ICMP_REDIRECT oif lo meta l4proto icmpv6 counter return" }