summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ba039eb)
Signed-off-by: Alen Grizonic <a.grizonic@proxmox.com>
-my $parse_tap_devive_name = sub {
+my $parse_tap_device_name = sub {
my ($iface, $noerr) = @_;
my ($vmid, $devid);
my ($iface, $noerr) = @_;
my ($vmid, $devid);
if ($iface =~ m/^tap(\d+)i(\d+)$/) {
$vmid = $1;
$devid = $2;
if ($iface =~ m/^tap(\d+)i(\d+)$/) {
$vmid = $1;
$devid = $2;
- } elsif ($iface =~ m/^veth(\d+)\.(\d+)$/) {
+ } elsif ($iface =~ m/^veth(\d+)i(\d+)$/) {
$vmid = $1;
$devid = $2;
} else {
$vmid = $1;
$devid = $2;
} else {
my $create_firewall_bridge_linux = sub {
my ($iface, $bridge, $tag) = @_;
my $create_firewall_bridge_linux = sub {
my ($iface, $bridge, $tag) = @_;
- my ($vmid, $devid) = &$parse_tap_devive_name($iface);
+ my ($vmid, $devid) = &$parse_tap_device_name($iface);
my ($fwbr, $vethfw, $vethfwpeer) = &$compute_fwbr_names($vmid, $devid);
&$cond_create_bridge($fwbr);
my ($fwbr, $vethfw, $vethfwpeer) = &$compute_fwbr_names($vmid, $devid);
&$cond_create_bridge($fwbr);
my $create_firewall_bridge_ovs = sub {
my ($iface, $bridge, $tag) = @_;
my $create_firewall_bridge_ovs = sub {
my ($iface, $bridge, $tag) = @_;
- my ($vmid, $devid) = &$parse_tap_devive_name($iface);
+ my ($vmid, $devid) = &$parse_tap_device_name($iface);
my ($fwbr, undef, undef, $ovsintport) = &$compute_fwbr_names($vmid, $devid);
my $bridgemtu = &$read_bridge_mtu($bridge);
my ($fwbr, undef, undef, $ovsintport) = &$compute_fwbr_names($vmid, $devid);
my $bridgemtu = &$read_bridge_mtu($bridge);
my $cleanup_firewall_bridge = sub {
my ($iface) = @_;
my $cleanup_firewall_bridge = sub {
my ($iface) = @_;
- my ($vmid, $devid) = &$parse_tap_devive_name($iface, 1);
+ my ($vmid, $devid) = &$parse_tap_device_name($iface, 1);
return if !defined($vmid);
my ($fwbr, $vethfw, $vethfwpeer, $ovsintport) = &$compute_fwbr_names($vmid, $devid);
return if !defined($vmid);
my ($fwbr, $vethfw, $vethfwpeer, $ovsintport) = &$compute_fwbr_names($vmid, $devid);