From nobody Mon Feb 9 11:46:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591752441; cv=none; d=zohomail.com; s=zohoarc; b=PMwp0TXL/ny5m3S0acXYOcCVt/nFUSGs1A2p/ny4QOwHTZyGYIBuboS9Khtekj1OAgoAuGGaQri4cF+lVjzggzZYFVNaFUR2NVZJJVGrLzklcQkk1R3rUB/O/AY/T0yf7Rdf5kS85o1z1Nb7RzMDEP7+KQVVlA3VJFj7Wmm9PeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591752441; 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=TxAMgBCVW8NiySyECfsUQ6tgoeESIC9jea54PRd1eaQ=; b=imP4RDCQtak0CuA/wDjHqOTTMT3CNG9oJdHUjoM9WJx/NW2b/ntY11xTna1OtvT8tj1to+Naog+YEydkTFlrLSdyjvpzy6KHVBcJelTbsnJQ2m+TW+MxLnEs4UlhzC8qQh1QSnJX/k0lNPmBPDWdiCkbY2weMleF65ZhO7mE8x0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1591752441276496.8299384734803; Tue, 9 Jun 2020 18:27:21 -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-456-bCUtt-a5OWm6AgOTO26Rew-1; Tue, 09 Jun 2020 21:27:16 -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 6FFF6464; Wed, 10 Jun 2020 01:27:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 501947F4E5; Wed, 10 Jun 2020 01:27:11 +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 22C71180531F; 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 05A1R9Gu027508 for ; Tue, 9 Jun 2020 21:27:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 911D02026E1C; Wed, 10 Jun 2020 01:27:09 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8CC472026D5D for ; Wed, 10 Jun 2020 01:27:09 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 7335A8007A4 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-76-9meTNfVFNYe76wo2awidVA-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--.7295S22; Wed, 10 Jun 2020 09:21:53 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591752439; 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=TxAMgBCVW8NiySyECfsUQ6tgoeESIC9jea54PRd1eaQ=; b=gGnLCCUbwcLbI6BlkBXbKuPP17gqGWErIpyDVnlKfDnADFck1Ym6YRjn/1749B2n0qwcUQ PXmyFtclMB5BkXRpx+9SSBY3yZgQx71q/JOl1i/4pFVrkwTOVK2PrU0Ex4aaa5vSTVxEWP osjWzLm8JDBbN2qHG7lkROQskNqKRsc= X-MC-Unique: bCUtt-a5OWm6AgOTO26Rew-1 X-MC-Unique: 9meTNfVFNYe76wo2awidVA-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 20/21] conf: Replace virNetworkDNSDefParseXML(hardcoded) with namesake(generated) Date: Wed, 10 Jun 2020 09:20:48 +0800 Message-Id: <20200610012049.10774-21-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--.7295S22 X-Coremail-Antispam: 1Uf129KBjvJXoW3Ary3ZFWUJF4kXF4rXry5Arb_yoW3CFy5pF n5X3Z0krWrWFnagrWIvw4Fkrs8uFykJFW5Kr97u3srZw1UGw1fCr1xuryxZFs8WrWYvr43 A3Wagrs8Gw4UGF7anT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0p_q2NtUUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiWhE-T1f4pkbTgAAAsn 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.11 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 | 178 +----------------------------------- src/conf/network_conf.h | 16 ++-- src/network/bridge_driver.c | 2 +- 3 files changed, 14 insertions(+), 182 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 4c0751f..db2b75f 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -174,32 +174,6 @@ virNetworkIPDefClear(virNetworkIPDefPtr def) } =20 =20 -static void -virNetworkDNSDefClear(virNetworkDNSDefPtr def) -{ - if (def->forwarders) { - while (def->nfwds) - virNetworkDNSForwarderClear(&def->forwarders[--def->nfwds]); - VIR_FREE(def->forwarders); - } - if (def->txts) { - while (def->ntxts) - virNetworkDNSTxtDefClear(&def->txts[--def->ntxts]); - VIR_FREE(def->txts); - } - if (def->hosts) { - while (def->nhosts) - virNetworkDNSHostDefClear(&def->hosts[--def->nhosts]); - VIR_FREE(def->hosts); - } - if (def->srvs) { - while (def->nsrvs) - virNetworkDNSSrvDefClear(&def->srvs[--def->nsrvs]); - VIR_FREE(def->srvs); - } -} - - static void virNetworkForwardDefClear(virNetworkForwardDefPtr def) { @@ -900,7 +874,7 @@ virNetworkDNSForwarderParseXMLHook(xmlNodePtr node G_GN= UC_UNUSED, } =20 =20 -static int +int virNetworkDNSDefParseXMLHook(xmlNodePtr node G_GNUC_UNUSED, virNetworkDNSDefPtr def, const char *networkName, @@ -924,148 +898,6 @@ virNetworkDNSDefParseXMLHook(xmlNodePtr node G_GNUC_U= NUSED, } =20 =20 -static int -virNetworkDNSDefParseXML(const char *networkName, - xmlNodePtr node, - xmlXPathContextPtr ctxt, - virNetworkDNSDefPtr def) -{ - xmlNodePtr *hostNodes =3D NULL; - xmlNodePtr *srvNodes =3D NULL; - xmlNodePtr *txtNodes =3D NULL; - xmlNodePtr *fwdNodes =3D NULL; - char *forwardPlainNames =3D NULL; - char *enable =3D NULL; - int nhosts, nsrvs, ntxts, nfwds; - size_t i; - int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); - - ctxt->node =3D node; - - enable =3D virXPathString("string(./@enable)", ctxt); - if (enable) { - def->enable =3D virTristateBoolTypeFromString(enable); - if (def->enable <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid dns enable setting '%s' " - "in network '%s'"), - enable, networkName); - goto cleanup; - } - } - - forwardPlainNames =3D virXPathString("string(./@forwardPlainNames)", c= txt); - if (forwardPlainNames) { - def->forwardPlainNames =3D virTristateBoolTypeFromString(forwardPl= ainNames); - if (def->forwardPlainNames <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid dns forwardPlainNames setting '%s' " - "in network '%s'"), - forwardPlainNames, networkName); - goto cleanup; - } - } - - nfwds =3D virXPathNodeSet("./forwarder", ctxt, &fwdNodes); - if (nfwds < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid element found in of ne= twork %s"), - networkName); - goto cleanup; - } - if (nfwds > 0) { - if (VIR_ALLOC_N(def->forwarders, nfwds) < 0) - goto cleanup; - - for (i =3D 0; i < nfwds; i++) { - if (virNetworkDNSForwarderParseXML(fwdNodes[i], - &def->forwarders[i], - networkName, - NULL) < 0) - goto cleanup; - - def->nfwds++; - } - } - - nhosts =3D virXPathNodeSet("./host", ctxt, &hostNodes); - if (nhosts < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid element found in of network= %s"), - networkName); - goto cleanup; - } - if (nhosts > 0) { - if (VIR_ALLOC_N(def->hosts, nhosts) < 0) - goto cleanup; - - for (i =3D 0; i < nhosts; i++) { - if (virNetworkDNSHostDefParseXML(hostNodes[i], &def->hosts[def= ->nhosts], - networkName, NULL) < 0) { - goto cleanup; - } - def->nhosts++; - } - } - - nsrvs =3D virXPathNodeSet("./srv", ctxt, &srvNodes); - if (nsrvs < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid element found in of network = %s"), - networkName); - goto cleanup; - } - if (nsrvs > 0) { - if (VIR_ALLOC_N(def->srvs, nsrvs) < 0) - goto cleanup; - - for (i =3D 0; i < nsrvs; i++) { - if (virNetworkDNSSrvDefParseXML(srvNodes[i], &def->srvs[def->n= srvs], - networkName, NULL) < 0) { - goto cleanup; - } - def->nsrvs++; - } - } - - ntxts =3D virXPathNodeSet("./txt", ctxt, &txtNodes); - if (ntxts < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid element found in of network = %s"), - networkName); - goto cleanup; - } - if (ntxts > 0) { - if (VIR_ALLOC_N(def->txts, ntxts) < 0) - goto cleanup; - - for (i =3D 0; i < ntxts; i++) { - if (virNetworkDNSTxtDefParseXML(txtNodes[i], &def->txts[def->n= txts], - networkName, NULL) < 0) - goto cleanup; - - def->ntxts++; - } - } - - if (virNetworkDNSDefParseXMLHook(node, def, networkName, NULL, - enable, forwardPlainNames, - ntxts, nhosts, nsrvs, nfwds) < 0) - goto cleanup; - - ret =3D 0; - cleanup: - VIR_FREE(enable); - VIR_FREE(forwardPlainNames); - VIR_FREE(fwdNodes); - VIR_FREE(hostNodes); - VIR_FREE(srvNodes); - VIR_FREE(txtNodes); - return ret; -} - - static int virNetworkIPDefParseXML(const char *networkName, xmlNodePtr node, @@ -1852,7 +1684,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, =20 dnsNode =3D virXPathNode("./dns", ctxt); if (dnsNode !=3D NULL && - virNetworkDNSDefParseXML(def->name, dnsNode, ctxt, &def->dns) < 0)= { ++ virNetworkDNSDefParseXML(dnsNode, &def->dns, def->name, NULL) < 0= ) { goto error; } =20 @@ -2198,7 +2030,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, { size_t i; =20 - if (!(def->enable || def->forwardPlainNames || def->nfwds || def->nhos= ts || + if (!(def->enable || def->forwardPlainNames || def->nforwarders || def= ->nhosts || def->nsrvs || def->ntxts)) return 0; =20 @@ -2225,7 +2057,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, } virBufferAsprintf(buf, " forwardPlainNames=3D'%s'", fwd); } - if (!(def->nfwds || def->nhosts || def->nsrvs || def->ntxts)) { + if (!(def->nforwarders || def->nhosts || def->nsrvs || def->ntxts)) { virBufferAddLit(buf, "/>\n"); return 0; } @@ -2233,7 +2065,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); =20 - for (i =3D 0; i < def->nfwds; i++) { + for (i =3D 0; i < def->nforwarders; i++) { if (virNetworkDNSForwarderFormatBuf(buf, "forwarder", &def->forwarders[i], NULL) < 0) return -1; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 1313c3e..462d97d 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -165,17 +165,17 @@ struct _virNetworkDNSForwarder { /* genparse:withh= ook, genformat */ =20 typedef struct _virNetworkDNSDef virNetworkDNSDef; typedef virNetworkDNSDef *virNetworkDNSDefPtr; -struct _virNetworkDNSDef { - int enable; /* enum virTristateBool */ - int forwardPlainNames; /* enum virTristateBool */ +struct _virNetworkDNSDef { /* genparse:withhook */ + virTristateBool enable; /* xmlattr */ + virTristateBool forwardPlainNames; /* xmlattr */ size_t ntxts; - virNetworkDNSTxtDefPtr txts; + virNetworkDNSTxtDefPtr txts; /* xmlelem, array */ size_t nhosts; - virNetworkDNSHostDefPtr hosts; + virNetworkDNSHostDefPtr hosts; /* xmlelem, array */ size_t nsrvs; - virNetworkDNSSrvDefPtr srvs; - size_t nfwds; - virNetworkDNSForwarderPtr forwarders; + virNetworkDNSSrvDefPtr srvs; /* xmlelem, array */ + size_t nforwarders; + virNetworkDNSForwarderPtr forwarders; /* xmlelem, array */ }; =20 typedef struct _virNetworkIPDef virNetworkIPDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 47d5d95..6e09174 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1139,7 +1139,7 @@ networkDnsmasqConfContents(virNetworkObjPtr obj, */ bool addNoResolv =3D false; =20 - for (i =3D 0; i < def->dns.nfwds; i++) { + for (i =3D 0; i < def->dns.nforwarders; i++) { virNetworkDNSForwarderPtr fwd =3D &def->dns.forwarders[i]; =20 virBufferAddLit(&configbuf, "server=3D"); --=20 2.17.1