From nobody Mon Dec 15 03:23:04 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522924833333593.6043283833073; Thu, 5 Apr 2018 03:40:33 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 87681356FF; Thu, 5 Apr 2018 10:40:31 +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 5B4DB6A251; Thu, 5 Apr 2018 10:40:31 +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 0E1611800CAB; Thu, 5 Apr 2018 10:40:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w35AePaL003462 for ; Thu, 5 Apr 2018 06:40:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1D705AB3E4; Thu, 5 Apr 2018 10:40:25 +0000 (UTC) Received: from katerina.brq.redhat.com (ovpn-204-29.brq.redhat.com [10.40.204.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5B89AB3E2 for ; Thu, 5 Apr 2018 10:40:24 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 12:40:17 +0200 Message-Id: <20180405104020.18545-2-kkoukiou@redhat.com> In-Reply-To: <20180405104020.18545-1-kkoukiou@redhat.com> References: <20180405104020.18545-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH v3 1/4] Introduce Network 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 05 Apr 2018 10:40:32 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou --- data/Makefile.am | 3 ++- data/org.libvirt.Network.xml | 7 +++++ src/Makefile.am | 3 ++- src/connect.c | 6 +++++ src/connect.h | 1 + src/network.c | 64 ++++++++++++++++++++++++++++++++++++++++= ++++ src/network.h | 9 +++++++ src/util.c | 33 +++++++++++++++++++++++ src/util.h | 15 +++++++++++ 9 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 data/org.libvirt.Network.xml create mode 100644 src/network.c create mode 100644 src/network.h diff --git a/data/Makefile.am b/data/Makefile.am index dd60713..61702df 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -20,7 +20,8 @@ polkit_DATA =3D $(polkit_files:.rules.in=3D.rules) =20 interfaces_files =3D \ org.libvirt.Connect.xml \ - org.libvirt.Domain.xml + org.libvirt.Domain.xml \ + org.libvirt.Network.xml interfacesdir =3D $(DBUS_INTERFACES_DIR) interfaces_DATA =3D $(interfaces_files) =20 diff --git a/data/org.libvirt.Network.xml b/data/org.libvirt.Network.xml new file mode 100644 index 0000000..2b7c4f7 --- /dev/null +++ b/data/org.libvirt.Network.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/Makefile.am b/src/Makefile.am index 7248561..158398a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,8 @@ DAEMON_SOURCES =3D \ util.c util.h \ domain.c domain.h \ events.c events.h \ - gdbus.c gdbus.h + gdbus.c gdbus.h \ + network.c network.h =20 EXTRA_DIST =3D \ $(DAEMON_SOURCES) diff --git a/src/connect.c b/src/connect.c index 2350736..2fdd248 100644 --- a/src/connect.c +++ b/src/connect.c @@ -1,6 +1,7 @@ #include "connect.h" #include "domain.h" #include "events.h" +#include "network.h" #include "util.h" =20 #include @@ -303,6 +304,7 @@ virtDBusConnectFree(virtDBusConnect *connect) virtDBusConnectClose(connect, TRUE); =20 g_free(connect->domainPath); + g_free(connect->networkPath); g_free(connect); } G_DEFINE_AUTOPTR_CLEANUP_FUNC(virtDBusConnect, virtDBusConnectFree); @@ -345,6 +347,10 @@ virtDBusConnectNew(virtDBusConnect **connectp, if (error && *error) return; =20 + virtDBusNetworkRegister(connect, error); + if (error && *error) + return; + *connectp =3D connect; connect =3D NULL; } diff --git a/src/connect.h b/src/connect.h index 9572857..7ed84b8 100644 --- a/src/connect.h +++ b/src/connect.h @@ -13,6 +13,7 @@ struct virtDBusConnect { const gchar *uri; const gchar *connectPath; gchar *domainPath; + gchar *networkPath; virConnectPtr connection; GMutex lock; =20 diff --git a/src/network.c b/src/network.c new file mode 100644 index 0000000..0d0e992 --- /dev/null +++ b/src/network.c @@ -0,0 +1,64 @@ +#include "network.h" +#include "util.h" + +#include + +static virtDBusGDBusPropertyTable virtDBusNetworkPropertyTable[] =3D { + { 0 } +}; + +static virtDBusGDBusMethodTable virtDBusNetworkMethodTable[] =3D { + { 0 } +}; + +static gchar ** +virtDBusNetworkEnumerate(gpointer userData) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNetworkPtr) networks =3D NULL; + gint num =3D 0; + gchar **ret =3D NULL; + + if (!virtDBusConnectOpen(connect, NULL)) + return NULL; + + num =3D virConnectListAllNetworks(connect->connection, &networks, 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 virtDBusUtilBusPathForVirNetwork(networks[i], + connect->networkPath); + } + + return ret; +} + +static GDBusInterfaceInfo *interfaceInfo =3D NULL; + +void +virtDBusNetworkRegister(virtDBusConnect *connect, + GError **error) +{ + connect->networkPath =3D g_strdup_printf("%s/network", connect->connec= tPath); + + if (!interfaceInfo) { + interfaceInfo =3D virtDBusGDBusLoadIntrospectData(VIRT_DBUS_NETWOR= K_INTERFACE, + error); + if (!interfaceInfo) + return; + } + + virtDBusGDBusRegisterSubtree(connect->bus, + connect->networkPath, + interfaceInfo, + virtDBusNetworkEnumerate, + virtDBusNetworkMethodTable, + virtDBusNetworkPropertyTable, + connect); +} diff --git a/src/network.h b/src/network.h new file mode 100644 index 0000000..fc53b28 --- /dev/null +++ b/src/network.h @@ -0,0 +1,9 @@ +#pragma once + +#include "connect.h" + +#define VIRT_DBUS_NETWORK_INTERFACE "org.libvirt.Network" + +void +virtDBusNetworkRegister(virtDBusConnect *connect, + GError **error); diff --git a/src/util.c b/src/util.c index be65172..03a0f10 100644 --- a/src/util.c +++ b/src/util.c @@ -151,3 +151,36 @@ virtDBusUtilEnumFromString(const gchar *const *types, =20 return -1; } + +virNetworkPtr +virtDBusUtilVirNetworkFromBusPath(virConnectPtr connection, + const gchar *path, + const gchar *networkPath) +{ + g_autofree gchar *name =3D NULL; + gsize prefixLen =3D strlen(networkPath) + 1; + + name =3D virtDBusUtilDecodeUUID(path+prefixLen); + + return virNetworkLookupByUUIDString(connection, name); +} + +gchar * +virtDBusUtilBusPathForVirNetwork(virNetworkPtr network, + const gchar *networkPath) +{ + gchar uuid[VIR_UUID_STRING_BUFLEN] =3D ""; + g_autofree gchar *newUuid =3D NULL; + virNetworkGetUUIDString(network, uuid); + newUuid =3D virtDBusUtilEncodeUUID(uuid); + return g_strdup_printf("%s/%s", networkPath, newUuid); +} + +void +virtDBusUtilVirNetworkListFree(virNetworkPtr *networks) +{ + for (gint i =3D 0; networks[i] !=3D NULL; i +=3D 1) + virNetworkFree(networks[i]); + + g_free(networks); +} diff --git a/src/util.h b/src/util.h index c9d9cfd..7bb4ad6 100644 --- a/src/util.h +++ b/src/util.h @@ -65,3 +65,18 @@ virtDBusUtilEnumToString(const gchar *const *types, #define VIRT_DBUS_ENUM_DECL(name) \ const gchar *name ##TypeToString(gint type) G_GNUC_PURE; \ gint name ##TypeFromString(const gchar *type) G_GNUC_PURE; + +virNetworkPtr +virtDBusUtilVirNetworkFromBusPath(virConnectPtr connection, + const gchar *path, + const gchar *networkPath); + +gchar * +virtDBusUtilBusPathForVirNetwork(virNetworkPtr network, + const gchar *networkPath); + +void +virtDBusUtilVirNetworkListFree(virNetworkPtr *networks); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetwork, virNetworkFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkPtr, virtDBusUtilVirNetworkListFre= e); --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list