From patchwork Sat Aug 6 23:53:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 2635 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id GLvPL9qL72IWLgAAIUCqbw (envelope-from ) for ; Sun, 07 Aug 2022 05:54:34 -0400 Received: from proxy8.mail.iad3b.rsapps.net ([172.31.255.6]) by director8.mail.ord1d.rsapps.net with LMTP id cMPnL9qL72LXSQAAfY0hYg (envelope-from ) for ; Sun, 07 Aug 2022 05:54:34 -0400 Received: from smtp39.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.iad3b.rsapps.net with LMTPS id 4LUsKdqL72LWTAAAoCsc3g (envelope-from ) for ; Sun, 07 Aug 2022 05:54:34 -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: smtp39.gate.iad3b.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=unstable.cc X-Suspicious-Flag: YES X-Classification-ID: f070bb16-1636-11ed-8642-5254002be87c-1-1 Received: from [216.105.38.7] ([216.105.38.7:37640] helo=lists.sourceforge.net) by smtp39.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 75/F5-09235-ADB8FE26; Sun, 07 Aug 2022 05:54:34 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1oKcyM-0007jA-SC; Sun, 07 Aug 2022 09:53:25 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oKcy7-0007it-KP for openvpn-devel@lists.sourceforge.net; Sun, 07 Aug 2022 09:53:10 +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:Cc:To:From:Sender:Reply-To: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=oTJwVvZMY1VZ/dkm5g/UB5uMvOCk24Yo3MjY+Qem93E=; b=Ub8Dna6cuU0jkDR77B6hiVYon7 9rrjkRPAsO7ufPF7gUMylAYnzClpgi4cpvjcVDuPcgnG7+eJ6B5WV0/L+ZG4V4pp95D2CyGDV0uKh fz4mFZcwvXe/RMo8oM2uLoZm/95q2CCYZ5asSlZYDf5bw1+fNfediGMgGNNfxkzNogvc=; 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:Cc:To:From:Sender:Reply-To: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=oTJwVvZMY1VZ/dkm5g/UB5uMvOCk24Yo3MjY+Qem93E=; b=JpqP6aTivXR0KljVx20FS9cefE Dduj9BpkK9JGCS/3SmUbGm15p7ScRJn8elUVMUgYk/JNr+KvU9GdFsVCsxp/twptHue+z9OnpSruM 7oyaJFTwSGUswDC1suihlDjNBaSKgGcYJKlmaS+amKgJe754GyjAfFoz9CTZlIn1kDUU=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1oKcy5-006cvu-8G for openvpn-devel@lists.sourceforge.net; Sun, 07 Aug 2022 09:53:10 +0000 From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Sun, 7 Aug 2022 11:53:29 +0200 Message-Id: <20220807095329.28819-1-a@unstable.cc> In-Reply-To: <20220805151325.14021-1-a@unstable.cc> References: 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: Allowing compression means that we may accept a pushable compress setting. This scenario can't work with DCO therefore disable it when compression is allowed. Signed-off-by: Antonio Quartulli --- Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1oKcy5-006cvu-8G Subject: [Openvpn-devel] [PATCH v2] dco: disable DCO if --allow-compress yes/asym was specified 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: , Cc: Antonio Quartulli Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Allowing compression means that we may accept a pushable compress setting. This scenario can't work with DCO therefore disable it when compression is allowed. Signed-off-by: Antonio Quartulli Acked-by: Gert Doering --- Changes from v1: * improve wording for message --- src/openvpn/dco.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index c40fe96f..3fd8f82a 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -352,9 +352,11 @@ dco_check_option_conflict(int msglevel, const struct options *o) } #if defined(USE_COMP) - if (o->comp.alg != COMP_ALG_UNDEF) + if (o->comp.alg != COMP_ALG_UNDEF + || o->comp.flags & COMP_F_ALLOW_ASYM + || o->comp.flags & COMP_F_ALLOW_COMPRESS) { - msg(msglevel, "Note: Using compression disables data channel offload."); + msg(msglevel, "Note: '--allow-compression' is not set to 'no', disabling data channel offload."); if (o->mode == MODE_SERVER && !(o->comp.flags & COMP_F_MIGRATE)) {