diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-03-20 13:20:42 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-07-03 23:24:54 +0200 |
| commit | 972487b878dbdbdc9402208aace41c9573aa6c8b (patch) | |
| tree | 6c3a509e210e72541b74c9638449e3ab0cbfe681 /slirp/slirp.c | |
| parent | 9a48e3670030148a8d00c8d4d4cd7f051c0d9f39 (diff) | |
slirp: Split get_dns_addr
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>
Diffstat (limited to 'slirp/slirp.c')
| -rw-r--r-- | slirp/slirp.c | 53 |
1 files changed, 34 insertions, 19 deletions
diff --git a/slirp/slirp.c b/slirp/slirp.c index 9f4bea3d3b..e63c5e8fc6 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -109,7 +109,28 @@ static void winsock_cleanup(void) 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 buff2[257]; @@ -117,24 +138,6 @@ int get_dns_addr(struct in_addr *pdns_addr) int found = 0; 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"); if (!f) return -1; @@ -174,6 +177,18 @@ int get_dns_addr(struct in_addr *pdns_addr) 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 static void slirp_init_once(void) |