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

dns_client: retry when upstream result is empty.

Browse Source
This commit is contained in:
Nick Peng
2023-12-19 22:29:44 +08:00
parent a19ac7eb07
commit 1d46fa6208
8 changed files with 209 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
test/cases/test-cache.cc
View File

@@ -455,4 +455,52 @@ cache-persist yes
server.Stop();
usleep(200 * 1000);
}
}
TEST_F(Cache, cname)
{
smartdns::MockServer server_upstream;
smartdns::Server server;
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
std::string domain = request->domain;
std::string cname = "cname." + domain;
if (request->qtype != DNS_T_A) {
return smartdns::SERVER_REQUEST_SOA;
}
unsigned char addr[4] = {1, 2, 3, 4};
dns_add_domain(request->response_packet, domain.c_str(), DNS_T_A, DNS_C_IN);
dns_add_CNAME(request->response_packet, DNS_RRS_AN, domain.c_str(), 300, cname.c_str());
dns_add_A(request->response_packet, DNS_RRS_AN, cname.c_str(), 300, addr);
request->response_packet->head.rcode = DNS_RC_NOERROR;
return smartdns::SERVER_REQUEST_OK;
});
server.Start(R"""(bind [::]:60053
server 127.0.0.1:61053
log-num 0
cache-size 100
log-console yes
log-level debug
cache-persist no)""");
smartdns::Client client;
ASSERT_TRUE(client.Query("a.com A", 60053));
std::cout << client.GetResult() << std::endl;
ASSERT_EQ(client.GetAnswerNum(), 2);
EXPECT_EQ(client.GetStatus(), "NOERROR");
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
EXPECT_GE(client.GetAnswer()[0].GetTTL(), 3);
EXPECT_EQ(client.GetAnswer()[0].GetData(), "cname.a.com.");
EXPECT_EQ(client.GetAnswer()[1].GetName(), "cname.a.com");
EXPECT_GE(client.GetAnswer()[1].GetTTL(), 3);
EXPECT_EQ(client.GetAnswer()[1].GetData(), "1.2.3.4");
ASSERT_TRUE(client.Query("cname.a.com A", 60053));
std::cout << client.GetResult() << std::endl;
ASSERT_EQ(client.GetAnswerNum(), 1);
EXPECT_EQ(client.GetStatus(), "NOERROR");
EXPECT_EQ(client.GetAnswer()[0].GetName(), "cname.a.com");
EXPECT_GE(client.GetAnswer()[0].GetTTL(), 3);
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
}

55
test/cases/test-dualstack.cc
View File

@@ -134,7 +134,7 @@ cache-persist no)""");
EXPECT_EQ(client.GetAnswer()[1].GetData(), "2001:db8::2");
}
TEST_F(DualStack, ipv6_prefer_must_exist_ipv4)
TEST_F(DualStack, ipv6_prefer_without_ipv4)
{
smartdns::MockServer server_upstream;
smartdns::Server server;
@@ -232,4 +232,55 @@ cache-persist no)""");
EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
EXPECT_GT(client.GetAuthority()[0].GetTTL(), 597);
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
}
}
TEST_F(DualStack, ipv4_no_response)
{
smartdns::MockServer server_upstream;
smartdns::Server server;
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
if (request->qtype == DNS_T_A) {
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
return smartdns::SERVER_REQUEST_NO_RESPONSE;
} else if (request->qtype == DNS_T_AAAA) {
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::2");
return smartdns::SERVER_REQUEST_OK;
}
return smartdns::SERVER_REQUEST_SOA;
});
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 10000);
server.MockPing(PING_TYPE_ICMP, "5.6.7.8", 60, 10000);
server.MockPing(PING_TYPE_ICMP, "2001:db8::1", 60, 100);
server.MockPing(PING_TYPE_ICMP, "2001:db8::2", 60, 110);
server.Start(R"""(bind [::]:60053
server 127.0.0.1:61053
log-num 0
log-console yes
dualstack-ip-selection yes
speed-check-mode ping
log-level debug
cache-persist no)""");
smartdns::Client client;
ASSERT_TRUE(client.Query("a.com A", 60053));
std::cout << client.GetResult() << std::endl;
ASSERT_EQ(client.GetAnswerNum(), 0);
EXPECT_EQ(client.GetStatus(), "SERVFAIL");
usleep(220 * 1000);
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
std::cout << client.GetResult() << std::endl;
ASSERT_EQ(client.GetAnswerNum(), 2);
EXPECT_EQ(client.GetStatus(), "NOERROR");
EXPECT_LT(client.GetQueryTime(), 20);
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
EXPECT_GT(client.GetAnswer()[0].GetTTL(), 590);
EXPECT_EQ(client.GetAnswer()[0].GetData(), "2001:db8::1");
EXPECT_EQ(client.GetAnswer()[1].GetName(), "a.com");
EXPECT_GT(client.GetAnswer()[1].GetTTL(), 590);
EXPECT_EQ(client.GetAnswer()[1].GetData(), "2001:db8::2");
}

66
test/cases/test-server.cc
View File

@@ -104,3 +104,69 @@ cache-persist no)""");
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
}
TEST_F(Server, retry_no_result_with_NOERROR)
{
smartdns::MockServer server_upstream;
smartdns::MockServer server_upstream1;
smartdns::Server server;
int count = 0;
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
if (request->qtype != DNS_T_A) {
return smartdns::SERVER_REQUEST_SOA;
}
if (count++ < 2) {
dns_add_domain(request->response_packet, request->domain.c_str(), request->qtype, request->qclass);
return smartdns::SERVER_REQUEST_OK;
}
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
return smartdns::SERVER_REQUEST_OK;
});
server.Start(R"""(bind [::]:60053
bind-tcp [::]:60053
server 127.0.0.1:61053
log-num 0
log-console yes
dualstack-ip-selection no
log-level debug
cache-persist no)""");
smartdns::Client client;
ASSERT_TRUE(client.Query("a.com", 60053));
std::cout << client.GetResult() << std::endl;
ASSERT_EQ(client.GetAnswerNum(), 1);
EXPECT_EQ(client.GetStatus(), "NOERROR");
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
}
TEST_F(Server, retry_no_response)
{
smartdns::MockServer server_upstream;
smartdns::MockServer server_upstream1;
smartdns::Server server;
int count = 0;
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
count++;
return smartdns::SERVER_REQUEST_NO_RESPONSE;
});
server.Start(R"""(bind [::]:60053
bind-tcp [::]:60053
server 127.0.0.1:61053
log-num 0
log-console yes
log-level debug
cache-persist no)""");
smartdns::Client client;
ASSERT_TRUE(client.Query("a.com", 60053));
std::cout << client.GetResult() << std::endl;
ASSERT_EQ(client.GetAnswerNum(), 0);
EXPECT_EQ(client.GetStatus(), "SERVFAIL");
EXPECT_GE(client.GetQueryTime(), 1500);
EXPECT_GE(count, 8);
}