From nobody Mon Feb 9 23:39:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617880831; cv=none; d=zohomail.com; s=zohoarc; b=D7C+MdNU2Ulx30607K/PaPUWmgSj+rcbt6rUIyXK6InNJweJ17asybDCRy9GaJa4uhOp2HyWMGAMPrtgbdKhiHP1LnvEb9MYFuHT5xMDVusfYSvIJyLFZS0IrvCTKkubHmb3mYJvkBa8M6v7IbhZBVrglLr8MjdsQCBi8p3BA4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617880831; h=Content-Type:Content-Transfer-Encoding:Cc: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=5mwLGNYDzRWVBV9UUqJr/JKglTHhpuujhLTYBsWpo4o=; b=CX2uJAqShz1kfKiBc/5gnCO9aMYsBUKOI/006oCGtFFGvRhJd/5g7IBqW8IMK8juctCCQWNS+dOml9qoWpQLFO3vmomVSvTVitJGu12P1CqlVJ4AUEUwykMMCCE4BlIEbmmR2UDGE1jW0eufDvtKGpfDZ+QSSbs/NkEQrDV1OW0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1617880831878107.95902246957769; Thu, 8 Apr 2021 04:20:31 -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-268-YBtOKnQdPxmkQL94uK_nLQ-1; Thu, 08 Apr 2021 07:20:28 -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 0CCE9107ACC7; Thu, 8 Apr 2021 11:20:22 +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 D9ACF690F7; Thu, 8 Apr 2021 11:20:21 +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 9EDD55534B; Thu, 8 Apr 2021 11:20:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 138BKJjW009454 for ; Thu, 8 Apr 2021 07:20:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 923904DA32; Thu, 8 Apr 2021 11:20:19 +0000 (UTC) Received: from work.redhat.com (ovpn-112-196.ams2.redhat.com [10.36.112.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 144075C1C4; Thu, 8 Apr 2021 11:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617880830; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=5mwLGNYDzRWVBV9UUqJr/JKglTHhpuujhLTYBsWpo4o=; b=bCj4TB+WPZLXFG3vBTp60+awotdXtuO5w6k2W7PzNqPTIKNG+pTD4TzjDRNEL1Y4I2fACl 3AyrzPKj4mdiIRagDMhmN2yhOHfVfqjHh/Ex7npcmerZ3nz1ZENm/TLUDWqj+Y3b41g2SH Vl5Oem8UseVj/HMceWXyz2R958LJhV8= X-MC-Unique: YBtOKnQdPxmkQL94uK_nLQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v5 6/8] virNetworkForwardNatDefParseXML: Use virXMLProp* Date: Thu, 8 Apr 2021 13:19:56 +0200 Message-Id: <20210408111958.32678-7-twiederh@redhat.com> In-Reply-To: <20210408111958.32678-1-twiederh@redhat.com> References: <20210408111958.32678-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/network_conf.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 4cf4aa4840..19b84cbdd1 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1321,7 +1321,6 @@ virNetworkForwardNatDefParseXML(const char *networkNa= me, g_autofree xmlNodePtr *natPortNodes =3D NULL; g_autofree char *addrStart =3D NULL; g_autofree char *addrEnd =3D NULL; - g_autofree char *ipv6 =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; @@ -1333,18 +1332,9 @@ virNetworkForwardNatDefParseXML(const char *networkN= ame, return -1; } =20 - ipv6 =3D virXMLPropString(node, "ipv6"); - if (ipv6) { - int natIPv6; - if ((natIPv6 =3D virTristateBoolTypeFromString(ipv6)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid ipv6 setting '%s' " - "in network '%s' NAT"), - ipv6, networkName); - return -1; - } - def->natIPv6 =3D natIPv6; - } + if (virXMLPropTristateBool(node, "ipv6", VIR_XML_PROP_OPTIONAL, + &def->natIPv6) < 0) + return -1; =20 /* addresses for SNAT */ nNatAddrs =3D virXPathNodeSet("./address", ctxt, &natAddrNodes); --=20 2.26.2