From patchwork Wed Dec 9 03:20:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1544 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.27.255.7]) by backend30.mail.ord1d.rsapps.net with LMTP id 4PhJCoTd0F/tQgAAIUCqbw (envelope-from ) for ; Wed, 09 Dec 2020 09:21:56 -0500 Received: from proxy11.mail.iad3a.rsapps.net ([172.27.255.7]) by director11.mail.ord1d.rsapps.net with LMTP id CJlKCoTd0F9KIwAAvGGmqA (envelope-from ) for ; Wed, 09 Dec 2020 09:21:56 -0500 Received: from smtp23.gate.iad3a ([172.27.255.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy11.mail.iad3a.rsapps.net with LMTPS id 8EP3AYTd0F/qTQAAxCvdqw (envelope-from ) for ; Wed, 09 Dec 2020 09:21:56 -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: smtp23.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: e361d882-3a29-11eb-a843-52540033eb40-1-1 Received: from [216.105.38.7] ([216.105.38.7:49328] helo=lists.sourceforge.net) by smtp23.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 0F/3E-01215-38DD0DF5; Wed, 09 Dec 2020 09:21:55 -0500 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.90_1) (envelope-from ) id 1kn0L2-0001Nw-Qo; Wed, 09 Dec 2020 14:21:04 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn0L1-0001Nf-Jd for openvpn-devel@lists.sourceforge.net; Wed, 09 Dec 2020 14:21:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=34w9Mah9N+JN2/Sci+MBmsNPKADcgmdQJtagjL8RvrQ=; b=LS6nv5xFOW1XCwVIwEVLm2km3M i3DRgdVGfikPjj27E3wpZ3uocRf5G+wJFbBz/rXKqs7L0hbRpVskf0H+oUgHLupJ41X5zHXsdTfVM Wq6mDw9vNZZM6mmxS60RdZN/RZ+sMifuAVMFth6TXGmkCNrt/+s64+DuqwEMj/WO4FWY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding: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=34w9Mah9N+JN2/Sci+MBmsNPKADcgmdQJtagjL8RvrQ=; b=mDEwEw56fFMH2vBl9tWdBxBYI7 s5hQAvcqr7ZQTOWnjM+u39EgEJWf9ooceT57hTUyh8PUHfE1gn/8Fm0dufavMhJLhPeRCGxBrxu8h xC+nmZ7490Z/kCE8ZioHsNlf0tG5xQ7rJaANil2jQlHLdnHbeBLQy0B7GvugvuplaYD4=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1kn0Kz-007oa1-9I for openvpn-devel@lists.sourceforge.net; Wed, 09 Dec 2020 14:21:03 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kn0Kj-000E0d-PV for openvpn-devel@lists.sourceforge.net; Wed, 09 Dec 2020 15:20:45 +0100 Received: (nullmailer pid 4540 invoked by uid 10006); Wed, 09 Dec 2020 14:20:45 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 9 Dec 2020 15:20:45 +0100 Message-Id: <20201209142045.4489-3-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201209142045.4489-1-arne@rfc2549.org> References: <20201209142045.4489-1-arne@rfc2549.org> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1kn0Kz-007oa1-9I Subject: [Openvpn-devel] [PATCH 3/3] Restore also ping related options on a reconnect 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This fixes the issue that if a client reconnects the next connection entries inherits the keepalive settings that were pushed or set by the previous entry. Since UDP+PULL entries have an implicit 120s timeout, this timeout also got applied to a TCP session after an UDP entry. Reported-By: Jan Just Keijser Signed-off-by: Arne Schwabe --- src/openvpn/options.c | 9 +++++++++ src/openvpn/options.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 9ab2ead2..95201094 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3600,6 +3600,11 @@ pre_pull_save(struct options *o) o->pre_pull->ciphername = o->ciphername; o->pre_pull->authname = o->authname; o->pre_pull->keysize = o->keysize; + + /* Ping related options should be reset to the config values on reconnect */ + o->pre_pull->ping_rec_timeout = o->ping_rec_timeout; + o->pre_pull->ping_rec_timeout_action = o->ping_rec_timeout_action; + o->pre_pull->ping_send_timeout = o->ping_send_timeout; } } @@ -3651,6 +3656,10 @@ pre_pull_restore(struct options *o, struct gc_arena *gc) o->ciphername = pp->ciphername; o->authname = pp->authname; o->keysize = pp->keysize; + + o->ping_rec_timeout = pp->ping_rec_timeout; + o->ping_rec_timeout_action = pp->ping_rec_timeout_action; + o->ping_send_timeout = pp->ping_send_timeout; } o->push_continuation = 0; diff --git a/src/openvpn/options.h b/src/openvpn/options.h index df0b4030..830ede47 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -79,6 +79,10 @@ struct options_pre_pull const char* authname; int keysize; + int ping_send_timeout; + int ping_rec_timeout; + int ping_rec_timeout_action; + int foreign_option_index; };