[pve-devel] [PATCH network/container/qemu-server 0/3] Drop unused `firewall` argument to {add, del}_bridge_fdb()

[pve-devel] [PATCH network/container/qemu-server 0/3] Drop unused `firewall` argument to {add, del}_bridge_fdb()

[Christoph Heiss]

While working on this code, I noticed that ACAICS the `firewall`
argument is never used (nor even declared!) [0] in both of
PVE::Network::{add,del}_bridge_fdb().

Thus drop it everywhere and avoid needlessly passing around things which
are never used anyway.

Did some quick smoke-testing and everything kept working fine, but as
there are really no functional changes, this should not effect anything.

[0] https://git.proxmox.com/?p=pve-common.git;a=blob;f=src/PVE/Network.pm;h=355637b1;hb=HEAD#l299

pve-network:

Christoph Heiss (1):
      zones: Drop unused `firewall` argument to {add,del}_bridge_fdb()

 PVE/Network/SDN/Zones.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

pve-container:

Christoph Heiss (1):
      net: Drop unused `firewall` argument to add_bridge_fdb()

 src/PVE/LXC.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

qemu-server:

Christoph Heiss (1):
      net: Drop unused `firewall` argument to {add,del}_bridge_fdb()

 PVE/QemuServer.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--
2.39.2

[pve-devel] [PATCH network 1/3] zones: Drop unused `firewall` argument to {add, del}_bridge_fdb()

[Christoph Heiss]

PVE::Network::{add,del}_bridge_fdb() do not actually have a `firewall`
parameter, so drop it. And since it wasn't used anywhere else in these
subroutines, drop it completely.

No functional changes.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 PVE/Network/SDN/Zones.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm
index f8e40b1..58f9df8 100644
--- a/PVE/Network/SDN/Zones.pm
+++ b/PVE/Network/SDN/Zones.pm
@@ -326,31 +326,31 @@ sub tap_plug {
 }

 sub add_bridge_fdb {
-    my ($iface, $macaddr, $bridge, $firewall) = @_;
+    my ($iface, $macaddr, $bridge) = @_;

     my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge, 1);
     if (!$vnet) { # fallback for classic bridge
-	PVE::Network::add_bridge_fdb($iface, $macaddr, $firewall);
+	PVE::Network::add_bridge_fdb($iface, $macaddr);
 	return;
     }

     my $plugin_config = get_plugin_config($vnet);
     my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
-    PVE::Network::add_bridge_fdb($iface, $macaddr, $firewall) if $plugin_config->{'bridge-disable-mac-learning'};
+    PVE::Network::add_bridge_fdb($iface, $macaddr) if $plugin_config->{'bridge-disable-mac-learning'};
 }

 sub del_bridge_fdb {
-    my ($iface, $macaddr, $bridge, $firewall) = @_;
+    my ($iface, $macaddr, $bridge) = @_;

     my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge, 1);
     if (!$vnet) { # fallback for classic bridge
-	PVE::Network::del_bridge_fdb($iface, $macaddr, $firewall);
+	PVE::Network::del_bridge_fdb($iface, $macaddr);
 	return;
     }

     my $plugin_config = get_plugin_config($vnet);
     my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
-    PVE::Network::del_bridge_fdb($iface, $macaddr, $firewall) if $plugin_config->{'bridge-disable-mac-learning'};
+    PVE::Network::del_bridge_fdb($iface, $macaddr) if $plugin_config->{'bridge-disable-mac-learning'};
 }

 1;
--
2.39.2

[pve-devel] [PATCH container 2/3] net: Drop unused `firewall` argument to add_bridge_fdb()

[Christoph Heiss]

PVE::Network::SDN::Zones::add_bridge_fdb() does not actually have a
`firewall` parameter, so drop it.

No functional changes.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 src/PVE/LXC.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 54ee0d9..cd0aeb1 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -923,7 +923,7 @@ sub net_tap_plug : prototype($$$$$$;$) {

     if ($have_sdn) {
 	PVE::Network::SDN::Zones::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate);
-	PVE::Network::SDN::Zones::add_bridge_fdb($iface, $opts->{mac}, $bridge, $firewall)
+	PVE::Network::SDN::Zones::add_bridge_fdb($iface, $opts->{mac}, $bridge)
 	    if defined($opts->{mac});
     } else {
 	PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, $opts);
--
2.39.2

[pve-devel] [PATCH qemu-server 3/3] net: Drop unused `firewall` argument to {add, del}_bridge_fdb()

[Christoph Heiss]

PVE::Network::{add,del}_bridge_fdb() do not actually have a `firewall`
parameter, so drop it. Same for the SDN equivalents.

No functional changes.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 PVE/QemuServer.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 40be44d..9e5b0a0 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -8561,9 +8561,9 @@ sub add_nets_bridge_fdb {
 
 	my $bridge = $net->{bridge};
 	if ($have_sdn) {
-	    PVE::Network::SDN::Zones::add_bridge_fdb($iface, $mac, $bridge, $net->{firewall});
+	    PVE::Network::SDN::Zones::add_bridge_fdb($iface, $mac, $bridge);
 	} elsif (-d "/sys/class/net/$bridge/bridge") { # avoid fdb management with OVS for now
-	    PVE::Network::add_bridge_fdb($iface, $mac, $net->{firewall});
+	    PVE::Network::add_bridge_fdb($iface, $mac);
 	}
     }
 }
@@ -8580,9 +8580,9 @@ sub del_nets_bridge_fdb {
 
 	my $bridge = $net->{bridge};
 	if ($have_sdn) {
-	    PVE::Network::SDN::Zones::del_bridge_fdb($iface, $mac, $bridge, $net->{firewall});
+	    PVE::Network::SDN::Zones::del_bridge_fdb($iface, $mac, $bridge);
 	} elsif (-d "/sys/class/net/$bridge/bridge") { # avoid fdb management with OVS for now
-	    PVE::Network::del_bridge_fdb($iface, $mac, $net->{firewall});
+	    PVE::Network::del_bridge_fdb($iface, $mac);
 	}
     }
 }
-- 
2.39.2