From nobody Thu Sep 19 01:10:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 171596826253521.548239395834116; Fri, 17 May 2024 10:51:02 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 791CA1925; Fri, 17 May 2024 13:51:01 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 765BE1A05; Fri, 17 May 2024 13:31:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D911319C6; Fri, 17 May 2024 13:30:18 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4A51319DA for ; Fri, 17 May 2024 13:30:12 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-468-GIKQfMjVNauqdPNNR3Q34A-1; Fri, 17 May 2024 13:30:10 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 558AA3C3C323 for ; Fri, 17 May 2024 17:30:10 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.22.16.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F3B640C6EB7 for ; Fri, 17 May 2024 17:30:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715967012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iWzJswwmFg2+VL86patT5J5oNF7fctCrlKFhGhLCqmg=; b=Fnajavjdc+SJtRUTTdltJ+cAq9AoqrTzeiVP9p0Csf6li0dt63qzgE3DypJJ+bx85K92eH EpP6T3lftx8+irDEnKwvSBRyvcCV3m4dst3eYS6l0QfH+0Wx7yaMY1qy4rhF6mLFFC0tYO QJGHEQDHkCK1e0c0YLtdr9VgiSZI5uY= X-MC-Unique: GIKQfMjVNauqdPNNR3Q34A-1 From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH v5 17/30] util: add name attribute to virFirewall Date: Fri, 17 May 2024 13:29:54 -0400 Message-ID: <20240517173007.8125-18-laine@redhat.com> In-Reply-To: <20240517173007.8125-1-laine@redhat.com> References: <20240517173007.8125-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UHJZLCTELX3B7YYSDBLAKD2AJBHRQZGR X-Message-ID-Hash: UHJZLCTELX3B7YYSDBLAKD2AJBHRQZGR X-MailFrom: laine@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1715968262917100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This will be used to label (via "name=3D'blah'") a firewall when it is formatted to XML and written to the network status. Signed-off-by: Laine Stump Reviewed-by: Daniel P. Berrang=C3=A9 --- src/libvirt_private.syms | 2 ++ src/util/virfirewall.c | 20 +++++++++++++++++++- src/util/virfirewall.h | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 893859caba..9897caea21 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2417,8 +2417,10 @@ virFirewallCmdGetArgCount; virFirewallCmdToString; virFirewallFree; virFirewallGetBackend; +virFirewallGetName; virFirewallNew; virFirewallRemoveCmd; +virFirewallSetName; virFirewallStartRollback; virFirewallStartTransaction; =20 diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index b9b4140ad6..fe8c09c0ed 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -78,6 +78,7 @@ struct _virFirewallGroup { struct _virFirewall { int err; =20 + char *name; size_t ngroups; virFirewallGroup **groups; size_t currentGroup; @@ -119,6 +120,22 @@ virFirewallGetBackend(virFirewall *firewall) } =20 =20 +const char * +virFirewallGetName(virFirewall *firewall) +{ + return firewall->name; +} + + +void +virFirewallSetName(virFirewall *firewall, + const char *name) +{ + g_free(firewall->name); + firewall->name =3D g_strdup(name); +} + + static void virFirewallCmdFree(virFirewallCmd *fwCmd) { @@ -169,8 +186,9 @@ void virFirewallFree(virFirewall *firewall) =20 for (i =3D 0; i < firewall->ngroups; i++) virFirewallGroupFree(firewall->groups[i]); - g_free(firewall->groups); =20 + g_free(firewall->groups); + g_free(firewall->name); g_free(firewall); } =20 diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index e6aac365f1..e8ad81056f 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -46,6 +46,8 @@ VIR_ENUM_DECL(virFirewallBackend); virFirewall *virFirewallNew(virFirewallBackend backend); void virFirewallFree(virFirewall *firewall); virFirewallBackend virFirewallGetBackend(virFirewall *firewall); +const char *virFirewallGetName(virFirewall *firewall); +void virFirewallSetName(virFirewall *firewall, const char *name); =20 /** * virFirewallAddCmd: --=20 2.45.0