use PVE::ProcFSTools;
use PVE::INotify;
use File::Basename;
+use IO::Socket::IP;
+use POSIX qw(ECONNREFUSED);
# host network related utility functions
+our $ipv4_reverse_mask = [
+ '0.0.0.0',
+ '128.0.0.0',
+ '192.0.0.0',
+ '224.0.0.0',
+ '240.0.0.0',
+ '248.0.0.0',
+ '252.0.0.0',
+ '254.0.0.0',
+ '255.0.0.0',
+ '255.128.0.0',
+ '255.192.0.0',
+ '255.224.0.0',
+ '255.240.0.0',
+ '255.248.0.0',
+ '255.252.0.0',
+ '255.254.0.0',
+ '255.255.0.0',
+ '255.255.128.0',
+ '255.255.192.0',
+ '255.255.224.0',
+ '255.255.240.0',
+ '255.255.248.0',
+ '255.255.252.0',
+ '255.255.254.0',
+ '255.255.255.0',
+ '255.255.255.128',
+ '255.255.255.192',
+ '255.255.255.224',
+ '255.255.255.240',
+ '255.255.255.248',
+ '255.255.255.252',
+ '255.255.255.254',
+ '255.255.255.255',
+];
+
+our $ipv4_mask_hash_localnet = {
+ '255.255.0.0' => 16,
+ '255.255.128.0' => 17,
+ '255.255.192.0' => 18,
+ '255.255.224.0' => 19,
+ '255.255.240.0' => 20,
+ '255.255.248.0' => 21,
+ '255.255.252.0' => 22,
+ '255.255.254.0' => 23,
+ '255.255.255.0' => 24,
+ '255.255.255.128' => 25,
+ '255.255.255.192' => 26,
+ '255.255.255.224' => 27,
+ '255.255.255.240' => 28,
+ '255.255.255.248' => 29,
+ '255.255.255.252' => 30,
+};
+
sub setup_tc_rate_limit {
my ($iface, $rate, $burst, $debug) = @_;
system("/sbin/tc class del dev $iface parent 1: classid 1:1 >/dev/null 2>&1");
- system("/sbin/tc filter del dev $iface parent ffff: protocol ip prio 50 estimator 1sec 8sec >/dev/null 2>&1");
+ system("/sbin/tc filter del dev $iface parent ffff: protocol all pref 50 u32 >/dev/null 2>&1");
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;
- run_command("/sbin/tc qdisc add dev $iface handle ffff: ingress");
-
- # this does not work wit virtio - don't know why (setting "mtu 64kb" does not help)
- #run_command("/sbin/tc filter add dev $iface parent ffff: protocol ip prio 50 u32 match ip src 0.0.0.0/0 police rate ${rate}bps burst ${burst}b drop flowid :1");
- # so we use avrate instead
- run_command("/sbin/tc filter add dev $iface parent ffff: " .
- "protocol ip prio 50 estimator 1sec 8sec " .
- "u32 match ip src 0.0.0.0/0 police avrate ${rate}bps drop flowid :1");
-
# tbf does not work for unknown reason
#$TC qdisc add dev $DEV root tbf rate $RATE latency 100ms burst $BURST
# so we use htb instead
run_command("/sbin/tc class add dev $iface parent 1: classid 1:1 " .
"htb rate ${rate}bps burst ${burst}b");
+ run_command("/sbin/tc qdisc add dev $iface handle ffff: ingress");
+ run_command("/sbin/tc filter add dev $iface parent ffff: " .
+ "protocol all prio 50 u32 match u32 0 0 " .
+ "police rate ${rate}bps burst ${burst}b mtu 64kb " .
+ "drop flowid :1");
+
if ($debug) {
print "DEBUG tc settings\n";
system("/sbin/tc qdisc ls dev $iface");
return $mtu;
};
-my $parse_tap_devive_name = sub {
+my $parse_tap_device_name = sub {
my ($iface, $noerr) = @_;
my ($vmid, $devid);
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 {
};
my $bridge_add_interface = sub {
- my ($bridge, $iface) = @_;
+ my ($bridge, $iface, $tag) = @_;
system("/sbin/brctl addif $bridge $iface") == 0 ||
die "can't add interface 'iface' to bridge '$bridge'\n";
+
+ my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
+
+ if ($vlan_aware) {
+ if ($tag) {
+ system("/sbin/bridge vlan add dev $iface vid $tag pvid untagged") == 0 ||
+ die "unable to add vlan $tag to interface $iface\n";
+ } else {
+ system("/sbin/bridge vlan add dev $iface vid 2-4094") == 0 ||
+ die "unable to add vlan $tag to interface $iface\n";
+ }
+ }
};
my $ovs_bridge_add_port = sub {
die "interface activation failed\n" if $@;
}
-my $create_firewall_bridge_linux = sub {
- my ($iface, $bridge) = @_;
+sub veth_create {
+ my ($veth, $vethpeer, $bridge, $mac) = @_;
- my ($vmid, $devid) = &$parse_tap_devive_name($iface);
- my ($fwbr, $vethfw, $vethfwpeer) = &$compute_fwbr_names($vmid, $devid);
+ die "unable to get bridge setting\n" if !$bridge;
my $bridgemtu = &$read_bridge_mtu($bridge);
- &$cond_create_bridge($fwbr);
- &$activate_interface($fwbr);
-
- copy_bridge_config($bridge, $fwbr);
# create veth pair
- if (! -d "/sys/class/net/$vethfw") {
- system("/sbin/ip link add name $vethfw type veth peer name $vethfwpeer mtu $bridgemtu") == 0 ||
- die "can't create interface $vethfw\n";
+ if (! -d "/sys/class/net/$veth") {
+ my $cmd = "/sbin/ip link add name $veth type veth peer name $vethpeer mtu $bridgemtu";
+ $cmd .= " addr $mac" if $mac;
+ system($cmd) == 0 || die "can't create interface $veth\n";
}
# up vethpair
- &$activate_interface($vethfw);
- &$activate_interface($vethfwpeer);
+ &$activate_interface($veth);
+ &$activate_interface($vethpeer);
+}
+
+sub veth_delete {
+ my ($veth) = @_;
+
+ if (-d "/sys/class/net/$veth") {
+ run_command("/sbin/ip link delete dev $veth", outfunc => sub {}, errfunc => sub {});
+ }
+
+}
+
+my $create_firewall_bridge_linux = sub {
+ my ($iface, $bridge, $tag) = @_;
+
+ my ($vmid, $devid) = &$parse_tap_device_name($iface);
+ my ($fwbr, $vethfw, $vethfwpeer) = &$compute_fwbr_names($vmid, $devid);
+
+ &$cond_create_bridge($fwbr);
+ &$activate_interface($fwbr);
+
+ copy_bridge_config($bridge, $fwbr);
+ veth_create($vethfw, $vethfwpeer, $bridge);
&$bridge_add_interface($fwbr, $vethfw);
- &$bridge_add_interface($bridge, $vethfwpeer);
+ &$bridge_add_interface($bridge, $vethfwpeer, $tag);
- return $fwbr;
+ &$bridge_add_interface($fwbr, $iface);
};
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 $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);
}
# delete old vethfw interface
- if (-d "/sys/class/net/$vethfw") {
- run_command("/sbin/ip link delete dev $vethfw", outfunc => sub {}, errfunc => sub {});
- }
+ veth_delete($vethfw);
# cleanup fwbr bridge
if (-d "/sys/class/net/$fwbr") {
if (-d "/sys/class/net/$bridge/bridge") {
&$cleanup_firewall_bridge($iface); # remove stale devices
- my $newbridge = activate_bridge_vlan($bridge, $tag);
- copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+ my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
+
+ if (!$vlan_aware) {
+ my $newbridge = activate_bridge_vlan($bridge, $tag);
+ copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+ $bridge = $newbridge;
+ $tag = undef;
+ }
- $newbridge = &$create_firewall_bridge_linux($iface, $newbridge) if $firewall;
+ if ($firewall) {
+ &$create_firewall_bridge_linux($iface, $bridge, $tag);
+ } else {
+ &$bridge_add_interface($bridge, $iface, $tag);
+ }
- &$bridge_add_interface($newbridge, $iface);
} else {
&$cleanup_firewall_bridge($iface); # remove stale devices
# create vlan on $iface is not already exist
if (! -d "/sys/class/net/$ifacevlan") {
- system("/sbin/vconfig add $iface $tag") == 0 ||
+ system("/sbin/ip link add link $iface name ${iface}.${tag} type vlan id $tag") == 0 ||
die "can't add vlan tag $tag to interface $iface\n";
}
return $bridgevlan;
}
+sub tcp_ping {
+ my ($host, $port, $timeout) = @_;
+
+ my $refused = 1;
+
+ $timeout = 3 if !$timeout; # sane default
+ if (!$port) {
+ # Net::Ping defaults to the echo port
+ $port = 7;
+ } else {
+ # Net::Ping's port_number() implies service_check(1)
+ $refused = 0;
+ }
+
+ my ($sock, $result);
+ eval {
+ $result = PVE::Tools::run_with_timeout($timeout, sub {
+ $sock = IO::Socket::IP->new(PeerHost => $host, PeerPort => $port, Type => SOCK_STREAM);
+ $result = $refused if $! == ECONNREFUSED;
+ });
+ };
+ if ($sock) {
+ $sock->close();
+ $result = 1;
+ }
+ return $result;
+}
+
1;
projects / pve-common.git / blobdiff