From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 536F571B8A for ; Fri, 11 Jun 2021 17:56:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 503CD151DB for ; Fri, 11 Jun 2021 17:56:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DAA9E151D2 for ; Fri, 11 Jun 2021 17:56:00 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B2B4F43498 for ; Fri, 11 Jun 2021 17:56:00 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Fri, 11 Jun 2021 17:55:52 +0200 Message-Id: <20210611155552.27478-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.876 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [daemon.pm] Subject: [pve-devel] [PATCH common] Revert "daemon: add compat code for pmgproxy 6.x" X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2021 15:56:31 -0000 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 --- 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