bug fix

Author: pymumu

package/openwrt/files/etc/init.d/smartdns

@@ -54,7 +54,7 @@ set_forward_dnsmasq()
 	uci_batch="$uci_batch set dhcp.@dnsmasq[0].noresolv=1\n"
 	uci_batch="$uci_batch set dhcp.@dnsmasq[0].rebind_protection=0\n"
 	uci_batch="$uci_batch set dhcp.@dnsmasq[0].domainneeded=0\n"
-	echo -e "$uci_batch" | uci batch -
+	echo -e "$uci_batch" | uci batch -q -
 	uci commit dhcp
 	/etc/init.d/dnsmasq reload
 }
@@ -74,7 +74,7 @@ stop_forward_dnsmasq()
 	uci_batch="$uci_batch delete dhcp.@dnsmasq[0].noresolv\n"
 	uci_batch="$uci_batch set dhcp.@dnsmasq[0].rebind_protection=1\n"
 	uci_batch="$uci_batch set dhcp.@dnsmasq[0].domainneeded=1\n"
-	echo -e "$uci_batch" | uci batch -
+	echo -e "$uci_batch" | uci batch -q -
 	uci commit dhcp
 	[ "$norestart" != "1" ] && /etc/init.d/dnsmasq reload
 }
@@ -105,7 +105,7 @@ set_main_dns()
 		return
 	fi
 
-	echo -e "$uci_batch" | uci batch -
+	echo -e "$uci_batch" | uci batch -q -
 	uci commit dhcp
 	/etc/init.d/dnsmasq reload
 }
@@ -125,7 +125,7 @@ stop_main_dns()
 	}
 	uci_batch="$uci_batch delete dhcp.@dnsmasq[0].port\n"
 	uci_batch="$uci_batch del_list dhcp.lan.dhcp_option=\"6,$hostip\"\n"
-	echo -e "$uci_batch" | uci batch -
+	echo -e "$uci_batch" | uci batch -q -
 	uci commit dhcp
 	[ "$norestart" != "1" ] && /etc/init.d/dnsmasq reload
 }
@@ -819,7 +819,7 @@ load_service()
 	uci_batch="$uci_batch set smartdns.@smartdns[0].old_port=\"$port\"\n"
 	uci_batch="$uci_batch set smartdns.@smartdns[0].old_enabled=\"$enabled\"\n"
 	uci_batch="$uci_batch set smartdns.@smartdns[0].old_auto_set_dnsmasq=\"$auto_set_dnsmasq\"\n"
-	echo -e "$uci_batch" | uci batch -
+	echo -e "$uci_batch" | uci batch -q -
 	uci commit smartdns
 
 	# disable service

src/dns_server/cache.c

@@ -42,6 +42,7 @@ static int _dns_cache_is_specify_packet(int qtype)
 	case DNS_T_HTTPS:
 	case DNS_T_TXT:
 	case DNS_T_SRV:
+	case DNS_T_CAA:
 		break;
 	default:
 		return -1;

src/dns_server/request.c

@@ -47,7 +47,7 @@ static int _dns_server_request_complete_with_all_IPs(struct dns_request *request
 	int ttl = 0;
 	struct dns_server_post_context context;
 
-	if (request->rcode == DNS_RC_SERVFAIL || request->rcode == DNS_RC_NXDOMAIN) {
+	if (request->rcode == DNS_RC_SERVFAIL) {
 		ttl = DNS_SERVER_FAIL_TTL;
 	}
 

src/include/smartdns/dns.h

@@ -78,7 +78,8 @@ typedef enum dns_type {
 	DNS_T_HTTPS = 65,
 	DNS_T_SPF = 99,
 	DNS_T_AXFR = 252,
-	DNS_T_ALL = 255
+	DNS_T_CAA = 257,
+	DNS_T_ALL = 65535,
 } dns_type_t;
 
 typedef enum dns_opt_code {

test/cases/test-speed-check.cc

@@ -224,7 +224,7 @@ TEST_F(SpeedCheck, tcp_faster_than_ping)
 		return smartdns::SERVER_REQUEST_SOA;
 	});
 
-	server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 350);
+	server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 500);
 	server.MockPing(PING_TYPE_TCP, "5.6.7.8:80", 60, 10);
 	server.Start(R"""(bind [::]:60053
 server 127.0.0.1:61053