External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-02 15:22:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "network: *un*set the firewalld zone while shutting down a network"

Browse Source 
This reverts commit 200f60b2e12e68d618f6d59f0173bb507b678838. The same
functionality will be re-added in a different way in an upcoming patch.

Signed-off-by: Laine Stump
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Laine Stump 2024-10-04 13:44:32 -04:00
parent bd6d7ebf62
commit 816876f517
7 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -2452,7 +2452,6 @@ virFirewallDGetPolicies;
virFirewallDGetVersion;
virFirewallDGetZones;
virFirewallDInterfaceSetZone;
virFirewallDInterfaceUnsetZone;
virFirewallDIsRegistered;
virFirewallDPolicyExists;
virFirewallDSynchronize;

4
src/network/bridge_driver.c
View File

@ -2127,8 +2127,6 @@ networkStartNetworkVirtual(virNetworkDriverState *driver,
def->forward.type != VIR_NETWORK_FORWARD_OPEN)
networkRemoveFirewallRules(obj);
networkUnsetBridgeZone(def);
virNetworkObjUnrefMacMap(obj);
ignore_value(virNetDevBridgeDelete(def->bridge));
@ -2167,8 +2165,6 @@ networkShutdownNetworkVirtual(virNetworkObj *obj)
if (def->forward.type != VIR_NETWORK_FORWARD_OPEN)
networkRemoveFirewallRules(obj);
networkUnsetBridgeZone(def);
ignore_value(virNetDevBridgeDelete(def->bridge));
/* See if its still alive and really really kill it */

14
src/network/bridge_driver_linux.c
View File

@ -392,20 +392,6 @@ networkSetBridgeZone(virNetworkDef *def)
}
void
networkUnsetBridgeZone(virNetworkDef *def)
{
/* If there is a libvirt-managed bridge device remove it from any
* zone it had been placed in as a part of deleting the bridge.
* DO NOT CALL THIS FOR 'bridge' forward mode, since that
* bridge is not managed by libvirt.
*/
if (def->bridge && def->forward.type != VIR_NETWORK_FORWARD_BRIDGE
&& virFirewallDIsRegistered() == 0) {
virFirewallDInterfaceUnsetZone(def->bridge);
}
}
int
networkAddFirewallRules(virNetworkDef *def,
virFirewallBackend firewallBackend,

6
src/network/bridge_driver_nop.c
View File

@ -51,12 +51,6 @@ networkSetBridgeZone(virNetworkDef *def)
}
void
networkUnsetBridgeZone(virNetworkDef *def G_GNUC_UNUSED)
{
}
int networkAddFirewallRules(virNetworkDef *def G_GNUC_UNUSED,
virFirewallBackend firewallBackend,
virFirewall **fwRemoval G_GNUC_UNUSED)

2
src/network/bridge_driver_platform.h
View File

@ -38,6 +38,4 @@ int networkAddFirewallRules(virNetworkDef *def,
virFirewallBackend firewallBackend,
virFirewall **fwRemoval);
void networkUnsetBridgeZone(virNetworkDef *def);
void networkRemoveFirewallRules(virNetworkObj *obj);

23
src/util/virfirewalld.c
View File

@ -449,29 +449,6 @@ virFirewallDInterfaceSetZone(const char *iface,
}
int
virFirewallDInterfaceUnsetZone(const char *iface)
{
GDBusConnection *sysbus = virGDBusGetSystemBus();
g_autoptr(GVariant) message = NULL;
if (!sysbus)
return -1;
message = g_variant_new("(ss)", "", iface);
return virGDBusCallMethod(sysbus,
NULL,
NULL,
NULL,
VIR_FIREWALL_FIREWALLD_SERVICE,
"/org/fedoraproject/FirewallD1",
"org.fedoraproject.FirewallD1.zone",
"removeInterface",
message);
}
void
virFirewallDSynchronize(void)
{

2
src/util/virfirewalld.h
View File

@ -46,6 +46,4 @@ int virFirewallDApplyRule(virFirewallLayer layer,
int virFirewallDInterfaceSetZone(const char *iface,
const char *zone);
int virFirewallDInterfaceUnsetZone(const char *iface);
void virFirewallDSynchronize(void);