From patchwork Thu Apr 8 02:00:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1725 X-Patchwork-Delegate: gert@greenie.muc.de Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.27.255.9]) by backend30.mail.ord1d.rsapps.net with LMTP id yLUgObnwbmBEewAAIUCqbw (envelope-from ) for ; Thu, 08 Apr 2021 08:02:01 -0400 Received: from proxy12.mail.iad3a.rsapps.net ([172.27.255.9]) by director15.mail.ord1d.rsapps.net with LMTP id eN3kOLnwbmAHFQAAIcMcQg (envelope-from ) for ; Thu, 08 Apr 2021 08:02:01 -0400 Received: from smtp18.gate.iad3a ([172.27.255.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy12.mail.iad3a.rsapps.net with LMTPS id +DtpMLnwbmBDLAAAh9K5Vw (envelope-from ) for ; Thu, 08 Apr 2021 08:02:01 -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: 39af4116-9862-11eb-817a-5254008b8116-1-1 Received: from [216.105.38.7] ([216.105.38.7:33942] 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 41/10-17128-9B0FE606; Thu, 08 Apr 2021 08:02:01 -0400 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.92.3) (envelope-from ) id 1lUTLF-0007x0-0g; Thu, 08 Apr 2021 12:00:57 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1lUTLD-0007wp-8N for openvpn-devel@lists.sourceforge.net; Thu, 08 Apr 2021 12:00:55 +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=I1fwaTbJmdzBcAczjijFF9TPl3QUmXKMgYVAAP4NfQU=; b=AfGzQIVIfpSQSIlkHMH6XLLifW lyiJvbEd918DgcFDFu8djmExOkboCRZ3HMqqwB6v8sf0+yLpXKkyBzkAI94ea2Qc9BCzwVzbHWZOr ryOSdkT/f5NDi4dP4m3su3029ablOul6aQmupyxJw8VKyabF4CYgBS3XPERCbVUuv42s=; 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=I1fwaTbJmdzBcAczjijFF9TPl3QUmXKMgYVAAP4NfQU=; b=kFASn+yc1mOo5xUUO6jjnYxW8J 2kS/dPFg38XoiNxHxsNR5PY565dBT7qAliAojhIheSZkofLc2d5nzVHvjgPhDJEzvXryJrXKMCRm5 9IYXNrCLzSn9ABdrmA3wnTL8wlWW9/LX+Sgwr+KeB5AaXUOZ4oaItFHMvStZXPHeR4vo=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1lUTL2-004RX4-2t for openvpn-devel@lists.sourceforge.net; Thu, 08 Apr 2021 12:00:55 +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 1lUTKn-000D7u-RZ for openvpn-devel@lists.sourceforge.net; Thu, 08 Apr 2021 14:00:29 +0200 Received: (nullmailer pid 19486 invoked by uid 10006); Thu, 08 Apr 2021 12:00:29 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 8 Apr 2021 14:00:28 +0200 Message-Id: <20210408120029.19438-2-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210408120029.19438-1-arne@rfc2549.org> References: <20210408120029.19438-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: 1lUTL2-004RX4-2t Subject: [Openvpn-devel] [PATCH 2/3] Also restore/save compress related options in reconnects 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 Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/options.c | 11 +++++++++++ src/openvpn/options.h | 3 +++ 2 files changed, 14 insertions(+) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index a72e1b9ae..00ad98f15 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3595,9 +3595,15 @@ pre_connect_save(struct options *o) o->pre_connect->authname = o->authname; /* Ping related options should be reset to the config values on reconnect */ + o->pre_connect->ping_rec_timeout = o->ping_rec_timeout; o->pre_connect->ping_rec_timeout_action = o->ping_rec_timeout_action; o->pre_connect->ping_send_timeout = o->ping_send_timeout; + + /* Miscellaneous Options */ +#ifdef USE_COMP + o->pre_connect->comp = o->comp; +#endif } void @@ -3650,6 +3656,11 @@ pre_connect_restore(struct options *o, struct gc_arena *gc) 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; + + /* Miscellaneous Options */ +#ifdef USE_COMP + o->comp = pp->comp; +#endif } o->push_continuation = 0; diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 078bed75b..f52768680 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -81,6 +81,9 @@ struct options_pre_connect int ping_rec_timeout_action; int foreign_option_index; +#ifdef USE_COMP + struct compress_options comp; +#endif }; #if !defined(ENABLE_CRYPTO_OPENSSL) && !defined(ENABLE_CRYPTO_MBEDTLS)