From patchwork Wed Mar 30 22:58:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 8705521 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BBE81C0553 for ; Wed, 30 Mar 2016 22:59:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 14BD92037E for ; Wed, 30 Mar 2016 22:59:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 584CF20374 for ; Wed, 30 Mar 2016 22:59:09 +0000 (UTC) Received: from localhost ([::1]:57113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alP4u-0003V9-QK for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 Mar 2016 18:59:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alP4j-0003UT-DQ for qemu-devel@nongnu.org; Wed, 30 Mar 2016 18:58:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alP4g-0007qN-1N for qemu-devel@nongnu.org; Wed, 30 Mar 2016 18:58:57 -0400 Received: from sonata.ens-lyon.org ([140.77.166.138]:51769) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alP4f-0007px-QI for qemu-devel@nongnu.org; Wed, 30 Mar 2016 18:58:53 -0400 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 28F4720137; Thu, 31 Mar 2016 00:58:53 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A8yyp6YWSBBf; Thu, 31 Mar 2016 00:58:53 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (LFbn-1-6757-94.w90-120.abo.wanadoo.fr [90.120.189.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id D933F20115; Thu, 31 Mar 2016 00:58:52 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.87) (envelope-from ) id 1alP4e-0003AN-9X; Thu, 31 Mar 2016 00:58:52 +0200 From: Samuel Thibault To: qemu-devel@nongnu.org Date: Thu, 31 Mar 2016 00:58:43 +0200 Message-Id: <1459378726-12123-3-git-send-email-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459378726-12123-1-git-send-email-samuel.thibault@ens-lyon.org> References: <1459378726-12123-1-git-send-email-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 140.77.166.138 Cc: thuth@redhat.com, jan.kiszka@siemens.com, jasowang@redhat.com, armbru@redhat.com, Samuel Thibault Subject: [Qemu-devel] [PATCHv2 2/5] slirp: Split get_dns_addr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Thomas Huth --- Change since v1: remove superfluous parenthesis. --- slirp/slirp.c | 53 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/slirp/slirp.c b/slirp/slirp.c index cefb9dc..4478a43 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)