From patchwork Sun Sep 29 18:13:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 11165851 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AACA7912 for ; Sun, 29 Sep 2019 18:14:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8AE6C20815 for ; Sun, 29 Sep 2019 18:14:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8AE6C20815 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:41466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEdi9-0004Tb-H9 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 29 Sep 2019 14:14:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37969) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEdhC-0003XK-Rr for qemu-devel@nongnu.org; Sun, 29 Sep 2019 14:13:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iEdhB-00014M-B1 for qemu-devel@nongnu.org; Sun, 29 Sep 2019 14:13:22 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:35522) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iEdhB-00012O-4N for qemu-devel@nongnu.org; Sun, 29 Sep 2019 14:13:21 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 510EFA7AB0; Sun, 29 Sep 2019 20:13:12 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr 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 jjT148heVnmF; Sun, 29 Sep 2019 20:13:11 +0200 (CEST) Received: from function (unknown [109.190.253.14]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 713A3A7AD0; Sun, 29 Sep 2019 20:13:10 +0200 (CEST) Received: from samy by function with local (Exim 4.92.2) (envelope-from ) id 1iEdgy-0005Ci-K1; Sun, 29 Sep 2019 20:13:08 +0200 From: Samuel Thibault To: qemu-devel@nongnu.org, jasowang@redhat.com Subject: [PATCH] slirp: Allow non-local DNS address when restrict is off Date: Sun, 29 Sep 2019 20:13:03 +0200 Message-Id: <20190929181303.19960-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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. This fixes LP 1010484. Signed-off-by: Samuel Thibault Reviewed-by: Marc-André Lureau --- net/slirp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/slirp.c b/net/slirp.c index f42f496641..4d158b0542 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -456,7 +456,7 @@ static int net_slirp_init(NetClientState *peer, const char *model, error_setg(errp, "Failed to parse DNS"); return -1; } - if ((dns.s_addr & mask.s_addr) != net.s_addr) { + if (restricted && (dns.s_addr & mask.s_addr) != net.s_addr) { error_setg(errp, "DNS doesn't belong to network"); return -1; }