From 3a0200ee7544307a9708a6e876603425647bad34 Mon Sep 17 00:00:00 2001
Message-Id: <3a0200ee7544307a9708a6e876603425647bad34@dist-git>
From: Laine Stump <laine@redhat.com>
Date: Fri, 15 Jan 2021 22:51:48 -0500
Subject: [PATCH] network: be more verbose about the reason for a firewall
 reload

https://bugzilla.redhat.com/1607929

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
(cherry picked from commit c102bbd3efc358fb44fa2bb37fb0bcbeaaab72a5)

Conflicts: src/network/bridge_driver.c:
    some minor things due to upstream switch to using glib for DBus
Signed-off-by: Laine Stump <laine@redhat.com>
Message-Id: <20210116035151.1066734-6-laine@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/network/bridge_driver.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index c9c45df758..5995396f78 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -665,6 +665,7 @@ firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED,
     if (dbus_message_is_signal(message,
                                "org.fedoraproject.FirewallD1", "Reloaded")) {
         reload = true;
+        VIR_DEBUG("Reload in bridge_driver because of 'Reloaded' signal");
 
     } else if (dbus_message_is_signal(message,
                                       DBUS_INTERFACE_DBUS, "NameOwnerChanged")) {
@@ -681,14 +682,15 @@ firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED,
          * if new_owner is empty, firewalld is shutting down. If it is
          * non-empty, then it is starting
          */
-        if (new_owner && *new_owner)
+        if (new_owner && *new_owner) {
+            VIR_DEBUG("Reload in bridge_driver because of 'NameOwnerChanged' signal, new owner is: '%s'",
+                      new_owner);
             reload = true;
+        }
     }
 
-    if (reload) {
-        VIR_DEBUG("Reload in bridge_driver because of firewalld.");
+    if (reload)
         networkReloadFirewallRules(driver, false);
-    }
 
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
-- 
2.30.0