Merge Mainline

This commit is contained in:
CN_SZTL 2020-07-22 03:31:43 +08:00
commit 1095ef2dc7
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 3 additions and 2 deletions

View File

@ -23,7 +23,7 @@ define Package/ipv6helper
SECTION:=ipv6
TITLE:=IPv6 Helper and Dynamic Update he.net of ip
PKGARCH:=all
DEPENDS:=+luci-proto-ipv6 +wget ++libip6tc +ip6tables +ip6tables-mod-nat +kmod-ipt-nat6 +kmod-nf-nat6 +odhcpd-ipv6only +odhcp6c +6in4
DEPENDS:=+luci-proto-ipv6 +wget +libip6tc +ip6tables +ip6tables-mod-nat +kmod-ipt-nat6 +kmod-nf-nat6 +odhcpd-ipv6only +odhcp6c +6in4
endef
define Package/ipv6helper/description

View File

@ -214,7 +214,7 @@ start(){
uci set firewall.@defaults[0].fullcone="${fullcone_nat}"
uci commit firewall
[ "${sfe_flow}" -eq "1" ] && {
[ "${sw_flow}" -ne "1" ] && [ "${sfe_flow}" -eq "1" ] && {
lsmod | grep -q fast_classifier || modprobe fast_classifier 2>/dev/null
echo "${sfe_bridge}" > "/sys/fast_classifier/skip_to_bridge_ingress"
if [ "${sfe_ipv6}" -eq "1" ]; then
@ -244,6 +244,7 @@ start(){
start_pdnsd
elif [ "${dns_caching_mode}" = "2" ]; then
start_dnsforwarder
fi
change_dns
nohup "/usr/share/dnscache/dnscache-while.sh" > "/var/log/dnscache.file" 2>&1 &
else