From f3e26370e159c62eb1fff810ac2d3b82a65f7f20 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Sun, 7 Apr 2024 20:27:34 +0800 Subject: [PATCH] update 2024-04-07 20:27:34 --- fullconenat-nft/Makefile | 2 +- fullconenat/Makefile | 2 +- .../model/cbi/shadowsocksr/client-config.lua | 20 ++++++++++++++ luci-app-ssr-plus/po/zh-cn/ssr-plus.po | 21 +++++++++++++++ .../usr/share/shadowsocksr/gen_config.lua | 27 ++++++++++--------- luci-app-transmission/po/tr/transmission.po | 8 +++--- mhz/Makefile | 2 +- 7 files changed, 63 insertions(+), 19 deletions(-) diff --git a/fullconenat-nft/Makefile b/fullconenat-nft/Makefile index 05f57dbf1f6..b1ef68cfe6a 100644 --- a/fullconenat-nft/Makefile +++ b/fullconenat-nft/Makefile @@ -17,7 +17,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/fullcone-nat-nftables/nft-fullcone.git PKG_SOURCE_DATE:=2023-05-17 PKG_SOURCE_VERSION:=07d93b626ce5ea885cd16f9ab07fac3213c355d9 -PKG_MIRROR_HASH:=b2aeb9b804a020504e5a36e0700caf1c860027afb8ffa834573196d96c350598 +PKG_MIRROR_HASH:=84d54b5e6091148c31d4eddff2f8ead763c9ef318fdf35098a6f9cea9a29b7c8 PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE diff --git a/fullconenat/Makefile b/fullconenat/Makefile index 1c19edb604a..605be97e05a 100644 --- a/fullconenat/Makefile +++ b/fullconenat/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/llccd/netfilter-full-cone-nat.git PKG_SOURCE_DATE:=2023-01-01 PKG_SOURCE_VERSION:=74c5e6f3c7faaf33ece451697537c81781781c20 -PKG_MIRROR_HASH:=5de96fff9f0be18b32fa62e68d139554df018d13295a0e87a2f2c15cc300530b +PKG_MIRROR_HASH:=8bad0cf5d90c52b4cad384e4f1b15ac28312f767fcffe692c606d87d8c3facfc PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index d2b87a7fa0e..44b29af29a4 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -525,7 +525,9 @@ o.default = "3" o.rmempty = true o = s:option(Value, "timeout", translate("Timeout for establishing a connection to server(second)")) +o.description = translate("Default value 0 indicatesno heartbeat.") o:depends("type", "tuic") +o:depends({type = "v2ray", v2ray_protocol = "wireguard"}) o.datatype = "uinteger" o.default = "8" o.rmempty = true @@ -831,11 +833,22 @@ o:depends("transport", "kcp") o.rmempty = true -- [[ WireGuard 部分 ]]-- +o = s:option(Flag, "kernelmode", translate("Enabled Kernel virtual NIC TUN(optional)")) +o.description = translate("Virtual NIC TUN of Linux kernel can be used only when system supports and have root permission. If used, IPv6 routing table 1023 is occupied.") +o:depends({type = "v2ray", v2ray_protocol = "wireguard"}) +o.default = "0" +o.rmempty = true + o = s:option(DynamicList, "local_addresses", translate("Local addresses")) o.datatype = "cidr" o:depends({type = "v2ray", v2ray_protocol = "wireguard"}) o.rmempty = true +o = s:option(DynamicList, "reserved", translate("Reserved bytes(optional)")) +o.description = translate("Wireguard reserved bytes.") +o:depends({type = "v2ray", v2ray_protocol = "wireguard"}) +o.rmempty = true + o = s:option(Value, "private_key", translate("Private key")) o:depends({type = "v2ray", v2ray_protocol = "wireguard"}) o.password = true @@ -850,6 +863,13 @@ o:depends({type = "v2ray", v2ray_protocol = "wireguard"}) o.password = true o.rmempty = true +o = s:option(DynamicList, "allowedips", translate("allowedIPs(optional)")) +o.description = translate("Wireguard allows only traffic from specific source IP.") +o.datatype = "cidr" +o:depends({type = "v2ray", v2ray_protocol = "wireguard"}) +o.default = "0.0.0.0/0" +o.rmempty = true + -- [[ TLS ]]-- o = s:option(Flag, "tls", translate("TLS")) o.rmempty = true diff --git a/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/luci-app-ssr-plus/po/zh-cn/ssr-plus.po index d343d4f28aa..632b5c9e44f 100644 --- a/luci-app-ssr-plus/po/zh-cn/ssr-plus.po +++ b/luci-app-ssr-plus/po/zh-cn/ssr-plus.po @@ -942,9 +942,21 @@ msgstr "写入缓冲区大小" msgid "Congestion" msgstr "拥塞控制" +msgid "Enabled Kernel virtual NIC TUN(optional)" +msgstr "启用内核的虚拟网卡 TUN（可选）" + +msgid "Virtual NIC TUN of Linux kernel can be used only when system supports and have root permission. If used, IPv6 routing table 1023 is occupied." +msgstr "需要系统支持且有 root 权限才能使用 Linux 内核的虚拟网卡 TUN，使用后会占用 IPv6 的 1023 号路由表。" + msgid "Local addresses" msgstr "本地地址" +msgid "Reserved bytes(optional)" +msgstr "保留字节（可选）" + +msgid "Wireguard reserved bytes." +msgstr "Wireguard 保留字节。" + msgid "Private key" msgstr "私钥" @@ -954,6 +966,15 @@ msgstr "节点公钥" msgid "Pre-shared key" msgstr "预共享密钥" +msgid "Default value 0 indicatesno heartbeat." +msgstr "默认为 0 表示无心跳。" + +msgid "allowedIPs(optional)" +msgstr "allowedIPs（可选）" + +msgid "Wireguard allows only traffic from specific source IP." +msgstr "Wireguard 仅允许特定源 IP 的流量。" + msgid "Network interface to use" msgstr "使用的网络接口" diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua index cbb911ebed9..b07949e5f19 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua @@ -72,9 +72,13 @@ function wireguard() { publicKey = server.peer_pubkey, preSharedKey = server.preshared_key, - endpoint = server.server .. ":" .. server.server_port + endpoint = server.server .. ":" .. server.server_port, + keepAlive = tonumber(server.heartbeat), + allowedIPs = (server.allowedips) or nil, } }, + kernelMode = (server.kernelmode == "1") and true or false, + reserved = {server.reserved} or nil, mtu = tonumber(server.mtu) } end @@ -172,7 +176,7 @@ local Xray = { protocol = server.v2ray_protocol, settings = outbound_settings, -- 底层传输配置 - streamSettings = { + streamSettings = (server.v2ray_protocol ~= "wireguard") and { network = server.transport or "tcp", security = (server.tls == '1') and "tls" or (server.reality == '1') and "reality" or nil, tlsSettings = (server.tls == '1') and { @@ -258,14 +262,14 @@ local Xray = { tcpNoDelay = (server.mptcp == "1") and true or false, -- MPTCP tcpcongestion = server.custom_tcpcongestion -- 连接服务器节点的 TCP 拥塞控制算法 } - }, - mux = { + } or nil, + mux = (server.v2ray_protocol ~= "wireguard") and { -- mux enabled = (server.mux == "1") and true or false, -- Mux concurrency = tonumber(server.concurrency), -- TCP 最大并发连接数 xudpConcurrency = tonumber(server.xudpConcurrency), -- UDP 最大并发连接数 xudpProxyUDP443 = server.xudpProxyUDP443 -- 对被代理的 UDP/443 流量处理方式 - } + } or nil } } local cipher = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:AES128-SHA:AES256-SHA:DES-CBC3-SHA" @@ -322,7 +326,7 @@ local ss = { } local hysteria = { server = (server.server_port and (server.port_range and (server.server .. ":" .. server.server_port .. "," .. server.port_range) or server.server .. ":" .. server.server_port) or (server.port_range and server.server .. ":" .. server.port_range or server.server .. ":443")), - bandwidth = { + bandwidth = (server.uplink_capacity or server.downlink_capacity) and { up = tonumber(server.uplink_capacity) and tonumber(server.uplink_capacity) .. " mbps" or nil, down = tonumber(server.downlink_capacity) and tonumber(server.downlink_capacity) .. " mbps" or nil }, @@ -336,12 +340,11 @@ local hysteria = { hopInterval = (server.port_range and (tonumber(server.hopinterval) .. "s") or nil) } or nil) } or nil, - --[[ tcpTProxy = (proto:find("tcp") and local_port ~= "0") and { - listen = "0.0.0.0:" .. tonumber(local_port) -} or nil, -]] + listen = "0.0.0.0:" .. tonumber(local_port) + } or nil, +]]-- tcpRedirect = (proto:find("tcp") and local_port ~= "0") and { listen = "0.0.0.0:" .. tonumber(local_port) } or nil, @@ -359,7 +362,7 @@ local hysteria = { maxConnReceiveWindow = (server.maxconnreceivewindow and server.maxconnreceivewindow or nil), maxIdleTimeout = (tonumber(server.maxidletimeout) and tonumber(server.maxidletimeout) .. "s" or nil), keepAlivePeriod = (tonumber(server.keepaliveperiod) and tonumber(server.keepaliveperiod) .. "s" or nil), - disable_mtu_discovery = (server.disablepathmtudiscovery == "1") and true or false + disablePathMTUDiscovery = (server.disablepathmtudiscovery == "1") and true or false } or nil, auth = server.hy2_auth, tls = (server.tls_host) and { @@ -394,7 +397,7 @@ local chain_sslocal = { mode = (proto:find("tcp,udp") and "tcp_and_udp") or proto .. "_only", protocol = "redir", tcp_redir = "redirect", - --tcp_redir = "tproxy", + --tcp_redir = "tproxy", udp_redir = "tproxy" }, socks_port ~= "0" and { diff --git a/luci-app-transmission/po/tr/transmission.po b/luci-app-transmission/po/tr/transmission.po index 5cfeb93b877..cb1ff7d101a 100644 --- a/luci-app-transmission/po/tr/transmission.po +++ b/luci-app-transmission/po/tr/transmission.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2023-10-29 19:41+0000\n" -"Last-Translator: semih \n" +"PO-Revision-Date: 2024-03-31 19:53+0000\n" +"Last-Translator: Oğuz Han \n" "Language-Team: Turkish \n" "Language: tr\n" @@ -10,7 +10,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.2-dev\n" +"X-Generator: Weblate 5.5-dev\n" #: applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js:65 msgid "Alternative download speed" @@ -106,7 +106,7 @@ msgstr "İzleme dizinini etkinleştir" #: applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js:47 msgid "Enabled" -msgstr "Etkinleştirilmiş" +msgstr "Etkinleştirildi" #: applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js:136 msgid "Encryption" diff --git a/mhz/Makefile b/mhz/Makefile index 4977388adc0..8005ebe4cd9 100644 --- a/mhz/Makefile +++ b/mhz/Makefile @@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/wtarreau/mhz.git PKG_SOURCE_DATE:=2023-06-17 PKG_SOURCE_VERSION:=11aac2399780a1f7ea9f007b14af0464797d5cf1 -PKG_MIRROR_HASH:=b3ea0c9e6f111755c4207addef0ea210ace86bc6910c959c6fc489026897676f +PKG_MIRROR_HASH:=3accbc6ff26b029d257686e1a7c7f9a40ef5d914a031d31f4d46a807edbad7c3 PKG_MAINTAINER:=Robert Marko PKG_LICENSE:=MIT