copy_bridge : copy multicast_snooping && multicast_querier

[pve-common.git] / data / PVE / Network.pm

diff --git a/data/PVE/Network.pm b/data/PVE/Network.pm
index 4cc5fb8c11beafad3fb40a00261ec222895441bd..e7521f7531c0b8edc65d39b7ef39bda703229653 100644 (file)
--- a/data/PVE/Network.pm
+++ b/data/PVE/Network.pm
@@ -16,7 +16,7 @@ sub setup_tc_rate_limit {
     system("/sbin/tc qdisc del dev $iface ingress >/dev/null 2>&1");
     system("/sbin/tc qdisc del dev $iface root >/dev/null 2>&1");
 
-    return if (!$rate || ($rate && $rate == 0));
+    return if !$rate;
 
     run_command("/sbin/tc qdisc add dev $iface handle ffff: ingress");
 
@@ -52,13 +52,44 @@ sub tap_rate_limit {
     setup_tc_rate_limit($iface, $rate, $burst, $debug);
 }
 
+sub tap_create {
+    my ($iface, $bridge) = @_;
+
+    die "unable to get bridge setting\n" if !$bridge;
+
+    my $bridgemtu = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/mtu");
+       die "bridge '$bridge' does not exist\n" if !$bridgemtu;
+
+    eval{ PVE::Tools::run_command("/sbin/ifconfig $iface 0.0.0.0 promisc up mtu $bridgemtu");};
+       die "interface activation failed\n" if $@;
+}
+
+sub tap_plug {
+    my ($iface, $bridge, $tag) = @_;
+
+    my $newbridge = activate_bridge_vlan($bridge, $tag);
+    copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+
+    system ("/usr/sbin/brctl addif $newbridge $iface") == 0 ||
+       die "can't add interface to bridge\n";
+}
+
+sub tap_unplug {
+    my ($iface, $bridge, $tag) = @_;
+
+    $bridge .= "v$tag" if $tag;
+
+    system ("/usr/sbin/brctl delif $bridge $iface") == 0 ||
+       die "can't del interface from bridge\n";
+}
+
 sub copy_bridge_config {
     my ($br0, $br1) = @_;
 
     return if $br0 eq $br1;
 
     my $br_configs = [ 'ageing_time', 'stp_state', 'priority', 'forward_delay', 
-                      'hello_time', 'max_age'];
+                      'hello_time', 'max_age', 'multicast_snooping', 'multicast_querier'];
 
     foreach my $sysname (@$br_configs) {
        eval {