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

Fix openwrt configuration issue

Browse Source
This commit is contained in:
Nick Peng
2018-12-02 13:56:38 +08:00
parent ad6741e4da
commit 3ce9a7acb8
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
etc/smartdns/smartdns.conf
View File

@@ -5,13 +5,18 @@
# #
# dns server bind ip and port, default dns server port is 53. # dns server bind ip and port, default dns server port is 53.
# bind [IP]:port, # bind [IP]:port, udp server
# bind-tcp [IP]:port, tcp server
# example: # example:
# IPV4: :53 # IPV4: :53
# IPV6 [::]:53 # IPV6 [::]:53
# bind-tcp [::]53
bind [::]:53 bind [::]:53
# tcp connection idle timeout
# tcp-idle-time [second]
# dns cache size # dns cache size
# cache-size [number] # cache-size [number]
# 0: for no cache # 0: for no cache

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

@@ -15,10 +15,15 @@ SMARTDNS_CONF_TMP="${SMARTDNS_CONF}.tmp"
set_forward_dnsmasq() set_forward_dnsmasq()
{ {
SMARTDNS_PORT="$1" local OLD_PORT="$1"
addr="127.0.0.1#$SMARTDNS_PORT" addr="127.0.0.1#$OLD_PORT"
OLD_SERVER="`uci get 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
uci delete dhcp.@dnsmasq[0].resolvfile for server in $OLD_SERVER; do
uci add_list dhcp.@dnsmasq[0].server=$server
done
uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
uci set dhcp.@dnsmasq[0].noresolv=1 uci set dhcp.@dnsmasq[0].noresolv=1
uci commit dhcp uci commit dhcp
/etc/init.d/dnsmasq restart /etc/init.d/dnsmasq restart
@@ -26,11 +31,14 @@ set_forward_dnsmasq()
stop_forward_dnsmasq() stop_forward_dnsmasq()
{ {
SMARTDNS_PORT="$1" local OLD_PORT="$1"
addr="127.0.0.1#$SMARTDNS_PORT" addr="127.0.0.1#$OLD_PORT"
uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto 2>/dev/null addrlist="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null if [ -z "$addrlist" ] ; then
uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto 2>/dev/null
uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
fi
uci commit dhcp uci commit dhcp
/etc/init.d/dnsmasq restart /etc/init.d/dnsmasq restart
} }
@@ -58,11 +66,12 @@ set_iptable()
clear_iptable() clear_iptable()
{ {
local ipv6_server=$1 local OLD_PORT="$1"
local ipv6_server=$2
IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}'`" IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}'`"
for IP in $IPS for IP in $IPS
do do
iptables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $SMARTDNS_PORT >/dev/null 2>&1 iptables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
done done
if [ "$ipv6_server" == 0 ]; then if [ "$ipv6_server" == 0 ]; then
@@ -72,7 +81,7 @@ clear_iptable()
IPS="`ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}'`" IPS="`ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}'`"
for IP in $IPS for IP in $IPS
do do
ip6tables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $SMARTDNS_PORT >/dev/null 2>&1 ip6tables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
done done
} }
@@ -185,15 +194,25 @@ start_service() {
fi fi
config_get "redirect" "$section" "redirect" "none" config_get "redirect" "$section" "redirect" "none"
config_get "old_redirect" "$section" "old_redirect" "none"
config_get "old_port" "$section" "old_port" "0"
if [ "$old_redirect" != "none" ] && [ "$old_port" != "0" ]; then
clear_iptable "$old_port" "$ipv6_server"
stop_forward_dnsmasq "$old_port"
fi
clear_iptable
stop_forward_dnsmasq "$SMARTDNS_PORT"
if [ "$redirect" = "redirect" ]; then if [ "$redirect" = "redirect" ]; then
set_iptable $ipv6_server set_iptable $ipv6_server
elif [ "$redirect" = "dnsmasq-upstream" ]; then elif [ "$redirect" = "dnsmasq-upstream" ]; then
set_forward_dnsmasq "$SMARTDNS_PORT" set_forward_dnsmasq "$SMARTDNS_PORT"
fi fi
uci delete smartdns.@smartdns[0].old_redirect 2>/dev/null
uci delete smartdns.@smartdns[0].old_port 2>/dev/null
uci add_list smartdns.@smartdns[0].old_redirect="$redirect" 2>/dev/null
uci add_list smartdns.@smartdns[0].old_port="$SMARTDNS_PORT" 2>/dev/null
config_foreach load_server "server" config_foreach load_server "server"
echo "conf-file $ADDRESS_CONF" >> $SMARTDNS_CONF_TMP echo "conf-file $ADDRESS_CONF" >> $SMARTDNS_CONF_TMP