From nobody Wed May 14 08:54:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526039884083476.45297106307964; Fri, 11 May 2018 04:58:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4989C300174D; Fri, 11 May 2018 11:58:02 +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 124F399344; Fri, 11 May 2018 11:58:02 +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 AC5891801248; Fri, 11 May 2018 11:58:01 +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 w4BBvt26025392 for ; Fri, 11 May 2018 07:57:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 364042026DFD; Fri, 11 May 2018 11:57:55 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44C89202660C for ; Fri, 11 May 2018 11:57:54 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 13:57:44 +0200 Message-Id: <20180511115751.9406-2-kkoukiou@redhat.com> In-Reply-To: <20180511115751.9406-1-kkoukiou@redhat.com> References: <20180511115751.9406-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 1/8] Introduce NWFilter Interface 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 11 May 2018 11:58:02 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- data/Makefile.am | 1 + data/org.libvirt.NWFilter.xml | 7 +++++ src/Makefile.am | 1 + src/connect.c | 6 ++++ src/connect.h | 1 + src/nwfilter.c | 65 +++++++++++++++++++++++++++++++++++++++= ++++ src/nwfilter.h | 9 ++++++ src/util.c | 32 +++++++++++++++++++++ src/util.h | 15 ++++++++++ 9 files changed, 137 insertions(+) create mode 100644 data/org.libvirt.NWFilter.xml create mode 100644 src/nwfilter.c create mode 100644 src/nwfilter.h diff --git a/data/Makefile.am b/data/Makefile.am index 5a085cd..fdec857 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -22,6 +22,7 @@ interfaces_files =3D \ org.libvirt.Connect.xml \ org.libvirt.Domain.xml \ org.libvirt.Network.xml \ + org.libvirt.NWFilter.xml \ org.libvirt.Secret.xml \ org.libvirt.StoragePool.xml interfacesdir =3D $(DBUS_INTERFACES_DIR) diff --git a/data/org.libvirt.NWFilter.xml b/data/org.libvirt.NWFilter.xml new file mode 100644 index 0000000..c025d30 --- /dev/null +++ b/data/org.libvirt.NWFilter.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/Makefile.am b/src/Makefile.am index 6b2887b..22128c2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ DAEMON_SOURCES =3D \ events.c events.h \ gdbus.c gdbus.h \ network.c network.h \ + nwfilter.c nwfilter.h \ secret.c secret.h \ storagepool.c storagepool.h =20 diff --git a/src/connect.c b/src/connect.c index 0b33bc5..136f7ae 100644 --- a/src/connect.c +++ b/src/connect.c @@ -2,6 +2,7 @@ #include "domain.h" #include "events.h" #include "network.h" +#include "nwfilter.h" #include "secret.h" #include "storagepool.h" #include "util.h" @@ -1394,6 +1395,7 @@ virtDBusConnectFree(virtDBusConnect *connect) =20 g_free(connect->domainPath); g_free(connect->networkPath); + g_free(connect->nwfilterPath); g_free(connect->secretPath); g_free(connect->storagePoolPath); g_free(connect); @@ -1451,6 +1453,10 @@ virtDBusConnectNew(virtDBusConnect **connectp, if (error && *error) return; =20 + virtDBusNWFilterRegister(connect, error); + if (error && *error) + return; + virtDBusSecretRegister(connect, error); if (error && *error) return; diff --git a/src/connect.h b/src/connect.h index 08e1b68..fe672ed 100644 --- a/src/connect.h +++ b/src/connect.h @@ -14,6 +14,7 @@ struct virtDBusConnect { const gchar *connectPath; gchar *domainPath; gchar *networkPath; + gchar *nwfilterPath; gchar *secretPath; gchar *storagePoolPath; virConnectPtr connection; diff --git a/src/nwfilter.c b/src/nwfilter.c new file mode 100644 index 0000000..4d20162 --- /dev/null +++ b/src/nwfilter.c @@ -0,0 +1,65 @@ +#include "nwfilter.h" +#include "util.h" + +#include + +static virtDBusGDBusPropertyTable virtDBusNWFilterPropertyTable[] =3D { + { 0 } +}; + +static virtDBusGDBusMethodTable virtDBusNWFilterMethodTable[] =3D { + { 0 } +}; + +static gchar ** +virtDBusNWFilterEnumerate(gpointer userData) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNWFilterPtr) nwfilters =3D NULL; + gint num =3D 0; + gchar **ret =3D NULL; + + if (!virtDBusConnectOpen(connect, NULL)) + return NULL; + + num =3D virConnectListAllNWFilters(connect->connection, &nwfilters, 0); + if (num < 0) + return NULL; + + if (num =3D=3D 0) + return NULL; + + ret =3D g_new0(gchar *, num + 1); + + for (gint i =3D 0; i < num; i++) { + ret[i] =3D virtDBusUtilBusPathForVirNWFilter(nwfilters[i], + connect->nwfilterPath); + } + + return ret; +} + +static GDBusInterfaceInfo *interfaceInfo; + +void +virtDBusNWFilterRegister(virtDBusConnect *connect, + GError **error) +{ + connect->nwfilterPath =3D g_strdup_printf("%s/nwfilter", + connect->connectPath); + + if (!interfaceInfo) { + interfaceInfo =3D virtDBusGDBusLoadIntrospectData(VIRT_DBUS_NWFILT= ER_INTERFACE, + error); + if (!interfaceInfo) + return; + } + + virtDBusGDBusRegisterSubtree(connect->bus, + connect->nwfilterPath, + interfaceInfo, + virtDBusNWFilterEnumerate, + virtDBusNWFilterMethodTable, + virtDBusNWFilterPropertyTable, + connect); +} diff --git a/src/nwfilter.h b/src/nwfilter.h new file mode 100644 index 0000000..7afd27f --- /dev/null +++ b/src/nwfilter.h @@ -0,0 +1,9 @@ +#pragma once + +#include "connect.h" + +#define VIRT_DBUS_NWFILTER_INTERFACE "org.libvirt.NWFilter" + +void +virtDBusNWFilterRegister(virtDBusConnect *connect, + GError **error); diff --git a/src/util.c b/src/util.c index 9dd901c..f6aa210 100644 --- a/src/util.c +++ b/src/util.c @@ -247,6 +247,38 @@ virtDBusUtilVirNetworkListFree(virNetworkPtr *networks) g_free(networks); } =20 +virNWFilterPtr +virtDBusUtilVirNWFilterFromBusPath(virConnectPtr connection, + const gchar *path, + const gchar *nwfilterPath) +{ + g_autofree gchar *name =3D NULL; + gsize prefixLen =3D strlen(nwfilterPath) + 1; + + name =3D virtDBusUtilDecodeUUID(path+prefixLen); + + return virNWFilterLookupByUUIDString(connection, name); +} + +gchar * +virtDBusUtilBusPathForVirNWFilter(virNWFilterPtr nwfilter, + const gchar *nwfilterPath) +{ + gchar uuid[VIR_UUID_STRING_BUFLEN] =3D ""; + g_autofree gchar *newUuid =3D NULL; + virNWFilterGetUUIDString(nwfilter, uuid); + newUuid =3D virtDBusUtilEncodeUUID(uuid); + return g_strdup_printf("%s/%s", nwfilterPath, newUuid); +} + +void +virtDBusUtilVirNWFilterListFree(virNWFilterPtr *nwfilters) +{ + for (gint i =3D 0; nwfilters[i] !=3D NULL; i++) + virNWFilterFree(nwfilters[i]); + + g_free(nwfilters); +} void virtDBusUtilStringListFree(virtDBusCharArray *item) { diff --git a/src/util.h b/src/util.h index 2f37933..09546e3 100644 --- a/src/util.h +++ b/src/util.h @@ -72,6 +72,21 @@ virtDBusUtilVirNetworkListFree(virNetworkPtr *networks); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetwork, virNetworkFree); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkPtr, virtDBusUtilVirNetworkListFre= e); =20 +virNWFilterPtr +virtDBusUtilVirNWFilterFromBusPath(virConnectPtr connection, + const gchar *path, + const gchar *nwfilterPath); + +gchar * +virtDBusUtilBusPathForVirNWFilter(virNWFilterPtr nwfilter, + const gchar *nwfilterPath); + +void +virtDBusUtilVirNWFilterListFree(virNWFilterPtr *nwfilters); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNWFilter, virNWFilterFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNWFilterPtr, virtDBusUtilVirNWFilterListF= ree); + typedef gchar *virtDBusCharArray; =20 void --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list