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

dns_server: Optimize the processing of upstream returns to SOA.

Browse Source
This commit is contained in:
Nick Peng
2023-12-15 23:05:17 +08:00
parent 1a17da726d
commit a0f82eabcd
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/dns_server.c
View File

@@ -35,6 +35,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <ifaddrs.h> #include <ifaddrs.h>
#include <math.h>
#include <net/if.h> #include <net/if.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
@@ -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); request->soa.refresh, request->soa.retry, request->soa.expire, request->soa.minimum);
int soa_num = atomic_inc_return(&request->soa_num); 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) { atomic_read(&request->ip_map_num) <= 0) {
request->ip_ttl = ttl; request->ip_ttl = ttl;
_dns_server_request_complete(request); _dns_server_request_complete(request);

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

@@ -66,3 +66,41 @@ cache-persist no)""");
EXPECT_EQ(client.GetStatus(), "SERVFAIL"); EXPECT_EQ(client.GetStatus(), "SERVFAIL");
EXPECT_EQ(client.GetAnswerNum(), 0); 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");
}