[pve-devel] [PATCH] rename link to fwln && link peer to fwpr

Alexandre Derumier aderumier at odiso.com
Wed May 14 05:25:45 CEST 2014


also plug fwpr to vmbr, and fwln to fwbr

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 data/PVE/Network.pm |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/PVE/Network.pm b/data/PVE/Network.pm
index dffa764..47933a9 100644
--- a/data/PVE/Network.pm
+++ b/data/PVE/Network.pm
@@ -87,9 +87,9 @@ my $compute_fwbr_names = sub {
     my ($vmid, $devid) = @_;
 
     my $fwbr = "fwbr${vmid}i${devid}";
-    my $vethfw = "link${vmid}i${devid}";
-    my $vethfwpeer = "link${vmid}p${devid}";
-    my $ovsintport = "link${vmid}o${devid}";
+    my $vethfw = "fwln${vmid}i${devid}";
+    my $vethfwpeer = "fwpr${vmid}p${devid}";
+    my $ovsintport = "fwln${vmid}o${devid}";
 
     return ($fwbr, $vethfw, $vethfwpeer, $ovsintport);
 };
@@ -162,8 +162,8 @@ my $create_firewall_bridge_linux = sub {
     &$activate_interface($vethfw);
     &$activate_interface($vethfwpeer);
 
-    &$bridge_add_interface($bridge, $vethfw);
-    &$bridge_add_interface($fwbr, $vethfwpeer);
+    &$bridge_add_interface($fwbr, $vethfw);
+    &$bridge_add_interface($bridge, $vethfwpeer);
 
     return $fwbr;
 };
-- 
1.7.10.4




More information about the pve-devel mailing list