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

resolv: try load dns server from default resolv.conf

Browse Source
This commit is contained in:
Nick Peng
2023-05-05 22:51:39 +08:00
parent 5500fe2592
commit ccadadd3fb
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/dns_conf.c
View File

@@ -31,7 +31,6 @@
#include <unistd.h> #include <unistd.h>
#define DNS_MAX_REPLY_IP_NUM 8 #define DNS_MAX_REPLY_IP_NUM 8
#define DNS_RESOLV_FILE "/etc/resolv.conf"
/* ipset */ /* ipset */
struct dns_ipset_table { struct dns_ipset_table {

1
src/dns_conf.h
View File

@@ -63,6 +63,7 @@ extern "C" {
#define SMARTDNS_CACHE_FILE "/var/cache/smartdns/smartdns.cache" #define SMARTDNS_CACHE_FILE "/var/cache/smartdns/smartdns.cache"
#define SMARTDNS_TMP_CACHE_FILE "/tmp/smartdns.cache" #define SMARTDNS_TMP_CACHE_FILE "/tmp/smartdns.cache"
#define SMARTDNS_DEBUG_DIR "/tmp/smartdns" #define SMARTDNS_DEBUG_DIR "/tmp/smartdns"
#define DNS_RESOLV_FILE "/etc/resolv.conf"
enum domain_rule { enum domain_rule {
DOMAIN_RULE_FLAGS = 0, DOMAIN_RULE_FLAGS = 0,

26
src/smartdns.c
View File

@@ -176,7 +176,7 @@ static void _show_version(void)
printf("smartdns %s\n", str_ver); printf("smartdns %s\n", str_ver);
} }
static int _smartdns_load_from_resolv(void) static int _smartdns_load_from_resolv_file(const char *resolv_file)
{ {
FILE *fp = NULL; FILE *fp = NULL;
char line[MAX_LINE_LEN]; char line[MAX_LINE_LEN];
@@ -189,9 +189,9 @@ static int _smartdns_load_from_resolv(void)
int filed_num = 0; int filed_num = 0;
int line_num = 0; int line_num = 0;
fp = fopen(dns_resolv_file, "r"); fp = fopen(resolv_file, "r");
if (fp == NULL) { if (fp == NULL) {
tlog(TLOG_ERROR, "open %s failed, %s", dns_resolv_file, strerror(errno)); tlog(TLOG_ERROR, "open %s failed, %s", resolv_file, strerror(errno));
return -1; return -1;
} }
@@ -228,6 +228,16 @@ static int _smartdns_load_from_resolv(void)
return ret; return ret;
} }
static int _smartdns_load_from_resolv(void)
{
return _smartdns_load_from_resolv_file(dns_resolv_file);
}
static int _smartdns_load_from_default_resolv(void)
{
return _smartdns_load_from_resolv_file(DNS_RESOLV_FILE);
}
static int _smartdns_prepare_server_flags(struct client_dns_server_flags *flags, struct dns_servers *server) static int _smartdns_prepare_server_flags(struct client_dns_server_flags *flags, struct dns_servers *server)
{ {
memset(flags, 0, sizeof(*flags)); memset(flags, 0, sizeof(*flags));
@@ -473,12 +483,20 @@ static int _smartdns_init(void)
goto errout; goto errout;
} }
for (i = 0; i < 60 && dns_conf_server_num <= 0; i++) { for (i = 0; i < 180 && dns_conf_server_num <= 0; i++) {
ret = _smartdns_load_from_resolv(); ret = _smartdns_load_from_resolv();
if (ret == 0) { if (ret == 0) {
continue; continue;
} }
/* try load from default resolv.conf file */
if (i > 30 && strncmp(dns_resolv_file, DNS_RESOLV_FILE, MAX_LINE_LEN) != 0) {
ret = _smartdns_load_from_default_resolv();
if (ret == 0) {
continue;
}
}
tlog(TLOG_DEBUG, "load dns from resolv failed, retry after 1s, retry times %d.", i + 1); tlog(TLOG_DEBUG, "load dns from resolv failed, retry after 1s, retry times %d.", i + 1);
sleep(1); sleep(1);
} }