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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 55A087B3E2 for ; Wed, 12 May 2021 09:29:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 48F88999B for ; Wed, 12 May 2021 09:29:44 +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 291EC998C for ; Wed, 12 May 2021 09:29:43 +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 ED3234655A for ; Wed, 12 May 2021 09:29:36 +0200 (CEST) From: Wolfgang Bumiller To: pbs-devel@lists.proxmox.com Date: Wed, 12 May 2021 09:29:31 +0200 Message-Id: <20210512072931.2882-2-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210512072931.2882-1-w.bumiller@proxmox.com> References: <20210512072931.2882-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.018 Adjusted score from AWL reputation of From: address 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 Subject: [pbs-devel] [PATCH backup 2/2] proxy: fix accept future "rearming" X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2021 07:29:44 -0000 this must happen regardless of whether we got an error Signed-off-by: Wolfgang Bumiller --- src/bin/proxmox-backup-proxy.rs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index e8c31c4d..4bf3fb56 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -237,16 +237,18 @@ async fn accept_connection( } continue; } - res = &mut accept => match res { - Err(err) => { - eprintln!("error accepting tcp connection: {}", err); - continue; - } - Ok((new_sock, _addr)) => { - // rearm the accept future: - accept = Box::pin(listener.accept()); - - sock = new_sock; + res = &mut accept => { + // rearm the accept future: + accept = Box::pin(listener.accept()); + + match res { + Err(err) => { + eprintln!("error accepting tcp connection: {}", err); + continue; + } + Ok((new_sock, _addr)) => { + sock = new_sock; + } } } }; -- 2.20.1