src/nwfilter/nwfilter_driver: convert to use GLib DBus

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

src/nwfilter/meson.build

@@ -17,7 +17,6 @@ if conf.has('WITH_NWFILTER')
     ],
     dependencies: [
       access_dep,
-      dbus_dep,
       libnl_dep,
       libpcap_dep,
       src_dep,

src/nwfilter/nwfilter_driver.c

@@ -24,7 +24,7 @@
 
 #include <config.h>
 
-#include "virdbus.h"
+#include "virgdbus.h"
 #include "virlog.h"
 
 #include "internal.h"
@@ -50,17 +50,6 @@
 
 VIR_LOG_INIT("nwfilter.nwfilter_driver");
 
-#define DBUS_RULE_FWD_NAMEOWNERCHANGED \
-    "type='signal'" \
-    ",interface='"DBUS_INTERFACE_DBUS"'" \
-    ",member='NameOwnerChanged'" \
-    ",arg0='org.fedoraproject.FirewallD1'"
-
-#define DBUS_RULE_FWD_RELOADED \
-    "type='signal'" \
-    ",interface='org.fedoraproject.FirewallD1'" \
-    ",member='Reloaded'"
-
 
 static virNWFilterDriverStatePtr driver;
 
@@ -79,36 +68,30 @@ static void nwfilterDriverUnlock(void)
 
 #ifdef WITH_FIREWALLD
 
-static DBusHandlerResult
+static void
-nwfilterFirewalldDBusFilter(DBusConnection *connection G_GNUC_UNUSED,
+nwfilterFirewalldDBusSignalCallback(GDBusConnection *connection G_GNUC_UNUSED,
-                            DBusMessage *message,
+                                    const char *senderName G_GNUC_UNUSED,
-                            void *user_data G_GNUC_UNUSED)
+                                    const char *objectPath G_GNUC_UNUSED,
+                                    const char *interfaceName G_GNUC_UNUSED,
+                                    const char *signalName G_GNUC_UNUSED,
+                                    GVariant *parameters G_GNUC_UNUSED,
+                                    gpointer user_data G_GNUC_UNUSED)
 {
-    if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS,
-                               "NameOwnerChanged") ||
-        dbus_message_is_signal(message, "org.fedoraproject.FirewallD1",
-                               "Reloaded")) {
-        VIR_DEBUG("Reload in nwfilter_driver because of firewalld.");
     nwfilterStateReload();
 }
 
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+static unsigned int restartID;
-}
+static unsigned int reloadID;
 
 static void
 nwfilterDriverRemoveDBusMatches(void)
 {
-    DBusConnection *sysbus;
+    GDBusConnection *sysbus;
 
-    sysbus = virDBusGetSystemBus();
+    sysbus = virGDBusGetSystemBus();
     if (sysbus) {
-        dbus_bus_remove_match(sysbus,
+        g_dbus_connection_signal_unsubscribe(sysbus, restartID);
-                              DBUS_RULE_FWD_NAMEOWNERCHANGED,
+        g_dbus_connection_signal_unsubscribe(sysbus, reloadID);
-                              NULL);
-        dbus_bus_remove_match(sysbus,
-                              DBUS_RULE_FWD_RELOADED,
-                              NULL);
-        dbus_connection_remove_filter(sysbus, nwfilterFirewalldDBusFilter, NULL);
     }
 }
 
@@ -117,33 +100,29 @@ nwfilterDriverRemoveDBusMatches(void)
  *
  * Startup DBus matches for monitoring the state of firewalld
  */
-static int
+static void
-nwfilterDriverInstallDBusMatches(DBusConnection *sysbus)
+nwfilterDriverInstallDBusMatches(GDBusConnection *sysbus)
 {
-    int ret = 0;
+    restartID = g_dbus_connection_signal_subscribe(sysbus,
-
+                                                   NULL,
-    if (!sysbus) {
+                                                   "org.freedesktop.DBus",
-        ret = -1;
+                                                   "NameOwnerChanged",
-    } else {
+                                                   NULL,
-        /* add matches for
+                                                   "org.fedoraproject.FirewallD1",
-         * NameOwnerChanged on org.freedesktop.DBus for firewalld start/stop
+                                                   G_DBUS_SIGNAL_FLAGS_NONE,
-         * Reloaded on org.fedoraproject.FirewallD1 for firewalld reload
+                                                   nwfilterFirewalldDBusSignalCallback,
-         */
+                                                   NULL,
-        dbus_bus_add_match(sysbus,
-                           DBUS_RULE_FWD_NAMEOWNERCHANGED,
                                                    NULL);
-        dbus_bus_add_match(sysbus,
+    reloadID = g_dbus_connection_signal_subscribe(sysbus,
-                           DBUS_RULE_FWD_RELOADED,
+                                                  NULL,
+                                                  "org.fedoraproject.FirewallD1",
+                                                  "Reloaded",
+                                                  NULL,
+                                                  NULL,
+                                                  G_DBUS_SIGNAL_FLAGS_NONE,
+                                                  nwfilterFirewalldDBusSignalCallback,
+                                                  NULL,
                                                   NULL);
-        if (!dbus_connection_add_filter(sysbus, nwfilterFirewalldDBusFilter,
-                                        NULL, NULL)) {
-            VIR_WARN(("Adding a filter to the DBus connection failed"));
-            nwfilterDriverRemoveDBusMatches();
-            ret =  -1;
-        }
-    }
-
-    return ret;
 }
 
 #else /* WITH_FIREWALLD */
@@ -153,10 +132,9 @@ nwfilterDriverRemoveDBusMatches(void)
 {
 }
 
-static int
+static void
-nwfilterDriverInstallDBusMatches(DBusConnection *sysbus G_GNUC_UNUSED)
+nwfilterDriverInstallDBusMatches(GDBusConnection *sysbus G_GNUC_UNUSED)
 {
-    return 0;
 }
 
 #endif /* WITH_FIREWALLD */
@@ -181,7 +159,7 @@ nwfilterStateInitialize(bool privileged,
                         virStateInhibitCallback callback G_GNUC_UNUSED,
                         void *opaque G_GNUC_UNUSED)
 {
-    DBusConnection *sysbus = NULL;
+    GDBusConnection *sysbus = NULL;
 
     if (root != NULL) {
         virReportError(VIR_ERR_INVALID_ARG, "%s",
@@ -189,8 +167,8 @@ nwfilterStateInitialize(bool privileged,
         return -1;
     }
 
-    if (virDBusHasSystemBus() &&
+    if (virGDBusHasSystemBus() &&
-        !(sysbus = virDBusGetSystemBus()))
+        !(sysbus = virGDBusGetSystemBus()))
         return VIR_DRV_STATE_INIT_ERROR;
 
     driver = g_new0(virNWFilterDriverState, 1);
@@ -241,21 +219,8 @@ nwfilterStateInitialize(bool privileged,
      * startup the DBus late so we don't get a reload signal while
      * initializing
      */
-    if (sysbus &&
+    if (sysbus)
-        nwfilterDriverInstallDBusMatches(sysbus) < 0) {
+        nwfilterDriverInstallDBusMatches(sysbus);
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("DBus matches could not be installed. "
-                       "Disabling nwfilter driver"));
-        /*
-         * unfortunately this is fatal since virNWFilterTechDriversInit
-         * may have caused the ebiptables driver to use the firewall tool
-         * but now that the watches don't work, we just disable the nwfilter
-         * driver
-         *
-         * This may only happen if the system bus is available.
-         */
-        goto error;
-    }
 
     driver->configDir = g_strdup(SYSCONFDIR "/libvirt/nwfilter");