From nobody Mon Feb 9 19:04:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599191214; cv=none; d=zohomail.com; s=zohoarc; b=R/vyRVm4Mxs5MaaCt93WS8qgkOyXwtrW6kxk/adOq5sF/7mrJOc4rOPYsIR3atng0QrJOFEIoeo76r/2Hra9PRfdJhaCiTXoKm8Tbg+Gi5Sl4/csdUB9E/zjvbXDg/0PJF8eLXRr7+CtcpqpxnELrWe5MRjS/lmELjb/XLZF7FY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599191214; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f8XnU/dunZ6e0qh7Hx0gGPnfFsOMv6YMSq4oWB+1s14=; b=MNNf1wSfciLJ+90+XatsMQ/AbIig9Xr0+daRnqEW/p8bhHrUiE2cpW2A55boRBcYe3yOkyMupTd3ynsfDXSOlAVHgXlDtqaoHb5/nAlEpsMsnJuhMCL9UFMXmPdNdDMf/GywHwvlX5PR2PHUQpZFHS7O2rlLoDKloAnEgjk5gZ4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1599191214458183.17772443500405; Thu, 3 Sep 2020 20:46:54 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-bahbSWe9MmWR-DD8PS5hkQ-1; Thu, 03 Sep 2020 23:46:51 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 49841801AF2; Fri, 4 Sep 2020 03:46:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A1F07E413; Fri, 4 Sep 2020 03:46:46 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EF789972E4; Fri, 4 Sep 2020 03:46:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0843kcHl032379 for ; Thu, 3 Sep 2020 23:46:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id ACBA8117A977; Fri, 4 Sep 2020 03:46:38 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A6626117A976 for ; Fri, 4 Sep 2020 03:46:36 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 47F0F87EF95 for ; Fri, 4 Sep 2020 03:46:36 +0000 (UTC) Received: from mail-proxy25223.qiye.163.com (mail-proxy25223.qiye.163.com [103.129.252.23]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-VqjLTQ8TNdiddj5wBgntBw-1; Thu, 03 Sep 2020 23:46:33 -0400 Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp4 (Coremail) with SMTP id JedpCgAHcNgStlFfYHYgCg--.1426S20; Fri, 04 Sep 2020 11:35:52 +0800 (CST) X-MC-Unique: bahbSWe9MmWR-DD8PS5hkQ-1 X-MC-Unique: VqjLTQ8TNdiddj5wBgntBw-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFCv2 18/46] conf: Generate virNetworkDNSForwarderFormatBuf Date: Fri, 4 Sep 2020 11:35:10 +0800 Message-Id: <20200904033538.418579-19-shi_lei@massclouds.com> In-Reply-To: <20200904033538.418579-1-shi_lei@massclouds.com> References: <20200904033538.418579-1-shi_lei@massclouds.com> MIME-Version: 1.0 X-CM-TRANSID: JedpCgAHcNgStlFfYHYgCg--.1426S20 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4itxhHDUUUU X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiRRiVT1bdHCRQvwAAsb X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false; X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Shi Lei --- src/conf/network_conf.c | 18 +++--------------- src/conf/network_conf.h | 4 ++-- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 608843d..437c2c6 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2155,21 +2155,9 @@ virNetworkDNSDefFormat(virBufferPtr buf, virBufferAdjustIndent(buf, 2); =20 for (i =3D 0; i < def->nfwds; i++) { - - virBufferAddLit(buf, "forwarders[i].domain) { - virBufferEscapeString(buf, " domain=3D'%s'", - def->forwarders[i].domain); - } - if (VIR_SOCKET_ADDR_VALID(&def->forwarders[i].addr)) { - g_autofree char *addr =3D virSocketAddrFormat(&def->forwarders= [i].addr); - - if (!addr) - return -1; - - virBufferAsprintf(buf, " addr=3D'%s'", addr); - } - virBufferAddLit(buf, "/>\n"); + if (virNetworkDNSForwarderFormatBuf(buf, "forwarder", + &def->forwarders[i], def, NULL= ) < 0) + return -1; } =20 for (i =3D 0; i < def->ntxts; i++) { diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 881a9f2..84b636e 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -158,9 +158,9 @@ struct _virNetworkDNSHostDef { /* genparse:withhook, g= enformat */ =20 typedef struct _virNetworkDNSForwarder virNetworkDNSForwarder; typedef virNetworkDNSForwarder *virNetworkDNSForwarderPtr; -struct _virNetworkDNSForwarder { /* genparse:withhook */ - virSocketAddr addr; /* xmlattr */ +struct _virNetworkDNSForwarder { /* genparse:withhook, genformat */ char *domain; /* xmlattr */ + virSocketAddr addr; /* xmlattr */ }; =20 typedef struct _virNetworkDNSDef virNetworkDNSDef; --=20 2.25.1