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 | a6e9c789a4c9f9563a648b5063e4dc454d22e832 (patch) | |
tree | d859ea837e8c63ce4d36259b77aea59f0c5dee19 | |
parent | bf42e4cbd2c30bfe78d3f02e5b59a5547a9df217 (diff) | |
download | slirp-a6e9c789a4c9f9563a648b5063e4dc454d22e832.zip slirp-a6e9c789a4c9f9563a648b5063e4dc454d22e832.tar.gz slirp-a6e9c789a4c9f9563a648b5063e4dc454d22e832.tar.bz2 |
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>
-rw-r--r-- | slirp.c | 53 |
1 files changed, 34 insertions, 19 deletions
@@ -108,7 +108,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]; @@ -116,24 +137,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; @@ -173,6 +176,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) |