|
 |
397dc2 |
From 3a0200ee7544307a9708a6e876603425647bad34 Mon Sep 17 00:00:00 2001
|
|
|
397dc2 |
Message-Id: <3a0200ee7544307a9708a6e876603425647bad34@dist-git>
|
|
|
397dc2 |
From: Laine Stump <laine@redhat.com>
|
|
|
397dc2 |
Date: Fri, 15 Jan 2021 22:51:48 -0500
|
|
|
397dc2 |
Subject: [PATCH] network: be more verbose about the reason for a firewall
|
|
|
397dc2 |
reload
|
|
|
397dc2 |
|
|
|
397dc2 |
https://bugzilla.redhat.com/1607929
|
|
|
397dc2 |
|
|
|
397dc2 |
Signed-off-by: Laine Stump <laine@redhat.com>
|
|
|
397dc2 |
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
|
397dc2 |
(cherry picked from commit c102bbd3efc358fb44fa2bb37fb0bcbeaaab72a5)
|
|
|
397dc2 |
|
|
|
397dc2 |
Conflicts: src/network/bridge_driver.c:
|
|
|
397dc2 |
some minor things due to upstream switch to using glib for DBus
|
|
|
397dc2 |
Signed-off-by: Laine Stump <laine@redhat.com>
|
|
|
397dc2 |
Message-Id: <20210116035151.1066734-6-laine@redhat.com>
|
|
|
397dc2 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
397dc2 |
---
|
|
|
397dc2 |
src/network/bridge_driver.c | 10 ++++++----
|
|
|
397dc2 |
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
397dc2 |
|
|
|
397dc2 |
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
|
|
|
397dc2 |
index c9c45df758..5995396f78 100644
|
|
|
397dc2 |
--- a/src/network/bridge_driver.c
|
|
|
397dc2 |
+++ b/src/network/bridge_driver.c
|
|
|
397dc2 |
@@ -665,6 +665,7 @@ firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED,
|
|
|
397dc2 |
if (dbus_message_is_signal(message,
|
|
|
397dc2 |
"org.fedoraproject.FirewallD1", "Reloaded")) {
|
|
|
397dc2 |
reload = true;
|
|
|
397dc2 |
+ VIR_DEBUG("Reload in bridge_driver because of 'Reloaded' signal");
|
|
|
397dc2 |
|
|
|
397dc2 |
} else if (dbus_message_is_signal(message,
|
|
|
397dc2 |
DBUS_INTERFACE_DBUS, "NameOwnerChanged")) {
|
|
|
397dc2 |
@@ -681,14 +682,15 @@ firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED,
|
|
|
397dc2 |
* if new_owner is empty, firewalld is shutting down. If it is
|
|
|
397dc2 |
* non-empty, then it is starting
|
|
|
397dc2 |
*/
|
|
|
397dc2 |
- if (new_owner && *new_owner)
|
|
|
397dc2 |
+ if (new_owner && *new_owner) {
|
|
|
397dc2 |
+ VIR_DEBUG("Reload in bridge_driver because of 'NameOwnerChanged' signal, new owner is: '%s'",
|
|
|
397dc2 |
+ new_owner);
|
|
|
397dc2 |
reload = true;
|
|
|
397dc2 |
+ }
|
|
|
397dc2 |
}
|
|
|
397dc2 |
|
|
|
397dc2 |
- if (reload) {
|
|
|
397dc2 |
- VIR_DEBUG("Reload in bridge_driver because of firewalld.");
|
|
|
397dc2 |
+ if (reload)
|
|
|
397dc2 |
networkReloadFirewallRules(driver, false);
|
|
|
397dc2 |
- }
|
|
|
397dc2 |
|
|
|
397dc2 |
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
|
|
397dc2 |
}
|
|
|
397dc2 |
--
|
|
|
397dc2 |
2.30.0
|
|
|
397dc2 |
|