From nobody Mon Feb 9 09:32:25 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=1585120408; cv=none; d=zohomail.com; s=zohoarc; b=jhck8b3NKqFeIDDI/iJk447VMwWhSliDPZPN8QBkja8/3gqwfjJG0XPtzs2b81gxt1/j9eL94Mt+6e5gMFBkjfUuo46tfm3OBB42kdKr0toKJZn41J8xgoRuOX2KoBnQHkI8ZueLzi4lrtcpjohbqrvy8p7sJ/NMU9Sbgwe9upQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585120408; 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=c21Q7y75RSNtbvWLoE/At/EqWFau/+bIi1tGjZ5RpGg=; b=IUyx8ELNn85HQR8G8wll2EUtWo8z2cCYcxN6iJPVCLfKy5vsebO1GbecaNRK7AW2F0tBQRz1goyEeSd0xPrnbuSnKAiwnUcnt0y4VRMrYAzGg7na9M9BOktMKNtUabRRuEE514+ScpIaXnSYH/uMop+dZSl7GY3dGBKojypm3K4= 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 1585120408285556.9650896536174; Wed, 25 Mar 2020 00:13:28 -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-303-qgZLf6B1NhCT5yc01Bm7WQ-1; Wed, 25 Mar 2020 03:13:24 -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 7E0D5DB62; Wed, 25 Mar 2020 07:13:17 +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 5086BA0A78; Wed, 25 Mar 2020 07:13:17 +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 E62201803C40; Wed, 25 Mar 2020 07:13:16 +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 02P7CTVE023871 for ; Wed, 25 Mar 2020 03:12:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id A01072037E56; Wed, 25 Mar 2020 07:12:29 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 994952037E4D for ; Wed, 25 Mar 2020 07:12:27 +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 B2822185A78F 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-487-AReMQG3POqC2KCAwB-j5pA-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--.408S9; Wed, 25 Mar 2020 15:12:20 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585120407; 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=c21Q7y75RSNtbvWLoE/At/EqWFau/+bIi1tGjZ5RpGg=; b=JaS6x6E0rXh+9tqaxWVXnsGgZPWJLfNj8AiktJ+QcV/G2vl5ZinkCy62+uEvf0tYwCy5Ev O4Rpb7SkWMsGvnbZ+znBN8hHS47sPu5gfc79wSNPkbs/EHPOZCj/oGjKJtl77rufgy0pRb De/gB1FNUUnoPZeRkGO+FxELHStOjUU= X-MC-Unique: qgZLf6B1NhCT5yc01Bm7WQ-1 X-MC-Unique: AReMQG3POqC2KCAwB-j5pA-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 07/29] util: Add some helper functions for virSocketAddr Date: Wed, 25 Mar 2020 15:11:47 +0800 Message-Id: <20200325071209.20841-8-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--.408S9 X-Coremail-Antispam: 1Uf129KBjvJXoWxWw1UurWrtry8Wr1rtFWkZwb_yoWrJryxpF 1rtr15XrW8tws3Zw4Iqr4Y9r1SvF18XayUXa4Uuw10kws5J3W5t3Wqqry3Gr18JFWjyF48 Xrn8CrWkC3W8KaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piv38rUUUUU= X-Originating-IP: [123.232.151.103] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiTBTxT1dqAGQzyAAAsE X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02P7CTVE023871 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 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add virSocketAddrParse, virSocketAddrFormat, virSocketAddrClear and virSocketAddrCheck. In generated codes by RNG2C, these functions are called for handling virSocketAddr. Signed-off-by: Shi Lei --- docs/schemas/basictypes.rng | 1 + src/util/virsocketaddr.c | 27 +++++++++++++++++++++++++++ src/util/virsocketaddr.h | 10 ++++++++++ 3 files changed, 38 insertions(+) diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index e602715..a6c3fc8 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -222,6 +222,7 @@ =20 + (((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9]= [0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-= 9])) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 4cad329..f502978 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -157,6 +157,11 @@ int virSocketAddrParse(virSocketAddrPtr addr, const ch= ar *val, int family) return len; } =20 +int virSocketAddrParseXML(const char *val, virSocketAddrPtr addr) +{ + return virSocketAddrParse(addr, val, AF_UNSPEC); +} + /** * virSocketAddrParseAny: * @addr: where to store the return value, optional. @@ -444,6 +449,22 @@ virSocketAddrFormat(const virSocketAddr *addr) return virSocketAddrFormatFull(addr, false, NULL); } =20 +int +virSocketAddrFormatBuf(virBufferPtr buf, + const char *fmt, + const virSocketAddr *addr) +{ + g_autofree char *str =3D NULL; + if (!VIR_SOCKET_ADDR_VALID(addr)) + return 0; + + str =3D virSocketAddrFormatFull(addr, false, NULL); + if (!str) + return -1; + + virBufferAsprintf(buf, fmt, str); + return 0; +} =20 /* * virSocketAddrFormatFull: @@ -1319,3 +1340,9 @@ virSocketAddrFree(virSocketAddrPtr addr) { VIR_FREE(addr); } + +void +virSocketAddrClear(virSocketAddrPtr addr) +{ + memset(addr, 0, sizeof(virSocketAddr)); +} diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index d06e751..f255107 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -18,6 +18,7 @@ =20 #pragma once =20 +#include "virbuffer.h" #include "virsocket.h" =20 #define VIR_LOOPBACK_IPV4_ADDR "127.0.0.1" @@ -44,6 +45,8 @@ typedef struct { #define VIR_SOCKET_ADDR_FAMILY(s) \ ((s)->data.sa.sa_family) =20 +#define virSocketAddrCheck VIR_SOCKET_ADDR_VALID + #define VIR_SOCKET_ADDR_IPV4_ALL "0.0.0.0" #define VIR_SOCKET_ADDR_IPV6_ALL "::" =20 @@ -70,6 +73,8 @@ int virSocketAddrParse(virSocketAddrPtr addr, const char *val, int family); =20 +int virSocketAddrParseXML(const char *val, virSocketAddrPtr addr); + int virSocketAddrParseAny(virSocketAddrPtr addr, const char *val, int family, @@ -93,6 +98,10 @@ char *virSocketAddrFormatFull(const virSocketAddr *addr, bool withService, const char *separator); =20 +int virSocketAddrFormatBuf(virBufferPtr buf, + const char *fmt, + const virSocketAddr *addr); + char *virSocketAddrGetPath(virSocketAddrPtr addr); =20 int virSocketAddrSetPort(virSocketAddrPtr addr, int port); @@ -145,5 +154,6 @@ int virSocketAddrPTRDomain(const virSocketAddr *addr, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); =20 void virSocketAddrFree(virSocketAddrPtr addr); +void virSocketAddrClear(virSocketAddrPtr addr); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSocketAddr, virSocketAddrFree); --=20 2.17.1