proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-06-05 14:50:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add a socket family argument to next_*_port functions

Browse Source 
Instead of assuming a local address of 0.0.0.0, the next_*_port family
of functions now takes an optional packet family argument (AF_INET/AF_INET6),
used for ipv6 support.
This commit is contained in:
Wolfgang Bumiller 2015-05-12 09:51:11 +02:00 committed by Dietmar Maurer
parent 4808fea7c0
commit 467752183d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/PVE/Tools.pm
View File

@ -660,7 +660,7 @@ sub wait_for_vnc_port {
} }
sub next_unused_port { sub next_unused_port {
my ($range_start, $range_end) = @_; my ($range_start, $range_end, $family) = @_;
# We use a file to register allocated ports. # We use a file to register allocated ports.
# Those registrations expires after $expiretime. # Those registrations expires after $expiretime.
@ -693,9 +693,9 @@ sub next_unused_port {
next if $ports->{$p}; # reserved next if $ports->{$p}; # reserved
my $sock = IO::Socket::IP->new(Listen => 5, my $sock = IO::Socket::IP->new(Listen => 5,
LocalAddr => '0.0.0.0',
LocalPort => $p, LocalPort => $p,
ReuseAddr => 1, ReuseAddr => 1,
Family => $family,
Proto => 0); Proto => 0);
if ($sock) { if ($sock) {
@ -725,15 +725,18 @@ sub next_unused_port {
} }
sub next_migrate_port { sub next_migrate_port {
return next_unused_port(60000, 60050); my ($family) = @_;
return next_unused_port(60000, 60050, $family);
} }
sub next_vnc_port { sub next_vnc_port {
return next_unused_port(5900, 6000); my ($family) = @_;
return next_unused_port(5900, 6000, $family);
} }
sub next_spice_port { sub next_spice_port {
return next_unused_port(61000, 61099); my ($family) = @_;
return next_unused_port(61000, 61099, $family);
} }
# NOTE: NFS syscall can't be interrupted, so alarm does # NOTE: NFS syscall can't be interrupted, so alarm does