From nobody Mon Feb 9 10:29:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585120365; cv=none; d=zohomail.com; s=zohoarc; b=ZX8NL7Nk2F46bUrFAd0FXIu9kq+/vB0yjG7dVlR4L7oDUt1IhCEh7YCAHosKPFE5MLqIKP/xmK8QPxL12VPyBYu8ZyaZTlUK/iPDDYp0aubxV6HREh8NpLLkesPzYcs6NTrmprqVLf50njuTO/WcTQ2kAHtH5F9neZH5J2qwB1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585120365; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=zK4XXf0/eFFTCelc2He/o8IOTcbRaR7RQFDMbac5mN4=; b=Z19kdQF4Jb+x9mhAcRRjky8MMQKB5toXSHjSky6mKkb6XRfaXB6fshpEPOtSsbMSRygDkShrX1JVgnwHyOLX2TwrNiX+zshqejR/9+d00ZD4H+vdOv1mkv2hcQeN7ODpLKD52yQzcLnJUE0wVe7+kh2CcuV4frs6vg88G5O3EN0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1585120365664854.1404259042414; Wed, 25 Mar 2020 00:12:45 -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-201-7YYDDF1YOVmE2uqhi0h4kQ-1; Wed, 25 Mar 2020 03:12:42 -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 AD5A31005512; Wed, 25 Mar 2020 07:12:36 +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 39F0260BE0; Wed, 25 Mar 2020 07:12:36 +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 E199418095FF; Wed, 25 Mar 2020 07:12:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02P7CSvp023836 for ; Wed, 25 Mar 2020 03:12:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 10EEF2166B2C; Wed, 25 Mar 2020 07:12:28 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0D3322166B2B for ; Wed, 25 Mar 2020 07:12:28 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 E6E6E8001E4 for ; Wed, 25 Mar 2020 07:12:27 +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-484-dyxISAkmNuiTUv0yFeOLXw-1; Wed, 25 Mar 2020 03:12:24 -0400 Received: from localhost.localdomain (unknown [123.232.151.103]) by smtp4 (Coremail) with SMTP id JedpCgD3ftNNBHtey+koAw--.408S17; Wed, 25 Mar 2020 15:12:21 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585120364; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=zK4XXf0/eFFTCelc2He/o8IOTcbRaR7RQFDMbac5mN4=; b=IMEzd5TUleO2tFckkrWmiilSpLHsfucbXb3KMD6rl5A5+XSZhC7egfXy3AMmYUI/O+h1dp YeOnEaMVnob9COqsomPjSBqIMAjMe84kQyT4Z1FGgdO0GNxi5+LELf/q0uecgP07Q49Ira qmtsR+CKXTURiZW52SPssgxqWgP1oMA= X-MC-Unique: 7YYDDF1YOVmE2uqhi0h4kQ-1 X-MC-Unique: dyxISAkmNuiTUv0yFeOLXw-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 15/29] conf: Extract error-checking code from virNetworkDNSHostDefParseXML Date: Wed, 25 Mar 2020 15:11:55 +0800 Message-Id: <20200325071209.20841-16-shi_lei@massclouds.com> In-Reply-To: <20200325071209.20841-1-shi_lei@massclouds.com> References: <20200325071209.20841-1-shi_lei@massclouds.com> X-CM-TRANSID: JedpCgD3ftNNBHtey+koAw--.408S17 X-Coremail-Antispam: 1Uf129KBjvJXoWxWF17CFy8Wr13KFy8AFy8uFg_yoW5uw4kpF s3Ja90yrs7Wr1ay39rKr1FkwnxWrykJ345K34fuw1DZFyfWw18Grs3WryxWas8Gry5Zr45 AF43A398Kr4UA3JanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pifMa7UUUUU= X-Originating-IP: [123.232.151.103] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbigxXxT1sfnFFyHAABsO X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02P7CSvp023836 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 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Shi Lei --- docs/schemas/network.rng | 8 ++++++ src/conf/network_conf.c | 58 +++++++++++++++++++++++++++------------- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 919464d..ee4487e 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -336,6 +336,14 @@ diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 060d0e3..d9f2252 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -560,6 +560,40 @@ virNetworkDHCPDefParseXML(const char *networkName, } =20 =20 +static int +virNetworkDNSHostDefParseXMLPost(xmlNodePtr curnode G_GNUC_UNUSED, + virNetworkDNSHostDefPtr def, + const char *networkName, + bool partialOkay, + const char *ipStr, + int nHostnameNodes G_GNUC_UNUSED) +{ + if (!ipStr && !partialOkay) { + virReportError(VIR_ERR_XML_DETAIL, + _("Missing IP address in network '%s' DNS HOST reco= rd"), + networkName); + return -1; + } + + if (def->nnames =3D=3D 0 && !partialOkay) { + virReportError(VIR_ERR_XML_DETAIL, + _("Missing hostname in network '%s' DNS HOST record= "), + networkName); + return -1; + } + + if (!VIR_SOCKET_ADDR_VALID(&def->ip) && def->nnames =3D=3D 0) { + virReportError(VIR_ERR_XML_DETAIL, + _("Missing ip and hostname in network '%s' DNS HOST= record"), + networkName); + return -1; + } + + return 0; +} + + +/* virNetworkDNSHostDefParseXML will be replaced by generated namesake */ static int virNetworkDNSHostDefParseXML(const char *networkName, xmlNodePtr node, @@ -569,13 +603,7 @@ virNetworkDNSHostDefParseXML(const char *networkName, xmlNodePtr cur; char *ip; =20 - if (!(ip =3D virXMLPropString(node, "ip")) && !partialOkay) { - virReportError(VIR_ERR_XML_DETAIL, - _("Missing IP address in network '%s' DNS HOST reco= rd"), - networkName); - goto error; - } - + ip =3D virXMLPropString(node, "ip"); if (ip && (virSocketAddrParse(&def->ip, ip, AF_UNSPEC) < 0)) { virReportError(VIR_ERR_XML_DETAIL, _("Invalid IP address in network '%s' DNS HOST reco= rd"), @@ -583,7 +611,6 @@ virNetworkDNSHostDefParseXML(const char *networkName, VIR_FREE(ip); goto error; } - VIR_FREE(ip); =20 cur =3D node->children; while (cur !=3D NULL) { @@ -606,23 +633,16 @@ virNetworkDNSHostDefParseXML(const char *networkName, } cur =3D cur->next; } - if (def->nnames =3D=3D 0 && !partialOkay) { - virReportError(VIR_ERR_XML_DETAIL, - _("Missing hostname in network '%s' DNS HOST record= "), - networkName); - goto error; - } =20 - if (!VIR_SOCKET_ADDR_VALID(&def->ip) && def->nnames =3D=3D 0) { - virReportError(VIR_ERR_XML_DETAIL, - _("Missing ip and hostname in network '%s' DNS HOST= record"), - networkName); + if (virNetworkDNSHostDefParseXMLPost(node, def, networkName, + partialOkay, ip, def->nnames) < 0) goto error; - } =20 + VIR_FREE(ip); return 0; =20 error: + VIR_FREE(ip); virNetworkDNSHostDefClear(def); return -1; } --=20 2.17.1