diff --git a/autoinstall/2.x/autoinstall.sh b/autoinstall/2.x/autoinstall.sh index d1f8f70..482d069 100755 --- a/autoinstall/2.x/autoinstall.sh +++ b/autoinstall/2.x/autoinstall.sh @@ -224,7 +224,7 @@ InstallTorConfig() { $UCI_CMD set ruantiblock.config.proxy_mode="1" $UCI_CMD commit ruantiblock # dnsmasq rebind protection - $UCI_CMD set dhcp.@dnsmasq[0].rebind_domain='onion' + $UCI_CMD add_list dhcp.@dnsmasq[0].rebind_domain='onion' $UCI_CMD commit dhcp } diff --git a/autoinstall/current/autoinstall.sh b/autoinstall/current/autoinstall.sh index 7d004bf..6d02f0c 100755 --- a/autoinstall/current/autoinstall.sh +++ b/autoinstall/current/autoinstall.sh @@ -218,7 +218,7 @@ InstallTorConfig() { TorrcSettings $UCI_CMD set ruantiblock.config.proxy_mode="1" $UCI_CMD commit ruantiblock - $UCI_CMD set dhcp.@dnsmasq[0].rebind_domain='onion' + $UCI_CMD add_list dhcp.@dnsmasq[0].rebind_domain='onion' $UCI_CMD commit dhcp } diff --git a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/log-base.js b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/log-base.js index d95fbda..d98e7e6 100644 --- a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/log-base.js +++ b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/log-base.js @@ -206,14 +206,14 @@ return baseclass.extend({ }, logLevels : { - 'emerg' : E('span', { 'class': 'zonebadge log-emerg' }, E('strong', _('Emergency'))), - 'alert' : E('span', { 'class': 'zonebadge log-alert' }, E('strong', _('Alert'))), - 'crit' : E('span', { 'class': 'zonebadge log-crit' }, E('strong', _('Critical'))), - 'err' : E('span', { 'class': 'zonebadge log-err' }, E('strong', _('Error'))), - 'warn' : E('span', { 'class': 'zonebadge log-warn' }, E('strong', _('Warning'))), - 'notice': E('span', { 'class': 'zonebadge log-notice' }, E('strong', _('Notice'))), - 'info' : E('span', { 'class': 'zonebadge log-info' }, E('strong', _('Info'))), - 'debug' : E('span', { 'class': 'zonebadge log-debug' }, E('strong', _('Debug'))), + 'emerg' : E('span', { 'class': 'zonebadge log-emerg' }, E('strong', 'Emergency')), + 'alert' : E('span', { 'class': 'zonebadge log-alert' }, E('strong', 'Alert')), + 'crit' : E('span', { 'class': 'zonebadge log-crit' }, E('strong', 'Critical')), + 'err' : E('span', { 'class': 'zonebadge log-err' }, E('strong', 'Error')), + 'warn' : E('span', { 'class': 'zonebadge log-warn' }, E('strong', 'Warning')), + 'notice': E('span', { 'class': 'zonebadge log-notice' }, E('strong', 'Notice')), + 'info' : E('span', { 'class': 'zonebadge log-info' }, E('strong', 'Info')), + 'debug' : E('span', { 'class': 'zonebadge log-debug' }, E('strong', 'Debug')), }, tailValue : 25, diff --git a/ruantiblock/files/usr/share/ruantiblock/nft_functions b/ruantiblock/files/usr/share/ruantiblock/nft_functions index 7ac7e15..38cd62a 100644 --- a/ruantiblock/files/usr/share/ruantiblock/nft_functions +++ b/ruantiblock/files/usr/share/ruantiblock/nft_functions @@ -182,7 +182,7 @@ NftInstanceAdd() { NftCmdWrapper $NFT_CMD add rule $NFT_TABLE "$NFT_BLLIST_CHAIN" ip daddr "@${NFTSET_ONION}${_name}" counter goto "${NFT_MARK_CHAIN}${_name}" comment \""$_inst"\" fi if [ "$_enable_fproxy" = "1" ]; then - NftCmdWrapper $NFT_CMD add rule $NFT_TABLE "$NFT_FPROXY_CHAIN" ip saddr "@${NFTSET_FPROXY}${_name}" goto "${NFT_MARK_CHAIN}${_name}" comment \""$_inst"\" + NftCmdWrapper $NFT_CMD add rule $NFT_TABLE "$NFT_FPROXY_CHAIN" ip saddr "@${NFTSET_FPROXY}${_name}" counter goto "${NFT_MARK_CHAIN}${_name}" comment \""$_inst"\" fi for _set in "${NFTSET_CIDR}${_name}" "${NFTSET_IP}${_name}"