From patchwork Wed Nov 30 16:57:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2877 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id CJ5vHJCLh2PdbAAAIUCqbw (envelope-from ) for ; Wed, 30 Nov 2022 11:57:52 -0500 Received: from proxy9.mail.ord1d.rsapps.net ([172.30.191.6]) by director13.mail.ord1d.rsapps.net with LMTP id iB9QHJCLh2NqHgAA91zNiA (envelope-from ) for ; Wed, 30 Nov 2022 11:57:52 -0500 Received: from smtp36.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy9.mail.ord1d.rsapps.net with LMTPS id sOLiG5CLh2NUDwAA7h+8OQ (envelope-from ) for ; Wed, 30 Nov 2022 11:57:52 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp36.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 2050adf2-70d0-11ed-8d6c-525400c11307-1-1 Received: from [216.105.38.7] ([216.105.38.7:59376] helo=lists.sourceforge.net) by smtp36.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id AC/66-02884-F8B87836; Wed, 30 Nov 2022 11:57:52 -0500 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1p0QOn-00057l-RB; Wed, 30 Nov 2022 16:57:29 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1p0QOm-00057e-5Q for openvpn-devel@lists.sourceforge.net; Wed, 30 Nov 2022 16:57:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=K013C5TdhgbOlN4BTu27MgeNZHNKMkHBNMSYcjk5J88=; b=TOAAXlYRWg7rP/iWQ2TM9EYVOJ iAANiceka9c0lbpK0u4IbCgjwzbatMZ/O2Kz2Op1fK17laSZosf6X/YBUywVigwHxWTeCWlhZIjcG hWs0EYBf6z8xDT7EOyG96fS6A13LoynVr6CXs+qibGXoEhySiP7VWytaaa6okYPnU9sU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=K013C5TdhgbOlN4BTu27MgeNZHNKMkHBNMSYcjk5J88=; b=L DqE+djMNI3Om2LkmtuaUr6f+wagXn+VurnjyPbcR1NaQ5awaWQTD1HyBDlUmc+GnKAV2BtjPjX697 aGUzVFXnFZ53JgXzonPcSizwAUKBOPWHmzsMZAi93lbxcC95wEc8ichRb5dIppA0zryTVWdF4nMX+ VOd11h7gwaK+fnCk=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1p0QOh-001aMO-7V for openvpn-devel@lists.sourceforge.net; Wed, 30 Nov 2022 16:57:24 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1p0QOW-0007Bh-W6 for openvpn-devel@lists.sourceforge.net; Wed, 30 Nov 2022 17:57:12 +0100 Received: (nullmailer pid 159729 invoked by uid 10006); Wed, 30 Nov 2022 16:57:12 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 30 Nov 2022 17:57:12 +0100 Message-Id: <20221130165712.159683-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: When we fail initialisation the connection (e.g. P2P cipher NCP), we have a non-working connection. Even though previous version would then stay in this state, it does not really make sense to be in t [...] Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different X-Headers-End: 1p0QOh-001aMO-7V Subject: [Openvpn-devel] [PATCH] Signal USR1 when connection initialising fails X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox When we fail initialisation the connection (e.g. P2P cipher NCP), we have a non-working connection. Even though previous version would then stay in this state, it does not really make sense to be in this state until the keepalive timeout expires and triggers a USR1 anyway. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/forward.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 37340aef5..1b418b1bc 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -344,7 +344,10 @@ check_connection_established(struct context *c) } else { - do_up(c, false, 0); + if (!do_up(c, false, 0)) + { + register_signal(c, SIGUSR1, "connection initialisation failed"); + } } event_timeout_clear(&c->c2.wait_for_connect);