From 1da0b172d307441fa4320cec248bcf2ee03a1156 Mon Sep 17 00:00:00 2001 From: Nick Peng Date: Wed, 30 May 2018 21:21:45 +0800 Subject: [PATCH] update code, tested --- dns.c | 2 +- dns_client.c | 28 ++++++++++++-------- dns_client.h | 4 +-- dns_server.c | 73 ++++++++++++++++++++++++++++------------------------ smartdns.c | 2 -- 5 files changed, 59 insertions(+), 50 deletions(-) diff --git a/dns.c b/dns.c index 95abf81..ef6d33d 100644 --- a/dns.c +++ b/dns.c @@ -26,7 +26,7 @@ #define AA_MASK 0x0400 #define TC_MASK 0x0200 #define RD_MASK 0x0100 -#define RA_MASK 0x8000 +#define RA_MASK 0x0080 #define RCODE_MASK 0x000F #define DNS_RR_END (0XFFFF) diff --git a/dns_client.c b/dns_client.c index 55e6443..771c1aa 100644 --- a/dns_client.c +++ b/dns_client.c @@ -93,6 +93,7 @@ struct dns_query_struct { struct list_head dns_request_list; struct hlist_node domain_node; char domain[DNS_MAX_CNAME_LEN]; + int qtype; atomic_t dns_request_sent; void *user_ptr; unsigned long send_tick; @@ -276,7 +277,7 @@ int _dns_client_query_complete(struct dns_query_struct *query) return 0; } - tlog(TLOG_INFO, "call back result : %s", query->domain); + tlog(TLOG_DEBUG, "call back result : %s", query->domain); if (query->callback) { ret = query->callback(query->domain, &query->result, query->user_ptr); } @@ -364,9 +365,9 @@ void dns_client_ping_result(struct ping_host_struct *ping_host, const char *host break; } if (result == PING_RESULT_RESPONSE) { - tlog(TLOG_INFO, "from %15s: seq=%d time=%d\n", host, seqno, rtt); + tlog(TLOG_DEBUG, "from %15s: seq=%d time=%d\n", host, seqno, rtt); } else { - tlog(TLOG_INFO, "from %15s: seq=%d timeout\n", host, seqno); + tlog(TLOG_DEBUG, "from %15s: seq=%d timeout\n", host, seqno); } if (rtt < 100) { @@ -517,9 +518,6 @@ static int _dns_client_recv(unsigned char *inpacket, int inpacket_len, struct so len = dns_decode(packet, DNS_PACKSIZE, inpacket, inpacket_len); if (len != 0) { tlog(TLOG_ERROR, "decode failed, packet len = %d, tc=%d, %d\n", inpacket_len, packet->head.tc, packet->head.id); - int fd = open("dns.bin", O_CREAT | O_TRUNC | O_RDWR); - write(fd, inpacket, inpacket_len); - close(fd); return -1; } @@ -560,9 +558,16 @@ static int _dns_client_process(struct dns_query_struct *dns_query, unsigned long return -1; } - tlog(TLOG_INFO, "recv from %s", gethost_by_addr(from_host, (struct sockaddr *)&from, from_len)); + tlog(TLOG_DEBUG, "recv from %s", gethost_by_addr(from_host, (struct sockaddr *)&from, from_len)); - return _dns_client_recv(inpacket, len, &from, from_len); + if (_dns_client_recv(inpacket, len, &from, from_len) != 0) { + int fd = open("dns.bin", O_CREAT | O_TRUNC | O_RDWR); + write(fd, inpacket, len); + close(fd); + return -1; + } + + return 0; } static void *_dns_client_work(void *arg) @@ -667,7 +672,7 @@ static int _dns_client_send_query(struct dns_query_struct *query, char *doamin) head.rcode = 0; dns_packet_init(packet, DNS_PACKSIZE, &head); - dns_add_domain(packet, doamin, DNS_T_A, DNS_C_IN); + dns_add_domain(packet, doamin, query->qtype, DNS_C_IN); encode_len = dns_encode(inpacket, DNS_IN_PACKSIZE, packet); if (encode_len <= 0) { tlog(TLOG_ERROR, "encode query failed."); @@ -677,7 +682,7 @@ static int _dns_client_send_query(struct dns_query_struct *query, char *doamin) return _dns_client_send_packet(query, inpacket, encode_len); } -int dns_client_query(char *domain, dns_client_callback callback, void *user_ptr) +int dns_client_query(char *domain, int qtype, dns_client_callback callback, void *user_ptr) { struct dns_query_struct *query = NULL; int ret = 0; @@ -698,6 +703,7 @@ int dns_client_query(char *domain, dns_client_callback callback, void *user_ptr) query->callback = callback; query->result.ttl_v4 = -1; query->result.ttl_v6 = -1; + query->qtype = qtype; query->sid = atomic_inc_return(&dns_client_sid); _dns_client_query_get(query); @@ -729,7 +735,7 @@ errout: return -1; } -int dns_client_query_raw(char *domain, unsigned char *raw, int raw_len, void *user_ptr) +int dns_client_query_raw(char *domain, int qtype, unsigned char *raw, int raw_len, void *user_ptr) { return -1; } diff --git a/dns_client.h b/dns_client.h index c40bf51..efa4223 100644 --- a/dns_client.h +++ b/dns_client.h @@ -22,9 +22,9 @@ int dns_client_init(void); typedef int (*dns_client_callback)(char *domain, struct dns_result *result, void *user_ptr); -int dns_client_query(char *domain, dns_client_callback callback, void *user_ptr); +int dns_client_query(char *domain, int qtype, dns_client_callback callback, void *user_ptr); -int dns_client_query_raw(char *domain, unsigned char *raw, int raw_len, void *user_ptr); +int dns_client_query_raw(char *domain, int qtype, unsigned char *raw, int raw_len, void *user_ptr); void dns_client_exit(void); diff --git a/dns_server.c b/dns_server.c index 296af83..5d721f8 100644 --- a/dns_server.c +++ b/dns_server.c @@ -17,13 +17,13 @@ */ #include "dns_server.h" -#include "dns.h" -#include "util.h" #include "atomic.h" -#include "tlog.h" +#include "dns.h" +#include "dns_client.h" #include "hashtable.h" #include "list.h" -#include "dns_client.h" +#include "tlog.h" +#include "util.h" #include #include #include @@ -59,6 +59,7 @@ struct dns_request { struct hlist_node map; char domain[DNS_MAX_CNAME_LEN]; char alias[DNS_MAX_CNAME_LEN]; + struct dns_head head; unsigned short qtype; unsigned short id; unsigned short ss_family; @@ -69,10 +70,8 @@ struct dns_request { struct sockaddr addr; }; - union { - unsigned char ipv4_addr[DNS_RR_A_LEN]; - unsigned char ipv6_addr[DNS_RR_AAAA_LEN]; - }; + unsigned char ipv4_addr[DNS_RR_A_LEN]; + unsigned char ipv6_addr[DNS_RR_AAAA_LEN]; }; static struct dns_server server; @@ -174,7 +173,6 @@ static int _dns_add_rrs(struct dns_packet *packet, struct dns_request *request) return ret; } - static int _dns_reply(struct dns_request *request) { unsigned char inpacket[DNS_IN_PACKSIZE]; @@ -189,8 +187,10 @@ static int _dns_reply(struct dns_request *request) head.id = request->id; head.qr = DNS_QR_ANSWER; head.opcode = DNS_OP_QUERY; - head.rd = 1; + head.rd = 0; head.ra = 0; + head.aa = 0; + head.tc = 0; head.rcode = DNS_RC_NOERROR; ret = dns_packet_init(packet, DNS_PACKSIZE, &head); if (ret != 0) { @@ -214,13 +214,12 @@ static int _dns_reply(struct dns_request *request) send_len = sendto(server.fd, inpacket, encode_len, 0, &request->addr, request->addr_len); if (send_len != encode_len) { - printf("send failed."); + tlog(TLOG_ERROR, "send failed."); } return 0; } - static int dns_server_resolve_callback(char *domain, struct dns_result *result, void *user_ptr) { struct dns_request *request = user_ptr; @@ -241,24 +240,24 @@ static int dns_server_resolve_callback(char *domain, struct dns_result *result, memcpy(request->ipv4_addr, result->addr_ipv4, 4); strncpy(request->alias, result->alias, DNS_MAX_CNAME_LEN); - // memcpy(request->ipv6_addr, result->addr_ipv6, 16); - request->qtype = DNS_T_A; + memcpy(request->ipv6_addr, result->addr_ipv6, 16); - tlog(TLOG_INFO, "result: %s, %d.%d.%d.%d\n", domain, - request->ipv4_addr[0], - request->ipv4_addr[1], - request->ipv4_addr[2], - request->ipv4_addr[3]); + if (request->qtype == DNS_T_A) { + tlog(TLOG_INFO, "result: %s, %d.%d.%d.%d\n", domain, request->ipv4_addr[0], request->ipv4_addr[1], request->ipv4_addr[2], request->ipv4_addr[3]); + } else if (request->qtype == DNS_T_AAAA) { + tlog(TLOG_INFO, "result :%s, %x%x:%x%x:%x%x:%x%x:%x%x:%x%x:%x%x:%x%x", domain, request->ipv6_addr[0], request->ipv6_addr[1], request->ipv6_addr[2], + request->ipv6_addr[3], request->ipv6_addr[4], request->ipv6_addr[5], request->ipv6_addr[6], request->ipv6_addr[7], request->ipv6_addr[8], + request->ipv6_addr[9], request->ipv6_addr[10], request->ipv6_addr[11], request->ipv6_addr[12], request->ipv6_addr[13], request->ipv6_addr[14], + request->ipv6_addr[15]); + } _dns_reply(request); - memset(request, 0, sizeof(*request)); free(request); return 0; } - static int _dns_server_recv(unsigned char *inpacket, int inpacket_len, struct sockaddr_storage *from, socklen_t from_len) { int decode_len; @@ -294,6 +293,7 @@ static int _dns_server_recv(unsigned char *inpacket, int inpacket_len, struct so } request->id = packet->head.id; + memcpy(&request->head, &packet->head, sizeof(struct dns_head)); rrs = dns_get_rrs_start(packet, DNS_RRS_QD, &rr_count); if (rr_count > 1) { @@ -315,13 +315,17 @@ static int _dns_server_recv(unsigned char *inpacket, int inpacket_len, struct so free(request); return ret; break; + case DNS_T_A: + break; default: + tlog(TLOG_INFO, "unsupport qtype: %d, domain: %s", qtype, request->domain); + return ret; break; } - tlog(TLOG_INFO, "query server %s from %s\n", request->domain, gethost_by_addr(name, (struct sockaddr *)from, from_len)); + tlog(TLOG_INFO, "query server %s from %s, qtype = %d\n", request->domain, gethost_by_addr(name, (struct sockaddr *)from, from_len), qtype); atomic_set(&request->refcnt, 1); - dns_client_query(request->domain, dns_server_resolve_callback, request); + dns_client_query(request->domain, qtype, dns_server_resolve_callback, request); return 0; errout: @@ -358,19 +362,18 @@ int dns_server_run(void) int sleep_time = 0; unsigned long expect_time = 0; - now = get_tick_count() - sleep; - expect_time = now + sleep; - while (server.run) { - now = get_tick_count(); - if (now - expect_time >= 0) { - _dns_server_period_run(); - sleep_time = sleep - (now - expect_time); + now = get_tick_count() - sleep; + expect_time = now + sleep; + while (server.run) { + now = get_tick_count(); + if (now - expect_time >= 0) { + _dns_server_period_run(); + sleep_time = sleep - (now - expect_time); if (sleep_time < 0) { sleep_time = 0; - } - expect_time += sleep; - } + expect_time += sleep; + } num = epoll_wait(server.epoll_fd, events, DNS_MAX_EVENTS, sleep_time); if (num < 0) { @@ -388,7 +391,9 @@ int dns_server_run(void) continue; } - _dns_server_process(now); + if (_dns_server_process(now) != 0) { + tlog(TLOG_ERROR, "dns server process failed."); + } } } diff --git a/smartdns.c b/smartdns.c index 302a426..575f239 100755 --- a/smartdns.c +++ b/smartdns.c @@ -102,8 +102,6 @@ int smartdns_init() // sleep(2); // printf("i = %d, n = %d\n", i, atomic_read(&r)); - fast_ping_start("192.168.1.1", 10, 1000, NULL, NULL); - return 0; errout: