daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Nick Peng
2018-12-29 22:20:52 +08:00
parent 9e4ac50ee8
commit 4766cb78b8
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/luci/files/luci/model/cbi/smartdns/smartdns.lua
View File

@@ -155,12 +155,12 @@ addr.template = "cbi/tvalue"
addr.rows = 20 addr.rows = 20
function addr.cfgvalue(self, section) function addr.cfgvalue(self, section)
return nixio.fs.readfile("/var/etc/smartdns/address.conf") return nixio.fs.readfile("/etc/smartdns/address.conf")
end end
function addr.write(self, section, value) function addr.write(self, section, value)
value = value:gsub("\r\n?", "\n") value = value:gsub("\r\n?", "\n")
nixio.fs.writefile("/var/etc/smartdns/address.conf", value) nixio.fs.writefile("/etc/smartdns/address.conf", value)
end end
-- IP Blacklist -- IP Blacklist
@@ -177,12 +177,12 @@ addr.template = "cbi/tvalue"
addr.rows = 20 addr.rows = 20
function addr.cfgvalue(self, section) function addr.cfgvalue(self, section)
return nixio.fs.readfile("/var/etc/smartdns/blacklist-ip.conf") return nixio.fs.readfile("/etc/smartdns/blacklist-ip.conf")
end end
function addr.write(self, section, value) function addr.write(self, section, value)
value = value:gsub("\r\n?", "\n") value = value:gsub("\r\n?", "\n")
nixio.fs.writefile("/var/etc/smartdns/blacklist-ip.conf", value) nixio.fs.writefile("/etc/smartdns/blacklist-ip.conf", value)
end end
-- Doman addresss -- Doman addresss

38
package/openwrt/files/etc/init.d/smartdns
View File

@@ -8,8 +8,8 @@ SERVICE_WRITE_PID=1
SERVICE_DAEMONIZE=1 SERVICE_DAEMONIZE=1
SERVICE_PID_FILE="/var/run/smartdns.pid" SERVICE_PID_FILE="/var/run/smartdns.pid"
BASECONFIGFILE="/etc/smartdns/smartdns.conf" BASECONFIGFILE="/etc/smartdns/smartdns.conf"
SMARTDNS_CONF_DIR="/var/etc/smartdns" SMARTDNS_CONF_DIR="/etc/smartdns"
SMARTDNS_CONF="$SMARTDNS_CONF_DIR/smartdns.conf" SMARTDNS_CONF="/var/$SMARTDNS_CONF_DIR/smartdns.conf"
ADDRESS_CONF="$SMARTDNS_CONF_DIR/address.conf" ADDRESS_CONF="$SMARTDNS_CONF_DIR/address.conf"
BLACKLIST_IP_CONF="$SMARTDNS_CONF_DIR/blacklist-ip.conf" BLACKLIST_IP_CONF="$SMARTDNS_CONF_DIR/blacklist-ip.conf"
CUSTOM_CONF="$SMARTDNS_CONF_DIR/custom.conf" CUSTOM_CONF="$SMARTDNS_CONF_DIR/custom.conf"
@@ -18,12 +18,19 @@ COREDUMP="0"
set_forward_dnsmasq() set_forward_dnsmasq()
{ {
local OLD_PORT="$1" local PORT="$1"
addr="127.0.0.1#$OLD_PORT" addr="127.0.0.1#$PORT"
OLD_SERVER="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`" OLD_SERVER="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
echo $OLD_SERVER | grep "^$addr" >/dev/null 2>&1
if [ $? -eq 0 ]; then
return
fi
uci delete dhcp.@dnsmasq[0].server 2>/dev/null uci delete dhcp.@dnsmasq[0].server 2>/dev/null
uci add_list dhcp.@dnsmasq[0].server=$addr uci add_list dhcp.@dnsmasq[0].server=$addr
for server in $OLD_SERVER; do for server in $OLD_SERVER; do
if [ "$server" = "$addr" ]; then
continue
fi
uci add_list dhcp.@dnsmasq[0].server=$server uci add_list dhcp.@dnsmasq[0].server=$server
done done
uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
@@ -230,26 +237,21 @@ start_service() {
config_get "old_redirect" "$section" "old_redirect" "none" config_get "old_redirect" "$section" "old_redirect" "none"
config_get "old_port" "$section" "old_port" "0" config_get "old_port" "$section" "old_port" "0"
if [ "$old_port" != "$SMARTDNS_PORT" ]; then if [ "$old_redirect" != "$redirect" ] || [ "$old_port" != "$SMARTDNS_PORT" ]; then
clear_iptable "$old_port" "$ipv6_server"
if [ "$redirect" = "redirect" ]; then
set_iptable $ipv6_server $tcp_server
fi
fi
if [ "$old_redirect" != "$redirect" ]; then
if [ "$old_redirect" != "none" ]; then if [ "$old_redirect" != "none" ]; then
if [ "$old_port" != "0" ]; then if [ "$old_port" != "0" ]; then
clear_iptable "$old_port" "$ipv6_server" clear_iptable "$old_port" "$ipv6_server"
fi fi
stop_forward_dnsmasq "$old_port" if [ "$old_redirect" == "dnsmasq-upstream" ]; then
stop_forward_dnsmasq "$old_port"
fi
fi fi
fi
if [ "$redirect" = "redirect" ]; then if [ "$redirect" = "redirect" ]; then
set_iptable $ipv6_server $tcp_server set_iptable $ipv6_server $tcp_server
elif [ "$redirect" = "dnsmasq-upstream" ]; then elif [ "$redirect" = "dnsmasq-upstream" ]; then
set_forward_dnsmasq "$SMARTDNS_PORT" set_forward_dnsmasq "$SMARTDNS_PORT"
fi
fi fi
uci delete smartdns.@smartdns[0].old_redirect 2>/dev/null uci delete smartdns.@smartdns[0].old_redirect 2>/dev/null