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

dns_server: make log happy.

Browse Source
This commit is contained in:
Nick Peng
2022-07-21 21:41:55 +08:00
parent 798226ddb3
commit 9390a49a72
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/dns.c
View File

@@ -731,7 +731,8 @@ int dns_get_CNAME(struct dns_rrs *rrs, char *domain, int maxsize, int *ttl, char
return _dns_get_RAW(rrs, domain, maxsize, ttl, cname, &len); return _dns_get_RAW(rrs, domain, maxsize, ttl, cname, &len);
} }
int dns_add_A(struct dns_packet *packet, dns_rr_type type, const char *domain, int ttl, unsigned char addr[DNS_RR_A_LEN]) int dns_add_A(struct dns_packet *packet, dns_rr_type type, const char *domain, int ttl,
unsigned char addr[DNS_RR_A_LEN])
{ {
return _dns_add_RAW(packet, type, DNS_T_A, domain, ttl, addr, DNS_RR_A_LEN); return _dns_add_RAW(packet, type, DNS_T_A, domain, ttl, addr, DNS_RR_A_LEN);
} }
@@ -1693,7 +1694,8 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
unsigned char addr[DNS_RR_A_LEN]; unsigned char addr[DNS_RR_A_LEN];
ret = _dns_decode_raw(context, addr, sizeof(addr)); ret = _dns_decode_raw(context, addr, sizeof(addr));
if (ret < 0) { if (ret < 0) {
tlog(TLOG_ERROR, "decode A failed, %s", domain); tlog(TLOG_DEBUG, "decode A failed, %s, len: %d:%d", domain, (int)(context->ptr - context->data),
_dns_left_len(context));
return -1; return -1;
} }
@@ -1707,7 +1709,8 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
char cname[DNS_MAX_CNAME_LEN]; char cname[DNS_MAX_CNAME_LEN];
ret = _dns_decode_CNAME(context, cname, DNS_MAX_CNAME_LEN); ret = _dns_decode_CNAME(context, cname, DNS_MAX_CNAME_LEN);
if (ret < 0) { if (ret < 0) {
tlog(TLOG_ERROR, "decode CNAME failed, %s", domain); tlog(TLOG_DEBUG, "decode CNAME failed, %s, len: %d:%d", domain, (int)(context->ptr - context->data),
_dns_left_len(context));
return -1; return -1;
} }
@@ -1721,7 +1724,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
struct dns_soa soa; struct dns_soa soa;
ret = _dns_decode_SOA(context, &soa); ret = _dns_decode_SOA(context, &soa);
if (ret < 0) { if (ret < 0) {
tlog(TLOG_ERROR, "decode SOA failed, %s", domain); tlog(TLOG_DEBUG, "decode SOA failed, %s", domain);
return -1; return -1;
} }
@@ -1735,7 +1738,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
char ns[DNS_MAX_CNAME_LEN]; char ns[DNS_MAX_CNAME_LEN];
ret = _dns_decode_CNAME(context, ns, DNS_MAX_CNAME_LEN); ret = _dns_decode_CNAME(context, ns, DNS_MAX_CNAME_LEN);
if (ret < 0) { if (ret < 0) {
tlog(TLOG_ERROR, "decode NS failed, %s", domain); tlog(TLOG_DEBUG, "decode NS failed, %s", domain);
return -1; return -1;
} }
@@ -1749,7 +1752,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
char name[DNS_MAX_CNAME_LEN]; char name[DNS_MAX_CNAME_LEN];
ret = _dns_decode_CNAME(context, name, DNS_MAX_CNAME_LEN); ret = _dns_decode_CNAME(context, name, DNS_MAX_CNAME_LEN);
if (ret < 0) { if (ret < 0) {
tlog(TLOG_ERROR, "decode PTR failed, %s", domain); tlog(TLOG_DEBUG, "decode PTR failed, %s", domain);
return -1; return -1;
} }
@@ -1763,7 +1766,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
unsigned char addr[DNS_RR_AAAA_LEN]; unsigned char addr[DNS_RR_AAAA_LEN];
ret = _dns_decode_raw(context, addr, sizeof(addr)); ret = _dns_decode_raw(context, addr, sizeof(addr));
if (ret < 0) { if (ret < 0) {
tlog(TLOG_ERROR, "decode AAAA failed, %s", domain); tlog(TLOG_DEBUG, "decode AAAA failed, %s", domain);
return -1; return -1;
} }
@@ -1777,7 +1780,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
unsigned char *opt_start = context->ptr; unsigned char *opt_start = context->ptr;
ret = _dns_decode_opt(context, type, ttl, rr_len); ret = _dns_decode_opt(context, type, ttl, rr_len);
if (ret < 0) { if (ret < 0) {
tlog(TLOG_ERROR, "decode opt failed, %s", domain); tlog(TLOG_DEBUG, "decode opt failed, %s", domain);
return -1; return -1;
} }
@@ -1797,7 +1800,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
ret = _dns_decode_raw(context, raw_data, rr_len); ret = _dns_decode_raw(context, raw_data, rr_len);
if (ret < 0) { if (ret < 0) {
tlog(TLOG_ERROR, "decode A failed, %s", domain); tlog(TLOG_DEBUG, "decode A failed, %s", domain);
return -1; return -1;
} }

6
src/dns_server.c
View File

@@ -872,7 +872,7 @@ static int _dns_server_reply_udp(struct dns_request *request, struct dns_server_
unsigned char *inpacket, int inpacket_len) unsigned char *inpacket, int inpacket_len)
{ {
int send_len = 0; int send_len = 0;
if (atomic_read(&server.run) == 0) { if (atomic_read(&server.run) == 0 || inpacket == NULL || inpacket_len <= 0) {
return -1; return -1;
} }
@@ -4089,6 +4089,8 @@ static int _dns_server_recv(struct dns_server_conn_head *conn, unsigned char *in
} }
if (_dns_server_parser_request(request, packet) != 0) { if (_dns_server_parser_request(request, packet) != 0) {
tlog(TLOG_DEBUG, "parser request failed.");
ret = RECV_ERROR_INVALID_PACKET;
goto errout; goto errout;
} }
@@ -4107,7 +4109,7 @@ static int _dns_server_recv(struct dns_server_conn_head *conn, unsigned char *in
return ret; return ret;
errout: errout:
if (request) { if (request) {
ret = _dns_server_forward_request(inpacket, inpacket_len); _dns_server_forward_request(inpacket, inpacket_len);
_dns_server_request_release(request); _dns_server_request_release(request);
} }