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

Revert "daemon: add compat code for pmgproxy 6.x"

Browse Source 
This reverts commit a3777dce67.

With the upcoming release of pmg-api 7.0 we included the changes for
configuring a LISTEN_IP, thus this compatibility code is not needed
anymore.

Quickly tested with current pmg-api master

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2021-06-11 17:55:52 +02:00 committed by Thomas Lamprecht
parent 4d22a9729d
commit bc885c89b6
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/PVE/Daemon.pm
View File

@ -799,7 +799,7 @@ sub register_status_command {
# some useful helper # some useful helper
sub create_reusable_socket { sub create_reusable_socket {
my ($self, $port, $host, $family) = @_; my ($self, $port, $host) = @_;
die "no port specifed" if !$port; die "no port specifed" if !$port;
@ -818,6 +818,7 @@ sub create_reusable_socket {
$socket->fcntl(Fcntl::F_SETFD(), Fcntl::FD_CLOEXEC); $socket->fcntl(Fcntl::F_SETFD(), Fcntl::FD_CLOEXEC);
} else { } else {
my %sockargs = ( my %sockargs = (
LocalPort => $port, LocalPort => $port,
Listen => SOMAXCONN, Listen => SOMAXCONN,
@ -825,16 +826,7 @@ sub create_reusable_socket {
GetAddrInfoFlags => 0, GetAddrInfoFlags => 0,
ReuseAddr => 1, ReuseAddr => 1,
); );
if (defined($host)) {
# FIXME: drop this if clause and the $family parameter with 7.0:
# compat code for pmgproxy
if (defined($family)) {
$socket = IO::Socket::IP->new(
Family => $family,
LocalHost => $host,
%sockargs) ||
die "unable to create socket - $@\n";
} elsif (defined($host)) {
$socket = IO::Socket::IP->new( LocalHost => $host, %sockargs) || $socket = IO::Socket::IP->new( LocalHost => $host, %sockargs) ||
die "unable to create socket - $@\n"; die "unable to create socket - $@\n";
} else { } else {