rename link+ to fwln+

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index bbaa58e67d0136294547e416b573b32a1d64e41a..9098c0ecb8748034edd746701075a5d351eafd85 100644 (file)
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -2590,10 +2590,10 @@ sub compile {
     ruleset_create_chain($ruleset, "PVEFW-FWBR-IN");
     ruleset_chain_add_input_filters($ruleset, "PVEFW-FWBR-IN", $hostfw_options);
 
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-in link+ -j PVEFW-FWBR-IN");
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-in fwln+ -j PVEFW-FWBR-IN");
 
     ruleset_create_chain($ruleset, "PVEFW-FWBR-OUT");
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-out link+ -j PVEFW-FWBR-OUT");
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-out fwln+ -j PVEFW-FWBR-OUT");
 
     ruleset_create_chain($ruleset, "PVEFW-VENET-IN");
     ruleset_chain_add_input_filters($ruleset, "PVEFW-VENET-IN", $hostfw_options);

diff --git a/test/fwtester.pl b/test/fwtester.pl
index 97e9cfa55485d0bd2b4ef054c0cc5d8d7d445efc..25360769ca0fec6a694e7ce661809cacbf4f4aac 100755 (executable)
--- a/test/fwtester.pl
+++ b/test/fwtester.pl
@@ -209,7 +209,7 @@ sub simulate_firewall {
        $pkg->{mac_source} = $macaddr;
        my $brpkg = copy_packet($pkg);
        $brpkg->{physdev_in} = "tap${vmid}i0";
-       $brpkg->{physdev_out} = "link${vmid}i0";
+       $brpkg->{physdev_out} = "fwln${vmid}i0";
        $brpkg->{iface_in} = $brpkg->{iface_out} = "fwbr${vmid}i0";
        $pre_test = ['PVEFW-FORWARD', $brpkg];
     } else {
@@ -236,7 +236,7 @@ sub simulate_firewall {
        $pkg->{iface_out} = $net->{bridge} || die "unable to get bridge";
        my $brpkg = copy_packet($pkg);
        $brpkg->{physdev_out} = "tap${vmid}i0";
-       $brpkg->{physdev_in} = "link${vmid}i0";
+       $brpkg->{physdev_in} = "fwln${vmid}i0";
        $brpkg->{iface_in} = $brpkg->{iface_out} = "fwbr${vmid}i0";
        $post_test = ['PVEFW-FORWARD', $brpkg];
     } else {