From a0f82eabcd469f35e14aa4ece43ac10ddb135cc5 Mon Sep 17 00:00:00 2001 From: Nick Peng Date: Fri, 15 Dec 2023 23:05:17 +0800 Subject: [PATCH] dns_server: Optimize the processing of upstream returns to SOA. --- src/dns_server.c | 3 ++- test/cases/test-server.cc | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/dns_server.c b/src/dns_server.c index c8ba3bb..2a0b920 100644 --- a/src/dns_server.c +++ b/src/dns_server.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -3339,7 +3340,7 @@ static int _dns_server_process_answer(struct dns_request *request, const char *d request->soa.refresh, request->soa.retry, request->soa.expire, request->soa.minimum); int soa_num = atomic_inc_return(&request->soa_num); - if ((soa_num >= (dns_server_alive_num() / 3) + 1 || soa_num > 4) && + if ((soa_num >= ((int)ceil((float)dns_server_alive_num() / 3) + 1) || soa_num > 4) && atomic_read(&request->ip_map_num) <= 0) { request->ip_ttl = ttl; _dns_server_request_complete(request); diff --git a/test/cases/test-server.cc b/test/cases/test-server.cc index c261440..744e81e 100644 --- a/test/cases/test-server.cc +++ b/test/cases/test-server.cc @@ -66,3 +66,41 @@ cache-persist no)"""); EXPECT_EQ(client.GetStatus(), "SERVFAIL"); EXPECT_EQ(client.GetAnswerNum(), 0); } + +TEST_F(Server, one_nxdomain) +{ + smartdns::MockServer server_upstream; + smartdns::MockServer server_upstream1; + smartdns::Server server; + + server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) { + if (request->qtype != DNS_T_A) { + return smartdns::SERVER_REQUEST_SOA; + } + + usleep(50000); + + smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611); + return smartdns::SERVER_REQUEST_OK; + }); + + server_upstream1.Start("udp://0.0.0.0:62053", + [](struct smartdns::ServerRequestContext *request) { return smartdns::SERVER_REQUEST_SOA; }); + + server.MockPing(PING_TYPE_ICMP, "2001::", 128, 10000); + server.Start(R"""(bind [::]:60053 +bind-tcp [::]:60053 +server 127.0.0.1:61053 +server 127.0.0.1:62053 +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(), 1); + EXPECT_EQ(client.GetStatus(), "NOERROR"); + EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com"); + EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4"); +}