From patchwork Wed Feb 5 12:23:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4120 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:7882:b0:5e7:b9eb:58e8 with SMTP id d2csp794652max; Wed, 5 Feb 2025 04:23:57 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVDsJYdNuJaDMR/+H4Vv8sMW/2RJL/KGAP2wII42KCKfO1e07ElnCNxpa1RzRqL5+RN+fX5z0G3rx8=@openvpn.net X-Google-Smtp-Source: AGHT+IEKmdWcC8W3IyKTJqJilXG6OtAosx6XjMShhkCtrsfNUOFzXvjHY76Nnv9ItQruZeq+hvUI X-Received: by 2002:a05:6808:2443:b0:3eb:45e7:2bb2 with SMTP id 5614622812f47-3f37c10c4a1mr1593068b6e.10.1738758237357; Wed, 05 Feb 2025 04:23:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738758237; cv=none; d=google.com; s=arc-20240605; b=BNAXNSGM9IG0PW0YaVIP081IsXINwjlmF1gJXW2EtCaD9KaybEXOH0ScjJqvAk6Bs2 Ec2vki/+XJnKwLBifTYpS2jiwDFM+L8xK5DOxEpcglBIzxmbWwXdA6Q0xz8NTeh9jV3U 5+d3jDUiTcbBCxCaB6PoKp1Hw/37qQVUFmE41Fh5EOpyD/4xQ4/FsXelKYFKFOkkz7DP xLGDvSeE7O9edukPlXe3AULjgjaURi8SMIK7yFHkRN7Q9bcc6Qkv5hui92Hcb68pEq9l sxK2zpvKn8rt1T6HxdT0AIgkhRXxSK1miCM9Ha2oO8ftTtV0S87RnNmBUGFCv8UbKUSe v+lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=tadFU4PG2cI/FJPNPN+OV3Qz3a2zImWfI+qc+BlVg5E=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=Hs8h5qGz8p5t+RERB5KJTLZ41EnlXHmB8FeRz9lOMlGyTO3wSOuGWpntdWaj9lAFyB Wpghzlwf5YUUbIM49cz7ixrK6SWxIzPgRz5ejLeAgViFoLjlqHWRdT0G/ZRt2WlVMrRD KffY3DWwCS6qR0erm+2t3rLBa80PJok0ailyM/CtBC06WOFLdBB/JiNGxXoXubPP1ps7 8vRwY+ZrA2+6xfArYgTLJ7SjshAbq0Q6p7ohbuTomkVYc9XXd/6IxYFnp0KrjH1O3S/L ZU9KzFp41J02dt+VONvH2qqiG9itoTt0Y27vxAmdSA8hDTALCdRM4m3d4mZEQyHdThbE 59iw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=WRY1I2kE; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="Pp/06tPP"; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 5614622812f47-3f36d2b79d7si2973110b6e.126.2025.02.05.04.23.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Feb 2025 04:23:57 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=WRY1I2kE; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="Pp/06tPP"; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de 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 1tfeRe-0001en-G4; Wed, 05 Feb 2025 12:23:55 +0000 Received: from [172.30.29.66] (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 1tfeRd-0001eh-6S for openvpn-devel@lists.sourceforge.net; Wed, 05 Feb 2025 12:23:53 +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=2/vH+zY05gzBWKD9PLQOuSf/utnU+1dGpXgkwfk2tHw=; b=WRY1I2kEwKlqwr/3Vdvvc9wWJV msXYqo9IjMym/rxxn1RQ2Vdh+t1u7E6HJZ22WLwNqkbk1AJKMFcjtFljfilAf+f+RLIfqWQw+EBNY zxdzeQ9L33Qdmml4VwS83cNErXHllky+kLAVSrZNI4qgnX5EUzhft2zOgsar8edWXAN0=; 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=2/vH+zY05gzBWKD9PLQOuSf/utnU+1dGpXgkwfk2tHw=; b=Pp/06tPPmG0mCncvzSFut5dbV5 IWL19NX+eTV9l5iRCUSbkXvSaXALP92l3cWzMssEyJ+Amv7EjsoGO2BlERE9IUmWSlSMzq8K03ciZ kOwDo4JC0qKSdTNdsFmQFd1yl+PXP9e5xqIX9fdpT5jRUzAHpVHOdcrF/3bMKa/EI9mg=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1tfeRY-0006Nj-V0 for openvpn-devel@lists.sourceforge.net; Wed, 05 Feb 2025 12:23:53 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 515CNgsi004954 for ; Wed, 5 Feb 2025 13:23:42 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 515CNghG004953 for openvpn-devel@lists.sourceforge.net; Wed, 5 Feb 2025 13:23:42 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 5 Feb 2025 13:23:41 +0100 Message-ID: <20250205122341.4944-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: From: Lev Stipakov dco-win doesn't yet support multisocket, so for the time being we have to fallback to tap-windows6. Change-Id: I8724eda269b816dd2cfd0833d467e6d24054e96f Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in sa-accredit.habeas.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1tfeRY-0006Nj-V0 Subject: [Openvpn-devel] [PATCH v2] dco-win: disable dco in server mode if multiple --local options defined 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 X-GMAIL-THRID: =?utf-8?q?1823213054176094408?= X-GMAIL-MSGID: =?utf-8?q?1823220157491344824?= From: Lev Stipakov dco-win doesn't yet support multisocket, so for the time being we have to fallback to tap-windows6. Change-Id: I8724eda269b816dd2cfd0833d467e6d24054e96f Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/885 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index b5a2136..c65aece 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -279,6 +279,12 @@ msg(msglevel, "NOTE: --remote is not defined. This DCO version doesn't support multipeer. Disabling Data Channel Offload"); return false; } + + if ((mode == MODE_SERVER) && (ce->local_list->len > 1)) + { + msg(msglevel, "NOTE: multiple --local options defined, disabling data channel offload"); + return false; + } #endif return true; @@ -355,6 +361,12 @@ return false; } + if ((o->mode == MODE_SERVER) && o->ce.local_list->len > 1) + { + msg(msglevel, "multiple --local options defined, disabling data channel offload"); + return false; + } + #elif defined(TARGET_LINUX) /* if the device name is fixed, we need to check if an interface with this * name already exists. IF it does, it must be a DCO interface, otherwise