dns_conf: server name support i18n

Author: pymumu

src/dns_conf/dns_conf.c

@@ -17,6 +17,7 @@
  */
 
 #include "smartdns/dns_conf.h"
+#include "smartdns/lib/idna.h"
 #include "smartdns/tlog.h"
 #include "smartdns/util.h"
 
@@ -121,8 +122,20 @@ static int _dns_conf_setup_mdns(void)
 	return _conf_domain_rule_nameserver(DNS_SERVER_GROUP_LOCAL, DNS_SERVER_GROUP_MDNS);
 }
 
+static int _config_server_name(void *data, int argc, char *argv[])
+{
+	if (argc <= 1) {
+		tlog(TLOG_ERROR, "invalid parameter.");
+		return -1;
+	}
+
+	utf8_to_punycode(argv[1], strlen(argv[1]), dns_conf.server_name, DNS_MAX_SERVER_NAME_LEN);
+
+	return 0;
+}
+
 static struct config_item _config_item[] = {
-	CONF_STRING("server-name", (char *)dns_conf.server_name, DNS_MAX_SERVER_NAME_LEN),
+	CONF_CUSTOM("server-name", _config_server_name, NULL),
 	CONF_YESNO("resolv-hostname", &dns_conf.resolv_hostname),
 	CONF_CUSTOM("bind", _config_bind_ip_udp, NULL),
 	CONF_CUSTOM("bind-tcp", _config_bind_ip_tcp, NULL),

src/dns_server/context.c

@@ -995,6 +995,10 @@ int _dns_cache_reply_packet(struct dns_server_post_context *context)
 			return 0;
 		}
 
+		if (context->packet->head.rcode == DNS_RC_NXDOMAIN) {
+			context->reply_ttl = 0;
+		}
+
 		return _dns_cache_packet(context);
 	}
 

src/dns_server/rules.c

@@ -427,7 +427,7 @@ int _dns_server_get_reply_ttl(struct dns_request *request, int ttl)
 	int reply_ttl = ttl;
 
 	if ((request->passthrough == 0 || request->passthrough == 2) && dns_conf.cachesize > 0 &&
-		request->check_order_list->orders[0].type != DOMAIN_CHECK_NONE) {
+		request->check_order_list->orders[0].type != DOMAIN_CHECK_NONE && request->no_serve_expired == 0 && request->has_soa == 0) {
 		reply_ttl = request->conf->dns_serve_expired_reply_ttl;
 		if (reply_ttl < 2) {
 			reply_ttl = 2;

test/cases/test-group.cc

@@ -615,7 +615,7 @@ server 127.0.0.1:62053
 	ASSERT_EQ(client.GetAuthorityNum(), 1);
 	EXPECT_EQ(client.GetStatus(), "NXDOMAIN");
 	EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
-	EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 3);
+	EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 600);
 	EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
 }
 

test/cases/test-hosts.cc

@@ -148,7 +148,7 @@ hosts-file /tmp/*.hosts
 	ASSERT_EQ(client.GetAnswerNum(), 0);
 	EXPECT_EQ(client.GetStatus(), "NXDOMAIN");
 	EXPECT_EQ(client.GetAuthority()[0].GetName(), "c.com");
-	EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 3);
+	EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 600);
 	EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
 
 	ASSERT_TRUE(client.Query("d.com A", 60053));

test/cases/test-https.cc

@@ -260,7 +260,7 @@ cache-persist no)""");
 	ASSERT_EQ(client.GetAuthorityNum(), 1);
 	EXPECT_EQ(client.GetStatus(), "NXDOMAIN");
 	EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
-	EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 3);
+	EXPECT_GT(client.GetAuthority()[0].GetTTL(), 595);
 	EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
 }