proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-27 13:44:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

network: vlan-aware bridge: fix pvid when trunks is defined

Browse Source 
Currently, when a trunks is defined, the vlan tag is not used
for pvid with vlan-aware bridge. (It's ok with ovs switch)

example:

net0: e1000=BA:90:68:B8:CF:F5,bridge=vmbr1,tag=2,trunks=2-11

before
------
tap100i0	 2-11

after
-----
tap100i0	 2 PVID Egress Untagged
	 3-11

No regression for other configurations:

net0: e1000=BA:90:68:B8:CF:F5,bridge=vmbr1

before
------
tap100i0	 1 PVID Egress Untagged
	 2-4094

after
-----
tap100i0	 1 PVID Egress Untagged
	 2-4094

net0: e1000=BA:90:68:B8:CF:F5,bridge=vmbr1,tag=2

before
------
tap100i0	 2 PVID Egress Untagged

after
-----
tap100i0	 2 PVID Egress Untagged

net0: e1000=BA:90:68:B8:CF:F5,bridge=vmbr1,trunks=2-11

before
------
tap100i0	 1 PVID Egress Untagged
	 2-11

after
-----
tap100i0	 1 PVID Egress Untagged
	 2-11

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2020-05-25 13:05:08 +02:00 committed by Thomas Lamprecht
parent 1b6ad61c61
commit aa91ae3d1b
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/PVE/Network.pm
View File

@ -216,26 +216,24 @@ my $bridge_add_interface = sub {
my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering"); my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
if ($vlan_aware) { if ($vlan_aware) {
if ($tag) {
eval { run_command(['/sbin/bridge', 'vlan', 'del', 'dev', $iface, 'vid', '1-4094']) };
die "failed to remove default vlan tags of $iface - $@\n" if $@;
eval { run_command(['/sbin/bridge', 'vlan', 'add', 'dev', $iface, 'vid', $tag, 'pvid', 'untagged']) }; eval { run_command(['/sbin/bridge', 'vlan', 'del', 'dev', $iface, 'vid', '1-4094']) };
die "unable to add vlan $tag to interface $iface - $@\n" if $@; die "failed to remove default vlan tags of $iface - $@\n" if $@;
warn "Caution: Setting VLAN ID 1 on a VLAN aware bridge may be dangerous\n" if $tag == 1; if ($trunks) {
} elsif (!$trunks) { my @trunks_array = split /;/, $trunks;
eval { run_command(['/sbin/bridge', 'vlan', 'add', 'dev', $iface, 'vid', '2-4094']) }; foreach my $trunk (@trunks_array) {
die "unable to add default vlan tags to interface $iface - $@\n" if $@; eval { run_command(['/sbin/bridge', 'vlan', 'add', 'dev', $iface, 'vid', $trunk]) };
} die "unable to add vlan $trunk to interface $iface - $@\n" if $@;
}
} elsif (!$tag) {
eval { run_command(['/sbin/bridge', 'vlan', 'add', 'dev', $iface, 'vid', '2-4094']) };
die "unable to add default vlan tags to interface $iface - $@\n" if $@;
}
if ($trunks) { $tag = 1 if !$tag;
my @trunks_array = split /;/, $trunks; eval { run_command(['/sbin/bridge', 'vlan', 'add', 'dev', $iface, 'vid', $tag, 'pvid', 'untagged']) };
foreach my $trunk (@trunks_array) { die "unable to add vlan $tag to interface $iface - $@\n" if $@;
eval { run_command(['/sbin/bridge', 'vlan', 'add', 'dev', $iface, 'vid', $trunk]) };
die "unable to add vlan $trunk to interface $iface - $@\n" if $@;
}
}
} }
}; };