OpenWrt/small-package
1
0
Fork 0
mirror of https://github.com/kenzok8/small-package synced 2025-09-20 19:11:30 +08:00
Code Issues Projects Releases Wiki Activity

update-02.24

Browse Source
This commit is contained in:
github-actions[bot]
2022-02-24 18:39:00 +08:00
parent 5eb861e67e
commit 559e1f6ffc
10 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
luci-app-nft-qos/po/de/nft-qos.po
View File

@ -1,14 +1,14 @@
msgid ""
msgstr ""
"PO-Revision-Date: 2021-02-08 04:46+0000\n"
"Last-Translator: Zocker1012 <julian.schoemer.1997@gmail.com>\n"
"PO-Revision-Date: 2022-02-24 06:56+0000\n"
"Last-Translator: ssantos <ssantos@web.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsnft-qos/de/>\n"
"Language: de\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.5-dev\n"
"X-Generator: Weblate 4.11-dev\n"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155
@ -122,7 +122,7 @@ msgstr "Limit aktivieren"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:239
msgid "Limit Traffic Rate By Mac Address"
msgstr ""
msgstr "Verkehrsrate per Mac-Adresse begrenzen"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:44
msgid "Limit Type"
@ -134,7 +134,7 @@ msgstr "MAC (optional)"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:248
msgid "MAC Address"
msgstr ""
msgstr "MAC-Adresse"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:48
msgid "MB"

2
luci-app-passwall/Makefile
View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=4.50
PKG_RELEASE:=1
PKG_RELEASE:=2
#20220219
PKG_CONFIG_DEPENDS:= \

3
luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
View File

@ -187,6 +187,9 @@ if api.is_finded("smartdns") then
group_domestic.description = translate("You only need to configure domestic DNS packets in SmartDNS and set it redirect or as Dnsmasq upstream, and fill in the domestic DNS group name here.")
end
o = s:taboption("DNS", Flag, "filter_proxy_ipv6", translate("Filter Proxy Host IPv6"), translate("Experimental feature."))
o.default = "0"
---- DNS Forward Mode
dns_mode = s:taboption("DNS", ListValue, "dns_mode", translate("Filter Mode"))
dns_mode.rmempty = false

2
luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
View File

@ -130,7 +130,7 @@ o.default = 1
o.rmempty = false
o = s:option(Flag, "route_only", translate("Sniffing Route Only (Xray)"), translate("When enabled, the server not will resolve the domain name again."))
o.default = "1"
o.default = 0
o:depends("sniffing", true)
--[[

2
luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm
View File

@ -50,7 +50,7 @@ local api = require "luci.model.cbi.passwall.api.api"
if (nodes_link.trim() != "") {
var supports = "ss ssr vmess vless trojan trojan-go hysteria";
var itype = nodes_link.split('://')[0];
if (itype.trim() != "" && supports.indexOf(itype) > 0) {
if (itype.trim() != "" && supports.indexOf(itype) >= 0) {
ajax_add_node(nodes_link);
}
else {

6
luci-app-passwall/po/zh-cn/passwall.po
View File

@ -211,6 +211,12 @@ msgstr "当访问的域名不存在规则列表中，使用的默认DNS。"
msgid "The effect is better, but will increase the memory."
msgstr "效果更好，但会增加内存使用。"
msgid "Filter Proxy Host IPv6"
msgstr "过滤代理域名 IPv6"
msgid "Experimental feature."
msgstr "实验性功能。"
msgid "Clear IPSET"
msgstr "清空 IPSET"

3
luci-app-passwall/root/usr/share/passwall/0_default_config
View File

@ -6,6 +6,7 @@ config global
option udp_node 'nil'
option dns_mode 'pdnsd'
option dns_forward '1.1.1.1'
option filter_proxy_ipv6 '0'
option tcp_proxy_mode 'chnroute'
option udp_proxy_mode 'chnroute'
option localhost_tcp_proxy_mode 'default'
@ -35,7 +36,7 @@ config global_forwarding
option tcp_proxy_way 'redirect'
option ipv6_tproxy '0'
option sniffing '1'
option route_only '1'
option route_only '0'
config global_other
option status 'big_icon show_check_port show_ip111'

19
luci-app-passwall/root/usr/share/passwall/app.sh
View File

@ -650,7 +650,7 @@ run_redir() {
local sniffing=$(config_t_get global_forwarding sniffing 1)
[ "${sniffing}" = "1" ] && {
_extra_param="${_extra_param} -sniffing 1"
local route_only=$(config_t_get global_forwarding route_only 1)
local route_only=$(config_t_get global_forwarding route_only 0)
[ "${route_only}" = "1" ] && _extra_param="${_extra_param} -route_only 1"
}
[ "${DNS_MODE}" = "v2ray" -o "${DNS_MODE}" = "xray" ] && {
@ -658,7 +658,8 @@ run_redir() {
[ "$(config_t_get global dns_by)" = "tcp" -o "${v2ray_dns_mode}" = "fakedns" ] && {
config_file=$(echo $config_file | sed "s/.json/_DNS.json/g")
resolve_dns=1
_extra_param="${_extra_param} -dns_query_strategy ${DNS_QUERY_STRATEGY}"
local dns_query_strategy=$(config_t_get global dns_query_strategy UseIPv4)
_extra_param="${_extra_param} -dns_query_strategy ${dns_query_strategy}"
local _dns_client_ip=$(config_t_get global dns_client_ip)
[ -n "${_dns_client_ip}" ] && _extra_param="${_extra_param} -dns_client_ip ${_dns_client_ip}"
[ "${DNS_CACHE}" == "0" ] && _extra_param="${_extra_param} -dns_cache 0"
@ -1063,7 +1064,8 @@ start_dns() {
xray)
[ "${resolve_dns}" == "0" ] && {
[ "${DNS_CACHE}" == "0" ] && local _extra_param="-dns_cache 0"
_extra_param="${_extra_param} -dns_query_strategy ${DNS_QUERY_STRATEGY}"
local dns_query_strategy=$(config_t_get global dns_query_strategy UseIPv4)
_extra_param="${_extra_param} -dns_query_strategy ${dns_query_strategy}"
local _dns_client_ip=$(config_t_get global dns_client_ip)
[ -n "${_dns_client_ip}" ] && _extra_param="${_extra_param} -dns_client_ip ${_dns_client_ip}"
local dns_by=$(config_t_get global dns_by "tcp")
@ -1129,7 +1131,7 @@ start_dns() {
smartdns)
local group_domestic=$(config_t_get global group_domestic)
CHINADNS_NG=0
source $APP_PATH/helper_smartdns.sh add DNS_MODE=$DNS_MODE SMARTDNS_CONF=/tmp/etc/smartdns/$CONFIG.conf REMOTE_FAKEDNS=$fakedns DEFAULT_DNS=$DEFAULT_DNS LOCAL_GROUP=$group_domestic TUN_DNS=$TUN_DNS TCP_NODE=$TCP_NODE PROXY_MODE=${TCP_PROXY_MODE}${LOCALHOST_TCP_PROXY_MODE} NO_PROXY_IPV6=${NO_PROXY_IPV6}
source $APP_PATH/helper_smartdns.sh add DNS_MODE=$DNS_MODE SMARTDNS_CONF=/tmp/etc/smartdns/$CONFIG.conf REMOTE_FAKEDNS=$fakedns DEFAULT_DNS=$DEFAULT_DNS LOCAL_GROUP=$group_domestic TUN_DNS=$TUN_DNS TCP_NODE=$TCP_NODE PROXY_MODE=${TCP_PROXY_MODE}${LOCALHOST_TCP_PROXY_MODE} NO_PROXY_IPV6=${filter_proxy_ipv6}
source $APP_PATH/helper_smartdns.sh restart
echolog " - 域名解析：使用SmartDNS，请确保配置正常。"
;;
@ -1164,7 +1166,7 @@ start_dns() {
[ "$DNS_SHUNT" = "dnsmasq" ] && {
source $APP_PATH/helper_dnsmasq.sh stretch
source $APP_PATH/helper_dnsmasq.sh add DNS_MODE=$DNS_MODE TMP_DNSMASQ_PATH=$TMP_DNSMASQ_PATH DNSMASQ_CONF_FILE=/tmp/dnsmasq.d/dnsmasq-passwall.conf REMOTE_FAKEDNS=$fakedns DEFAULT_DNS=$DEFAULT_DNS LOCAL_DNS=$LOCAL_DNS TUN_DNS=$TUN_DNS CHINADNS_DNS=$china_ng_listen TCP_NODE=$TCP_NODE PROXY_MODE=${TCP_PROXY_MODE}${LOCALHOST_TCP_PROXY_MODE} NO_PROXY_IPV6=${NO_PROXY_IPV6}
source $APP_PATH/helper_dnsmasq.sh add DNS_MODE=$DNS_MODE TMP_DNSMASQ_PATH=$TMP_DNSMASQ_PATH DNSMASQ_CONF_FILE=/tmp/dnsmasq.d/dnsmasq-passwall.conf REMOTE_FAKEDNS=$fakedns DEFAULT_DNS=$DEFAULT_DNS LOCAL_DNS=$LOCAL_DNS TUN_DNS=$TUN_DNS CHINADNS_DNS=$china_ng_listen TCP_NODE=$TCP_NODE PROXY_MODE=${TCP_PROXY_MODE}${LOCALHOST_TCP_PROXY_MODE} NO_PROXY_IPV6=${filter_proxy_ipv6}
}
}
@ -1471,6 +1473,7 @@ DNS_MODE=$(config_t_get global dns_mode pdnsd)
DNS_FORWARD=$(config_t_get global dns_forward 1.1.1.1:53 | sed 's/#/:/g' | sed -E 's/\:([^:]+)$/#\1/g')
DNS_CACHE=$(config_t_get global dns_cache 0)
CHINADNS_NG=$(config_t_get global chinadns_ng 0)
filter_proxy_ipv6=$(config_t_get global filter_proxy_ipv6 0)
dns_listen_port=${DNS_PORT}
DEFAULT_DNS=$(uci show dhcp | grep "@dnsmasq" | grep "\.server=" | awk -F '=' '{print $2}' | sed "s/'//g" | tr ' ' '\n' | grep -v "\/" | head -2 | sed ':label;N;s/\n/,/;b label')
@ -1478,12 +1481,8 @@ DEFAULT_DNS=$(uci show dhcp | grep "@dnsmasq" | grep "\.server=" | awk -F '=' '{
LOCAL_DNS="${DEFAULT_DNS:-119.29.29.29}"
PROXY_IPV6=$(config_t_get global_forwarding ipv6_tproxy 0)
NO_PROXY_IPV6=1
DNS_QUERY_STRATEGY="UseIPv4"
[ "$PROXY_IPV6" = "1" ] && {
NO_PROXY_IPV6=0
DNS_QUERY_STRATEGY="UseIP"
}
[ "$PROXY_IPV6" = "1" ] && DNS_QUERY_STRATEGY="UseIP"
export V2RAY_LOCATION_ASSET=$(config_t_get global_rules v2ray_location_asset "/usr/share/v2ray/")
export XRAY_LOCATION_ASSET=$V2RAY_LOCATION_ASSET

2
luci-app-passwall/root/usr/share/passwall/iptables.sh
View File

@ -286,7 +286,7 @@ load_acl() {
d_server=127.0.0.1
[ "$tcp_proxy_mode" = "global" ] && d_server=${d_server}#${_dns_port}
echo "server=${d_server}" >> $TMP_ACL_PATH/$sid/dnsmasq.conf
source $APP_PATH/helper_${DNS_N}.sh add DNS_MODE=$dns_mode TMP_DNSMASQ_PATH=$TMP_ACL_PATH/$sid/dnsmasq.d DNSMASQ_CONF_FILE=/dev/null LOCAL_DNS=$LOCAL_DNS TUN_DNS=127.0.0.1#${_dns_port} TCP_NODE=$tcp_node PROXY_MODE=${tcp_proxy_mode} NO_LOGIC_LOG=1 NO_PROXY_IPV6=${NO_PROXY_IPV6}
source $APP_PATH/helper_${DNS_N}.sh add DNS_MODE=$dns_mode TMP_DNSMASQ_PATH=$TMP_ACL_PATH/$sid/dnsmasq.d DNSMASQ_CONF_FILE=/dev/null LOCAL_DNS=$LOCAL_DNS TUN_DNS=127.0.0.1#${_dns_port} TCP_NODE=$tcp_node PROXY_MODE=${tcp_proxy_mode} NO_LOGIC_LOG=1 NO_PROXY_IPV6=${filter_proxy_ipv6}
ln_run "$(first_type dnsmasq)" "dnsmasq_${sid}" "/dev/null" -C $TMP_ACL_PATH/$sid/dnsmasq.conf -x $TMP_ACL_PATH/$sid/dnsmasq.pid
eval node_${tcp_node}_$(echo -n "${tcp_proxy_mode}${dns_forward}" | md5sum | cut -d " " -f1)=${dnsmasq_port}
}

2
my-default-settings/files/etc/hotplug.d/iface/95-network
View File

@ -1,7 +1,7 @@
#!/bin/sh
#
for eth in $(ip address | grep ^[0-9] | awk -F: '{print $2}' | sed "s/ //g" | grep '^[e]' | grep -vE "(@|\.)"); do
ethtool -s $eth autoneg on
[ "$(ethtool -i $eth | grep 'r8125')" ] && ethtool -s $eth autoneg on
done
[ "$(uci -q get network.lan.ifname)" ] || (uci -q set network.lan.ifname="`uci -q get network.lan.device`";uci commit network)