From nobody Thu May 9 00:18:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1569945193; cv=none; d=zoho.com; s=zohoarc; b=EnT+2IR9JNlglKddxOqZBnyAFq6/ftxwlH2npHm7umvmuoIgEHWSyc8fWJls7Dut3pdVdhIKtQxMQLA6YCDzYHxgQZr89v/kr+jIf6oBzKN1IbsZmV1R70hRVl6lIUIfVBaxLsA/tWQv3ya4oFK9fq6jsA8Oj+5XEMYI6UvAsek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569945193; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=Tf2ZdI0fL/Cg9ZVW/Id/0AzVxavq1nImQjxZbobHHnI=; b=YnlbuE7xgwWlqIBkF2YqoQ5psSxfgjeLt2rvaN/miScFLFtxrnH1MC3zybkjngSsB/KjcgqJtWB3W0V29DGm/UEckrznrWSJRYVhUPyj2G1d+i6Rx/jdNJjfQxUYQLT3cxDWbbDh342C0qDrVrBxmq1HIrjsffdm76DZ2x5LWJ8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569945193034430.44468609504634; Tue, 1 Oct 2019 08:53:13 -0700 (PDT) Received: from localhost ([::1]:43772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFKSd-00072s-Ky for importer@patchew.org; Tue, 01 Oct 2019 11:53:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48113) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFKGt-0002nk-Ku for qemu-devel@nongnu.org; Tue, 01 Oct 2019 11:41:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFKGs-0006xy-4G for qemu-devel@nongnu.org; Tue, 01 Oct 2019 11:41:03 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:48092) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFKGr-0006xD-UJ for qemu-devel@nongnu.org; Tue, 01 Oct 2019 11:41:02 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id D2F67C0EEF; Tue, 1 Oct 2019 17:41:00 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XQ75-pMmCk9r; Tue, 1 Oct 2019 17:41:00 +0200 (CEST) Received: from function (unknown [109.190.253.14]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 02496C0EEE; Tue, 1 Oct 2019 17:41:00 +0200 (CEST) Received: from samy by function with local (Exim 4.92.2) (envelope-from ) id 1iFKGo-00076F-T7; Tue, 01 Oct 2019 17:40:58 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org, jasowang@redhat.com, marcandre.lureau@gmail.com, philmd@redhat.com Subject: [PATCHv2] slirp: Allow non-local DNS address when restrict is off Date: Tue, 1 Oct 2019 17:40:57 +0200 Message-Id: <20191001154057.27250-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.233.100.1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This can be used to set a DNS server to be used by the guest which is different from the one configured on the host. Buglink: https://bugs.launchpad.net/qemu/+bug/1010484 Signed-off-by: Samuel Thibault Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- Difference from first version: - handle DNS IPv6 as well - reference bug with Buglink net/slirp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index f42f496641..c4334ee876 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -456,7 +456,7 @@ static int net_slirp_init(NetClientState *peer, const c= har *model, error_setg(errp, "Failed to parse DNS"); return -1; } - if ((dns.s_addr & mask.s_addr) !=3D net.s_addr) { + if (restricted && (dns.s_addr & mask.s_addr) !=3D net.s_addr) { error_setg(errp, "DNS doesn't belong to network"); return -1; } @@ -522,7 +522,7 @@ static int net_slirp_init(NetClientState *peer, const c= har *model, error_setg(errp, "Failed to parse IPv6 DNS"); return -1; } - if (!in6_equal_net(&ip6_prefix, &ip6_dns, vprefix6_len)) { + if (restricted && !in6_equal_net(&ip6_prefix, &ip6_dns, vprefix6_l= en)) { error_setg(errp, "IPv6 DNS doesn't belong to network"); return -1; } --=20 2.23.0