mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slirp: Split get_dns_addr

Browse Source 
Separate get_dns_addr into get_dns_addr_cached and get_dns_addr_resolv_conf
to make conversion to IPv6 easier.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Samuel Thibault 2016-03-20 13:20:42 +01:00
parent 9a48e36700
commit 972487b878
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
slirp/slirp.c
View File

@ -109,7 +109,28 @@ static void winsock_cleanup(void)
static struct stat dns_addr_stat; static struct stat dns_addr_stat;
int get_dns_addr(struct in_addr *pdns_addr) static int get_dns_addr_cached(struct in_addr *pdns_addr)
{
struct stat old_stat;
if (curtime - dns_addr_time < TIMEOUT_DEFAULT) {
*pdns_addr = dns_addr;
return 0;
}
old_stat = dns_addr_stat;
if (stat("/etc/resolv.conf", &dns_addr_stat) != 0) {
return -1;
}
if (dns_addr_stat.st_dev == old_stat.st_dev
&& dns_addr_stat.st_ino == old_stat.st_ino
&& dns_addr_stat.st_size == old_stat.st_size
&& dns_addr_stat.st_mtime == old_stat.st_mtime) {
*pdns_addr = dns_addr;
return 0;
}
return 1;
}
static int get_dns_addr_resolv_conf(struct in_addr *pdns_addr)
{ {
char buff[512]; char buff[512];
char buff2[257]; char buff2[257];
@ -117,24 +138,6 @@ int get_dns_addr(struct in_addr *pdns_addr)
int found = 0; int found = 0;
struct in_addr tmp_addr; struct in_addr tmp_addr;
if (dns_addr.s_addr != 0) {
struct stat old_stat;
if ((curtime - dns_addr_time) < TIMEOUT_DEFAULT) {
*pdns_addr = dns_addr;
return 0;
}
old_stat = dns_addr_stat;
if (stat("/etc/resolv.conf", &dns_addr_stat) != 0)
return -1;
if ((dns_addr_stat.st_dev == old_stat.st_dev)
&& (dns_addr_stat.st_ino == old_stat.st_ino)
&& (dns_addr_stat.st_size == old_stat.st_size)
&& (dns_addr_stat.st_mtime == old_stat.st_mtime)) {
*pdns_addr = dns_addr;
return 0;
}
}
f = fopen("/etc/resolv.conf", "r"); f = fopen("/etc/resolv.conf", "r");
if (!f) if (!f)
return -1; return -1;
@ -174,6 +177,18 @@ int get_dns_addr(struct in_addr *pdns_addr)
return 0; return 0;
} }
int get_dns_addr(struct in_addr *pdns_addr)
{
if (dns_addr.s_addr != 0) {
int ret;
ret = get_dns_addr_cached(pdns_addr);
if (ret <= 0) {
return ret;
}
}
return get_dns_addr_resolv_conf(pdns_addr);
}
#endif #endif
static void slirp_init_once(void) static void slirp_init_once(void)