From patchwork Wed Oct 12 13:34:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2814 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.27.255.50]) by backend30.mail.ord1d.rsapps.net with LMTP id mFOGJKTCRmMHMAAAIUCqbw (envelope-from ) for ; Wed, 12 Oct 2022 09:35:32 -0400 Received: from proxy1.mail.iad3a.rsapps.net ([172.27.255.50]) by director7.mail.ord1d.rsapps.net with LMTP id iM9WJKTCRmPcFQAAovjBpQ (envelope-from ) for ; Wed, 12 Oct 2022 09:35:32 -0400 Received: from smtp18.gate.iad3a ([172.27.255.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.iad3a.rsapps.net with LMTPS id sBx6HaTCRmNVcQAA8TVjwQ (envelope-from ) for ; Wed, 12 Oct 2022 09:35:32 -0400 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: smtp18.gate.iad3a.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: bdb708b2-4a32-11ed-8254-5254008b8116-1-1 Received: from [216.105.38.7] ([216.105.38.7:42514] helo=lists.sourceforge.net) by smtp18.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 1A/5D-24605-3A2C6436; Wed, 12 Oct 2022 09:35:31 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1oibt6-0005A4-AU; Wed, 12 Oct 2022 13:35:08 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1oibt4-00059m-5V for openvpn-devel@lists.sourceforge.net; Wed, 12 Oct 2022 13:35:06 +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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jViATnmjmKLvN30P00bOJ9IXLCbPFsndHf1BnOb9+/M=; b=iFhEG/T18TasaMbvpNtYAclWpk T28/6D0XCs3ipT8KeyYRTIa6PI0itlKlR03nsJANSLTRwVr1Ybp+xizYHrdft6gsdwpGwtoqtMFsJ Xl93KnjtrnebFm1C/lSbcEP/v1LQfuKlTk+1YAEawccYTyjXs2hBwOlJzOwtmRfVcz2Q=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=jViATnmjmKLvN30P00bOJ9IXLCbPFsndHf1BnOb9+/M=; b=EHbyaGdkfdf20U+coqd3/ddeq6 z9yTyqo0e5O+rHkxuwKqgWA4fMhQHfjZGXyqx3ILQXt2ZQpv+bFbIkTJKj870l5/dFUcZGm5Yfwp1 tH6ksyiY8BoEABPH3wJ3Fijkw5sGyV7M6qTHMSNYgJOc5cyBo+zcFBv/VUVRqpiKG+yw=; 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 1oibt3-001AOn-2v for openvpn-devel@lists.sourceforge.net; Wed, 12 Oct 2022 13:35:06 +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 1oibsv-0000gk-2d for openvpn-devel@lists.sourceforge.net; Wed, 12 Oct 2022 15:34:57 +0200 Received: (nullmailer pid 1927922 invoked by uid 10006); Wed, 12 Oct 2022 13:34:57 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 12 Oct 2022 15:34:56 +0200 Message-Id: <20221012133457.1927871-3-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221012133457.1927871-1-arne@rfc2549.org> References: <20221012133457.1927871-1-arne@rfc2549.org> 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: This allows a reconnect in p2p mode and has the side effect of updating the peer address with the peerid Signed-off-by: Arne Schwabe --- src/openvpn/forward.c | 7 +++++++ 1 file changed, 7 insertions(+) Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 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 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1oibt3-001AOn-2v Subject: [Openvpn-devel] [PATCH 3/3] Call dco_p2p_add_new_peer again if the peer id changes 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 This allows a reconnect in p2p mode and has the side effect of updating the peer address with the peerid Signed-off-by: Arne Schwabe --- src/openvpn/forward.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 8db4f2ce1..e56028c0c 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -150,6 +150,13 @@ check_dco_key_status(struct context *c) return; } + /* If the DCO peer id changed, we need to readd the peer */ + if (c->c2.tls_multi->dco_peer_id != -1 + && c->c2.tls_multi->peer_id != c->c2.tls_multi->dco_peer_id) + { + dco_p2p_add_new_peer(c); + } + dco_update_keys(&c->c1.tuntap->dco, c->c2.tls_multi); }