From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahebm-00071x-HJ for qemu-devel@nongnu.org; Sun, 20 Mar 2016 10:45:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahebk-0003Mo-5N for qemu-devel@nongnu.org; Sun, 20 Mar 2016 10:45:34 -0400 Received: from domu-toccata.ens-lyon.fr ([140.77.166.138]:43924 helo=sonata.ens-lyon.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahebj-0003M5-5t for qemu-devel@nongnu.org; Sun, 20 Mar 2016 10:45:31 -0400 From: Samuel Thibault Date: Sun, 20 Mar 2016 15:45:24 +0100 Message-Id: <1458485126-21110-2-git-send-email-samuel.thibault@ens-lyon.org> In-Reply-To: <1458485126-21110-1-git-send-email-samuel.thibault@ens-lyon.org> References: <1458485126-21110-1-git-send-email-samuel.thibault@ens-lyon.org> Subject: [Qemu-devel] [PATCH 1/3] slirp: Split get_dns_addr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, thuth@redhat.com Cc: Samuel Thibault , jan.kiszka@siemens.com 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 --- slirp/slirp.c | 53 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/slirp/slirp.c b/slirp/slirp.c index e4a32ae..36534fc 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -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) -- 2.7.0