From nobody Mon Feb 9 21:36:51 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; dkim=pass; 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=1591752444; cv=none; d=zohomail.com; s=zohoarc; b=GeJ78w0rPWc7a/hOSLt82dxL9jTlabuwcTSQW5BrADJFs+GnZ9pHh03yJ3zJrAWUQyQ5oA26DTZ3rD2FyXMTIgthrj3fUTIJGA1QIaiLnSNrR7fuoVwRNOq+f/TOCCukgFsYHhyASD6jClOPzHuS8BZ7cQZYo67GsKbsizqgYc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591752444; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=orKlLOYbtoj8KHQ4LAOrzX6FQk6DYMZkgMjeZ+ocfOE=; b=Vjop+ytmr8K6R1DXIhqUjesmHvjdyDbiJQNnOwfQn7e5Iwbq+i7rzGcdqeUDLCaYp7RUEbdIpR8uyA3qoKOsX4QpL39Ft6IKZgPenWAU00+4+bfxlIvVgxyDiBefj6NCzuvDKWBJ5ERxbDMtYlr4LwNeEY2RL0wJOq8KbFBlb74= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1591752444118264.49955120169545; Tue, 9 Jun 2020 18:27:24 -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-95--mkRPgkpPGKEOJwwaL2lgA-1; Tue, 09 Jun 2020 21:27:17 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5872B1883600; Wed, 10 Jun 2020 01:27:12 +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 37B0A9F4B; Wed, 10 Jun 2020 01:27:12 +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 CC1CDB34BC; Wed, 10 Jun 2020 01:27:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05A1RAd2027514 for ; Tue, 9 Jun 2020 21:27:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id DD65B2026FFE; Wed, 10 Jun 2020 01:27:09 +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 D945C2026D5D for ; Wed, 10 Jun 2020 01:27:09 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 B78BA80522B for ; Wed, 10 Jun 2020 01:27:09 +0000 (UTC) Received: from mail-m24147.qiye.163.com (mail-m24147.qiye.163.com [220.194.24.147]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-19-m-f5r00OODGDooOpoflk2g-1; Tue, 09 Jun 2020 21:27:06 -0400 Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp4 (Coremail) with SMTP id JedpCgCnxdh_NeBeVKS4Bw--.7295S20; Wed, 10 Jun 2020 09:21:49 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591752442; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:content-type:content-type: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=orKlLOYbtoj8KHQ4LAOrzX6FQk6DYMZkgMjeZ+ocfOE=; b=UaQaDqTfZkI4TV/O7hwL1LBFl7FJEOn974aXgCM77CaTscCeWCJuHjArbUStvWpVnIK1MP xkTIUwC2QLB5Z5Eys5t9Ca898F9EiuU3FzX2jTigvasUUItTGp127JGncJA9GHlAKQfueq Iy+mgfrZBMiPfFWfyKshNq1LB4yOB18= X-MC-Unique: -mkRPgkpPGKEOJwwaL2lgA-1 X-MC-Unique: m-f5r00OODGDooOpoflk2g-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 18/21] conf: Generate virNetworkDNSForwarderFormatBuf Date: Wed, 10 Jun 2020 09:20:46 +0800 Message-Id: <20200610012049.10774-19-shi_lei@massclouds.com> In-Reply-To: <20200610012049.10774-1-shi_lei@massclouds.com> References: <20200610012049.10774-1-shi_lei@massclouds.com> X-CM-TRANSID: JedpCgCnxdh_NeBeVKS4Bw--.7295S20 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTRpE_MDUUUU X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiWQ0-T1f4pmFcRgAAsW X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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.12 X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Shi Lei --- src/conf/network_conf.c | 21 ++++----------------- src/conf/network_conf.h | 4 ++-- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 8610fbc..3b93772 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -886,8 +886,8 @@ virNetworkDNSForwarderParseXMLHook(xmlNodePtr node G_GN= UC_UNUSED, virNetworkDNSForwarderPtr def, const char *instname G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED, - const char *addr, - const char *domain G_GNUC_UNUSED) + const char *domain G_GNUC_UNUSED, + const char *addr) { if (!(addr || def->domain)) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -2213,22 +2213,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)) { - char *addr =3D virSocketAddrFormat(&def->forwarders[i].addr); - - if (!addr) + if (virNetworkDNSForwarderFormatBuf(buf, "forwarder", + &def->forwarders[i], NULL) < 0) return -1; - - virBufferAsprintf(buf, " addr=3D'%s'", addr); - VIR_FREE(addr); - } - virBufferAddLit(buf, "/>\n"); } =20 for (i =3D 0; i < def->ntxts; i++) { diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index f14eef2..1313c3e 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.17.1