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

Update code

Browse Source
This commit is contained in:
Nick Peng
2018-05-25 23:55:48 +08:00
parent 64066c5948
commit a86f5e7459
5 changed files with 87 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dns.c
View File

@@ -1116,7 +1116,7 @@ int dns_packet_init(struct dns_packet *packet, int size, struct dns_head *head)
init_head->qr = head->qr; init_head->qr = head->qr;
init_head->opcode = head->opcode; init_head->opcode = head->opcode;
init_head->aa = head->aa; init_head->aa = head->aa;
init_head->tc = 0; init_head->tc = head->tc;
init_head->rd = head->rd; init_head->rd = head->rd;
init_head->ra = head->ra; init_head->ra = head->ra;
init_head->rcode = head->rcode; init_head->rcode = head->rcode;

140
dns_client.c
View File

@@ -22,10 +22,11 @@
#include "fast_ping.h" #include "fast_ping.h"
#include "hashtable.h" #include "hashtable.h"
#include "list.h" #include "list.h"
#include "util.h"
#include "tlog.h" #include "tlog.h"
#include "util.h"
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <linux/filter.h> #include <linux/filter.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/icmp6.h> #include <netinet/icmp6.h>
@@ -38,13 +39,9 @@
#include <string.h> #include <string.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#define DNS_MAX_HOSTNAME 256 #define DNS_MAX_HOSTNAME 256
@@ -96,9 +93,10 @@ struct dns_query_struct {
struct list_head dns_request_list; struct list_head dns_request_list;
struct hlist_node domain_node; struct hlist_node domain_node;
char domain[DNS_MAX_CNAME_LEN]; char domain[DNS_MAX_CNAME_LEN];
int dns_request_sent; atomic_t dns_request_sent;
void *user_ptr; void *user_ptr;
unsigned long send_tick; unsigned long send_tick;
atomic_t notified;
dns_client_callback callback; dns_client_callback callback;
struct dns_result result; struct dns_result result;
}; };
@@ -267,31 +265,34 @@ int dns_remove_server(char *server_ip, int port, dns_server_type_t server_type)
return _dns_client_server_operate(server_ip, port, server_type, 1); return _dns_client_server_operate(server_ip, port, server_type, 1);
} }
int _dns_client_query_complete(struct dns_query_struct *query) int _dns_client_query_complete(struct dns_query_struct *query)
{ {
int ret = -1; int ret = -1;
if (query->callback) { if (query->callback) {
ret = query->callback(query->domain, &query->result, query->user_ptr); ret = query->callback(query->domain, &query->result, query->user_ptr);
} }
return ret; return ret;
} }
void _dns_client_query_release(struct dns_query_struct *query, int locked)
void _dns_client_query_release(struct dns_query_struct *query)
{ {
if (!atomic_dec_and_test(&query->refcnt)) { if (!atomic_dec_and_test(&query->refcnt)) {
return; return;
} }
pthread_mutex_lock(&client.domain_map_lock); if (locked == 0) {
list_del(&query->dns_request_list); pthread_mutex_lock(&client.domain_map_lock);
hash_del(&query->domain_node); list_del(&query->dns_request_list);
pthread_mutex_unlock(&client.domain_map_lock); hash_del(&query->domain_node);
tlog(TLOG_ERROR, "-------------%p, %d\n", query, atomic_read(&query->refcnt)); pthread_mutex_unlock(&client.domain_map_lock);
_dns_client_query_complete(query); } else {
//TODO double free BUG:// list_del(&query->dns_request_list);
hash_del(&query->domain_node);
}
if (atomic_inc_return(&query->notified) == 1) {
_dns_client_query_complete(query);
}
memset(query, 0, sizeof(*query)); memset(query, 0, sizeof(*query));
free(query); free(query);
} }
@@ -301,10 +302,11 @@ void _dns_client_query_get(struct dns_query_struct *query)
atomic_inc(&query->refcnt); atomic_inc(&query->refcnt);
} }
void dns_client_ping_result(struct ping_host_struct *ping_host, const char *host, FAST_PING_RESULT result, struct sockaddr *addr, socklen_t addr_len, int seqno, struct timeval *tv, void *userptr) void dns_client_ping_result(struct ping_host_struct *ping_host, const char *host, FAST_PING_RESULT result, struct sockaddr *addr, socklen_t addr_len, int seqno,
struct timeval *tv, void *userptr)
{ {
struct dns_query_struct *query = userptr; struct dns_query_struct *query = userptr;
int may_complete = 0;
if (query == NULL) { if (query == NULL) {
return; return;
} }
@@ -325,12 +327,12 @@ void dns_client_ping_result(struct ping_host_struct *ping_host, const char *host
addr_in6 = (struct sockaddr_in6 *)addr; addr_in6 = (struct sockaddr_in6 *)addr;
if (IN6_IS_ADDR_V4MAPPED(&addr_in6->sin6_addr)) { if (IN6_IS_ADDR_V4MAPPED(&addr_in6->sin6_addr)) {
if (query->result.ttl_v4 > rtt) { if (query->result.ttl_v4 > rtt) {
query->result.ttl_v4 = rtt; query->result.ttl_v4 = rtt;
memcpy(query->result.addr_ipv4, addr_in6->sin6_addr.s6_addr + 12, 4); memcpy(query->result.addr_ipv4, addr_in6->sin6_addr.s6_addr + 12, 4);
} }
} else { } else {
if (query->result.ttl_v6 > rtt) { if (query->result.ttl_v6 > rtt) {
query->result.ttl_v6 = rtt; query->result.ttl_v6 = rtt;
memcpy(query->result.addr_ipv6, addr_in6->sin6_addr.s6_addr, 16); memcpy(query->result.addr_ipv6, addr_in6->sin6_addr.s6_addr, 16);
} }
} }
@@ -338,8 +340,20 @@ void dns_client_ping_result(struct ping_host_struct *ping_host, const char *host
default: default:
break; break;
} }
printf("from %15s: seq=%d time=%d\n", host, seqno, rtt);
_dns_client_query_release(query); if (rtt < 100) {
may_complete = 1;
} else if (rtt < (get_tick_count() - query->send_tick) * 10) {
may_complete = 1;
}
if (may_complete) {
if (atomic_inc_return(&query->notified) == 1) {
_dns_client_query_complete(query);
}
}
tlog(TLOG_INFO, "from %15s: seq=%d time=%d\n", host, seqno, rtt);
_dns_client_query_release(query, 0);
} }
void _dns_client_period_run() void _dns_client_period_run()
@@ -351,6 +365,8 @@ void _dns_client_period_run()
list_for_each_entry_safe(query, tmp, &client.dns_request_list, dns_request_list) list_for_each_entry_safe(query, tmp, &client.dns_request_list, dns_request_list)
{ {
if (now - query->send_tick > 500) { if (now - query->send_tick > 500) {
atomic_set(&query->dns_request_sent, -1);
_dns_client_query_release(query, 1);
} }
} }
pthread_mutex_unlock(&client.domain_map_lock); pthread_mutex_unlock(&client.domain_map_lock);
@@ -390,19 +406,25 @@ static int _dns_client_process_answer(char *domain, struct dns_packet *packet)
int j = 0; int j = 0;
struct dns_rrs *rrs = NULL; struct dns_rrs *rrs = NULL;
int ret = -1; int ret = -1;
int request_num = 0;
query = _dns_client_get_request(packet->head.id, domain); query = _dns_client_get_request(packet->head.id, domain);
if (query == NULL) { if (query == NULL) {
return -1; return -1;
} }
pthread_mutex_lock(&client.server_list_lock); request_num = atomic_dec_return(&query->dns_request_sent);
query->dns_request_sent--; if (request_num < 0) {
if (query->dns_request_sent < 0) { return -1;
pthread_mutex_unlock(&client.server_list_lock); }
if (packet->head.rcode != DNS_RC_NOERROR) {
tlog(TLOG_ERROR, "inquery failed, %s, rcode = %d\n", name, packet->head.rcode);
if (request_num == 0) {
_dns_client_query_release(query, 0);
}
return -1; return -1;
} }
pthread_mutex_unlock(&client.server_list_lock);
for (j = 1; j < DNS_RRS_END; j++) { for (j = 1; j < DNS_RRS_END; j++) {
rrs = dns_get_rrs_start(packet, j, &rr_count); rrs = dns_get_rrs_start(packet, j, &rr_count);
@@ -411,35 +433,35 @@ static int _dns_client_process_answer(char *domain, struct dns_packet *packet)
case DNS_T_A: { case DNS_T_A: {
unsigned char addr[4]; unsigned char addr[4];
dns_get_A(rrs, name, DNS_MAX_CNAME_LEN, &ttl, addr); dns_get_A(rrs, name, DNS_MAX_CNAME_LEN, &ttl, addr);
printf("%s %d : %d.%d.%d.%d\n", name, ttl, addr[0], addr[1], addr[2], addr[3]); tlog(TLOG_DEBUG, "%s %d : %d.%d.%d.%d", name, ttl, addr[0], addr[1], addr[2], addr[3]);
sprintf(ip, "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]); sprintf(ip, "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
if (strncmp(name, domain, DNS_MAX_CNAME_LEN) == 0 || strncmp(alias, name, DNS_MAX_CNAME_LEN) == 0) { if (strncmp(name, domain, DNS_MAX_CNAME_LEN) == 0 || strncmp(alias, name, DNS_MAX_CNAME_LEN) == 0) {
_dns_client_query_get(query); _dns_client_query_get(query);
if (fast_ping_start(ip, 1, 700, dns_client_ping_result, query) == NULL) { if (fast_ping_start(ip, 1, 500, dns_client_ping_result, query) == NULL) {
_dns_client_query_release(query); _dns_client_query_release(query, 0);
} }
} }
} break; } break;
case DNS_T_AAAA: { case DNS_T_AAAA: {
unsigned char addr[16]; unsigned char addr[16];
dns_get_AAAA(rrs, name, DNS_MAX_CNAME_LEN, &ttl, addr); dns_get_AAAA(rrs, name, DNS_MAX_CNAME_LEN, &ttl, addr);
sprintf(name, "%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x", addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], addr[6], addr[7], sprintf(name, "%x%x:%x%x:%x%x:%x%x:%x%x:%x%x:%x%x:%x%x", addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], addr[6], addr[7], addr[8],
addr[8], addr[9], addr[10], addr[11], addr[12], addr[13], addr[14], addr[15]); addr[9], addr[10], addr[11], addr[12], addr[13], addr[14], addr[15]);
_dns_client_query_get(query); _dns_client_query_get(query);
if (fast_ping_start(name, 1, 700, dns_client_ping_result, query) == NULL) { if (fast_ping_start(name, 1, 500, dns_client_ping_result, query) == NULL) {
_dns_client_query_release(query); _dns_client_query_release(query, 0);
} }
} break; } break;
case DNS_T_NS: { case DNS_T_NS: {
char cname[128]; char cname[128];
dns_get_CNAME(rrs, name, 128, &ttl, cname, 128); dns_get_CNAME(rrs, name, 128, &ttl, cname, 128);
printf("NS: %s %d : %s\n", name, ttl, cname); tlog(TLOG_INFO, "NS: %s %d : %s\n", name, ttl, cname);
} break; } break;
case DNS_T_CNAME: { case DNS_T_CNAME: {
char cname[128]; char cname[128];
dns_get_CNAME(rrs, name, 128, &ttl, cname, 128); dns_get_CNAME(rrs, name, 128, &ttl, cname, 128);
printf("%s %d : %s\n", name, ttl, cname); tlog(TLOG_DEBUG, "%s %d : %s\n", name, ttl, cname);
strncpy(alias, cname, DNS_MAX_CNAME_LEN); strncpy(alias, cname, DNS_MAX_CNAME_LEN);
} break; } break;
default: default:
@@ -448,11 +470,9 @@ static int _dns_client_process_answer(char *domain, struct dns_packet *packet)
} }
} }
pthread_mutex_lock(&client.server_list_lock); if (request_num == 0) {
if (query->dns_request_sent <= 0) { _dns_client_query_release(query, 0);
_dns_client_query_release(query);
} }
pthread_mutex_unlock(&client.server_list_lock);
return ret; return ret;
} }
@@ -472,9 +492,8 @@ static int _dns_client_recv(unsigned char *inpacket, int inpacket_len, struct so
packet->head.tc = 0; packet->head.tc = 0;
len = dns_decode(packet, DNS_PACKSIZE, inpacket, inpacket_len); len = dns_decode(packet, DNS_PACKSIZE, inpacket, inpacket_len);
if (len != 0) { if (len != 0) {
tlog(TLOG_ERROR, "decode failed, packet len = %d, tc=%d, %d\n", inpacket_len, tlog(TLOG_ERROR, "decode failed, packet len = %d, tc=%d, %d\n", inpacket_len, packet->head.tc, packet->head.id);
packet->head.tc, packet->head.id); int fd = open("dns.bin", O_CREAT | O_TRUNC | O_RDWR);
int fd = open("dns.bin", O_CREAT | O_TRUNC | O_RDWR);
write(fd, inpacket, inpacket_len); write(fd, inpacket, inpacket_len);
close(fd); close(fd);
return -1; return -1;
@@ -485,20 +504,13 @@ static int _dns_client_recv(unsigned char *inpacket, int inpacket_len, struct so
return -1; return -1;
} }
printf("qdcount = %d, ancount = %d, nscount = %d, nrcount = %d, len = %d, id = %d, rd = %d, ra = %d, rcode = %d\n", packet->head.qdcount, packet->head.ancount, packet->head.nscount, tlog(TLOG_DEBUG, "qdcount = %d, ancount = %d, nscount = %d, nrcount = %d, len = %d, id = %d, rd = %d, ra = %d, rcode = %d\n", packet->head.qdcount,
packet->head.nrcount, inpacket_len, packet->head.id, packet->head.rd, packet->head.ra, packet->head.ancount, packet->head.nscount, packet->head.nrcount, inpacket_len, packet->head.id, packet->head.rd, packet->head.ra, packet->head.rcode);
packet->head.rcode);
rrs = dns_get_rrs_start(packet, DNS_RRS_QD, &rr_count); rrs = dns_get_rrs_start(packet, DNS_RRS_QD, &rr_count);
for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(packet, rrs)) { for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(packet, rrs)) {
dns_get_domain(rrs, name, DNS_MAX_CNAME_LEN, &qtype, &qclass); dns_get_domain(rrs, name, DNS_MAX_CNAME_LEN, &qtype, &qclass);
printf("domain: %s qtype: %d qclass: %d\n", name, qtype, qclass); tlog(TLOG_DEBUG, "domain: %s qtype: %d qclass: %d\n", name, qtype, qclass);
}
if (packet->head.rcode != DNS_RC_NOERROR) {
tlog(TLOG_ERROR, "inquery failed, %s, rcode = %d\n", name, packet->head.rcode);
//TODO set response to dns_server.c
return -1;
} }
return _dns_client_process_answer(name, packet); return _dns_client_process_answer(name, packet);
@@ -600,7 +612,7 @@ static int _dns_client_send_packet(struct dns_query_struct *query, void *packet,
continue; continue;
} }
query->dns_request_sent++; atomic_inc(&query->dns_request_sent);
} }
pthread_mutex_unlock(&client.server_list_lock); pthread_mutex_unlock(&client.server_list_lock);
return 0; return 0;
@@ -617,7 +629,8 @@ static int _dns_client_send_query(struct dns_query_struct *query, char *doamin)
memset(&head, 0, sizeof(head)); memset(&head, 0, sizeof(head));
head.rcode = 0; head.rcode = 0;
head.qr = DNS_OP_QUERY; head.qr = DNS_OP_QUERY;
head.rd = 0; head.aa = 1;
head.rd = 1;
head.ra = 0; head.ra = 0;
head.id = query->sid; head.id = query->sid;
@@ -646,6 +659,8 @@ int dns_client_query(char *domain, dns_client_callback callback, void *user_ptr)
INIT_HLIST_NODE(&query->domain_node); INIT_HLIST_NODE(&query->domain_node);
INIT_LIST_HEAD(&query->dns_request_list); INIT_LIST_HEAD(&query->dns_request_list);
atomic_set(&query->refcnt, 0); atomic_set(&query->refcnt, 0);
atomic_set(&query->notified, 0);
atomic_set(&query->dns_request_sent, 0);
strncpy(query->domain, domain, DNS_MAX_CNAME_LEN); strncpy(query->domain, domain, DNS_MAX_CNAME_LEN);
query->user_ptr = user_ptr; query->user_ptr = user_ptr;
query->callback = callback; query->callback = callback;
@@ -659,7 +674,7 @@ int dns_client_query(char *domain, dns_client_callback callback, void *user_ptr)
goto errout_del_list; goto errout_del_list;
} }
tlog(TLOG_ERROR, "send request %s, id %d\n", domain, query->sid); tlog(TLOG_INFO, "send request %s, id %d\n", domain, query->sid);
key = hash_string(domain); key = hash_string(domain);
key = jhash(&query->sid, sizeof(query->sid), key); key = jhash(&query->sid, sizeof(query->sid), key);
@@ -757,7 +772,7 @@ errout:
void dns_debug(void) void dns_debug(void)
{ {
char data[1024]; unsigned char data[1024];
int len; int len;
char buff[4096]; char buff[4096];
@@ -771,7 +786,7 @@ void dns_debug(void)
return; return;
} }
struct dns_packet *packet = buff; struct dns_packet *packet = (struct dns_packet *)buff;
if (dns_decode(packet, 4096, data, len) != 0) { if (dns_decode(packet, 4096, data, len) != 0) {
printf("decode failed.\n"); printf("decode failed.\n");
} }
@@ -784,10 +799,9 @@ int dns_client_init()
int ret; int ret;
int fd = 1; int fd = 1;
//dns_debug(); // dns_debug();
if (client.epoll_fd > 0) if (client.epoll_fd > 0) {
{
return -1; return -1;
} }

6
dns_server.c
View File

@@ -232,7 +232,7 @@ static int dns_server_resolve_callback(char *domain, struct dns_result *result,
// memcpy(request->ipv6_addr, result->addr_ipv6, 16); // memcpy(request->ipv6_addr, result->addr_ipv6, 16);
request->qtype = DNS_T_A; request->qtype = DNS_T_A;
printf("----------------%s--%d.%d.%d.%d-\n", domain, tlog(TLOG_INFO, "result: %s, %d.%d.%d.%d\n", domain,
request->ipv4_addr[0], request->ipv4_addr[0],
request->ipv4_addr[1], request->ipv4_addr[1],
request->ipv4_addr[2], request->ipv4_addr[2],
@@ -244,7 +244,6 @@ static int dns_server_resolve_callback(char *domain, struct dns_result *result,
} }
tlog(TLOG_ERROR, "free query server %p\n", request);
memset(request, 0, sizeof(*request)); memset(request, 0, sizeof(*request));
free(request); free(request);
@@ -257,6 +256,7 @@ static int _dns_server_recv(unsigned char *inpacket, int inpacket_len, struct so
int decode_len; int decode_len;
int ret = -1; int ret = -1;
unsigned char packet_buff[DNS_PACKSIZE]; unsigned char packet_buff[DNS_PACKSIZE];
char name[DNS_MAX_CNAME_LEN];
struct dns_packet *packet = (struct dns_packet *)packet_buff; struct dns_packet *packet = (struct dns_packet *)packet_buff;
struct dns_request *request = NULL; struct dns_request *request = NULL;
struct dns_rrs *rrs; struct dns_rrs *rrs;
@@ -311,7 +311,7 @@ static int _dns_server_recv(unsigned char *inpacket, int inpacket_len, struct so
break; break;
} }
tlog(TLOG_ERROR, "query server %p\n", request); tlog(TLOG_INFO, "query server %s from %s\n", request->domain, gethost_by_addr(name, (struct sockaddr *)from, from_len));
atomic_set(&request->refcnt, 1); atomic_set(&request->refcnt, 1);
dns_client_query(request->domain, dns_server_resolve_callback, request); dns_client_query(request->domain, dns_server_resolve_callback, request);

3
fast_ping.c
View File

@@ -659,7 +659,8 @@ static int _fast_ping_process_icmp(struct ping_host_struct *ping_host, struct ti
packet = _fast_ping_recv_packet(ping_host, inpacket, len, now); packet = _fast_ping_recv_packet(ping_host, inpacket, len, now);
if (packet == NULL) { if (packet == NULL) {
tlog(TLOG_ERROR, "recv ping packet failed."); char name[PING_MAX_HOSTLEN];
tlog(TLOG_ERROR, "recv ping packet from %s failed.", gethost_by_addr(name, (struct sockaddr *)&from, from_len));
goto errout; goto errout;
} }

6
smartdns.c
View File

@@ -55,11 +55,13 @@ int smartdns_init()
goto errout; goto errout;
} }
//dns_add_server("192.168.1.1", 53, DNS_SERVER_UDP); dns_add_server("192.168.1.1", 53, DNS_SERVER_UDP);
dns_add_server("114.114.114.114", 53, DNS_SERVER_UDP); dns_add_server("114.114.114.114", 53, DNS_SERVER_UDP);
dns_add_server("123.207.137.88", 53, DNS_SERVER_UDP); dns_add_server("123.207.137.88", 53, DNS_SERVER_UDP);
dns_add_server("193.112.15.186", 53, DNS_SERVER_UDP); dns_add_server("193.112.15.186", 53, DNS_SERVER_UDP);
//dns_add_server("202.141.178.13", 5353, DNS_SERVER_UDP); dns_add_server("202.141.178.13", 5353, DNS_SERVER_UDP);
dns_add_server("208.67.222.222", 5353, DNS_SERVER_UDP);
return 0; return 0;
errout: errout: