From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH common] Revert "daemon: add compat code for pmgproxy 6.x"
Date: Fri, 11 Jun 2021 17:55:52 +0200 [thread overview]
Message-ID: <20210611155552.27478-1-s.ivanov@proxmox.com> (raw)
This reverts commit a3777dce67cf17cafa82deeeedd9e6067eeb2e2e.
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>
---
src/PVE/Daemon.pm | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/PVE/Daemon.pm b/src/PVE/Daemon.pm
index 2095001..2ab4f35 100644
--- a/src/PVE/Daemon.pm
+++ b/src/PVE/Daemon.pm
@@ -799,7 +799,7 @@ sub register_status_command {
# some useful helper
sub create_reusable_socket {
- my ($self, $port, $host, $family) = @_;
+ my ($self, $port, $host) = @_;
die "no port specifed" if !$port;
@@ -818,6 +818,7 @@ sub create_reusable_socket {
$socket->fcntl(Fcntl::F_SETFD(), Fcntl::FD_CLOEXEC);
} else {
+
my %sockargs = (
LocalPort => $port,
Listen => SOMAXCONN,
@@ -825,16 +826,7 @@ sub create_reusable_socket {
GetAddrInfoFlags => 0,
ReuseAddr => 1,
);
-
- # 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)) {
+ if (defined($host)) {
$socket = IO::Socket::IP->new( LocalHost => $host, %sockargs) ||
die "unable to create socket - $@\n";
} else {
--
2.20.1
next reply other threads:[~2021-06-11 15:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 15:55 Stoiko Ivanov [this message]
2021-06-15 8:19 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210611155552.27478-1-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox