proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-15 08:02:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: add get reachable networks: fix sorter closure

Browse Source 
argh, perl sorters and nested greps are weird!

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-09-17 17:47:14 +02:00
parent d7cafe5124
commit 4e4059580a
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PVE/CLIHandler.pm
View File

@ -208,7 +208,7 @@ sub generate_usage_str {
my $str = ''; my $str = '';
if (ref($def) eq 'HASH') { if (ref($def) eq 'HASH') {
my $oldclass = undef; my $oldclass = undef;
foreach my $cmd (&$sortfunc($def)) { foreach my $cmd ($sortfunc->($def)) {
if (ref($def->{$cmd}) eq 'ARRAY') { if (ref($def->{$cmd}) eq 'ARRAY') {
my ($class, $name, $arg_param, $fixed_param, undef, $formatter_properties) = @{$def->{$cmd}}; my ($class, $name, $arg_param, $fixed_param, undef, $formatter_properties) = @{$def->{$cmd}};

31
src/PVE/Network.pm
View File

@ -607,27 +607,20 @@ sub is_ip_in_cidr {
sub get_reachable_networks { sub get_reachable_networks {
my $raw = ''; my $raw = '';
run_command([qw(ip -j addr show up scope global)], outfunc => sub { $raw .= shift }); run_command([qw(ip -j addr show up scope global)], outfunc => sub { $raw .= shift });
my $addrs = decode_json($raw); my $decoded = decode_json($raw);
# sort by family (IPv4/IPv6) and then by addr, just for some stability
my $addrs_sorter = sub {
my ($a, $b) = @_;
my $family = $a->{family} cmp $b->{family};
return $family if $family != 0;
return $a->{local} cmp $b->{local};
};
my $addrs = []; # filter/transform first so that we can sort correctly more easily below
for my $e ($decoded->@*) {
next if !$e->{addr_info} || grep { $_ eq 'LOOPBACK' } $e->{flags}->@*;
push $addrs->@*, grep { scalar(keys $_->%*) } $e->{addr_info}->@*
}
my $res = []; my $res = [];
for my $addr ($addrs->@*) { for my $info (sort { $a->{family} cmp $b->{family} || $a->{local} cmp $b->{local} } $addrs->@*) {
next if !exists $addr->{addr_info}; push $res->@*, {
next if grep { $_ eq 'LOOPBACK' } $addr->{flags}->@*; addr => $info->{local},
for my $info (sort $addrs_sorter grep { $_ && $_->{local}} $addr->{addr_info}->@*) { cidr => "$info->{local}/$info->{prefixlen}",
push $res->@*, { family => $info->{family},
addr => $info->{local}, };
cidr => "$info->{local}/$info->{prefixlen}",
family => $info->{family},
};
}
} }
return $res; return $res;